December 2022 - openSUSE Commits - openSUSE Mailing Lists

commit pdf2djvu for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pdf2djvu for openSUSE:Factory checked in at 2022-12-22 16:23:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdf2djvu (Old) and /work/SRC/openSUSE:Factory/.pdf2djvu.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pdf2djvu" Thu Dec 22 16:23:08 2022 rev:50 rq:1044189 version:0.9.19 Changes: -------- --- /work/SRC/openSUSE:Factory/pdf2djvu/pdf2djvu.changes 2022-09-16 13:32:54.865379891 +0200 +++ /work/SRC/openSUSE:Factory/.pdf2djvu.new.1835/pdf2djvu.changes 2022-12-22 16:23:22.518133348 +0100 @@ -1,0 +2,5 @@ +Wed Dec 21 16:27:59 UTC 2022 - pgajdos(a)suse.com + +- disable GraphicsMagick, it will be removed from Factory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdf2djvu.spec ++++++ --- /var/tmp/diff_new_pack.dBo2e2/_old 2022-12-22 16:23:22.998136109 +0100 +++ /var/tmp/diff_new_pack.dBo2e2/_new 2022-12-22 16:23:23.002136132 +0100 @@ -29,7 +29,6 @@ BuildRequires: djvulibre BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: pkgconfig(ddjvuapi) >= 3.5.25 BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(poppler) >= 0.62

1 0

commit python-sorl-thumbnail for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-sorl-thumbnail for openSUSE:Factory checked in at 2022-12-22 16:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sorl-thumbnail (Old) and /work/SRC/openSUSE:Factory/.python-sorl-thumbnail.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sorl-thumbnail" Thu Dec 22 16:23:10 2022 rev:8 rq:1044208 version:12.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sorl-thumbnail/python-sorl-thumbnail.changes 2022-01-13 00:23:10.551965024 +0100 +++ /work/SRC/openSUSE:Factory/.python-sorl-thumbnail.new.1835/python-sorl-thumbnail.changes 2022-12-22 16:23:23.210137328 +0100 @@ -1,0 +2,5 @@ +Wed Dec 21 17:00:45 UTC 2022 - pgajdos(a)suse.com + +- ImageMagick instead of GraphicsMagick + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sorl-thumbnail.spec ++++++ --- /var/tmp/diff_new_pack.r120u7/_old 2022-12-22 16:23:23.662139928 +0100 +++ /var/tmp/diff_new_pack.r120u7/_new 2022-12-22 16:23:23.670139973 +0100 @@ -35,9 +35,8 @@ Requires: python-Django >= 2 Recommends: ImageMagick Recommends: python-dbm -Suggests: GraphicsMagick Suggests: python-Wand -Suggests: python-pgmagick +Suggests: python-ImageMagick Suggests: vips-tools BuildArch: noarch # SECTION test requirements @@ -48,9 +47,7 @@ BuildRequires: %{python_module pytest-django} BuildRequires: %{python_module redis} BuildRequires: %{pythons} -BuildRequires: GraphicsMagick BuildRequires: ImageMagick -BuildRequires: python3-pgmagick BuildRequires: redis BuildRequires: vips-tools # /SECTION @@ -98,8 +95,8 @@ %pytest -rs -k "not ($skip_tests or test_orientation)" export DJANGO_SETTINGS_MODULE=tests.settings.dbm %pytest -rs -k "not ($skip_tests)" -export DJANGO_SETTINGS_MODULE=tests.settings.graphicsmagick -%pytest -rs -k "not ($skip_tests)" +export DJANGO_SETTINGS_MODULE=tests.settings.imagemagick +%pytest -rs -k "not ($skip_tests or test_templatetags)" export DJANGO_SETTINGS_MODULE=tests.settings.wand %pytest -rs -k "not ($skip_tests)"

1 0

commit mbedtls for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mbedtls for openSUSE:Factory checked in at 2022-12-22 16:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mbedtls (Old) and /work/SRC/openSUSE:Factory/.mbedtls.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mbedtls" Thu Dec 22 16:23:07 2022 rev:35 rq:1044169 version:2.28.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mbedtls/mbedtls.changes 2022-11-05 14:47:02.606689868 +0100 +++ /work/SRC/openSUSE:Factory/.mbedtls.new.1835/mbedtls.changes 2022-12-22 16:23:20.290120533 +0100 @@ -1,0 +2,71 @@ +Wed Dec 21 11:10:10 UTC 2022 - Alexander Bergmann <abergmann(a)suse.com> + +- Update to 2.28.2: (bsc#1206576, CVE-2022-46393) + + Security: + * Fix potential heap buffer overread and overwrite in DTLS if + MBEDTLS_SSL_DTLS_CONNECTION_ID is enabled and + MBEDTLS_SSL_CID_IN_LEN_MAX > 2 * MBEDTLS_SSL_CID_OUT_LEN_MAX. + * An adversary with access to precise enough information about memory + accesses (typically, an untrusted operating system attacking a secure + enclave) could recover an RSA private key after observing the victim + performing a single private-key operation if the window size used for the + exponentiation was 3 or smaller. Found and reported by Zili KOU, + Wenjian HE, Sharad Sinha, and Wei ZHANG. See "Cache Side-channel Attacks + and Defenses of the Sliding Window Algorithm in TEEs" - Design, Automation + and Test in Europe 2023. + + Bugfix: + * Fix a long-standing build failure when building x86 PIC code with old + gcc (4.x). The code will be slower, but will compile. We do however + recommend upgrading to a more recent compiler instead. Fixes #1910. + * Fix support for little-endian Microblaze when MBEDTLS_HAVE_ASM is defined. + Contributed by Kazuyuki Kimura to fix #2020. + * Use double quotes to include private header file psa_crypto_cipher.h. + Fixes 'file not found with include' error when building with Xcode. + * Fix handling of broken symlinks when loading certificates using + mbedtls_x509_crt_parse_path(). Instead of returning an error as soon as a + broken link is encountered, skip the broken link and continue parsing + other certificate files. Contributed by Eduardo Silva in #2602. + * Fix a compilation error when using CMake with an IAR toolchain. + Fixes #5964. + * Fix bugs and missing dependencies when building and testing + configurations with only one encryption type enabled in TLS 1.2. + * Provide the missing definition of mbedtls_setbuf() in some configurations + with MBEDTLS_PLATFORM_C disabled. Fixes #6118, #6196. + * Fix compilation errors when trying to build with + PSA drivers for AEAD (GCM, CCM, Chacha20-Poly1305). + * Fix memory leak in ssl_parse_certificate_request() caused by + mbedtls_x509_get_name() not freeing allocated objects in case of error. + Change mbedtls_x509_get_name() to clean up allocated objects on error. + * Fix checks on PK in check_config.h for builds with PSA and RSA. This does + not change which builds actually work, only moving a link-time error to + an early check. + * Fix ECDSA verification, where it was not always validating the + public key. This bug meant that it was possible to verify a + signature with an invalid public key, in some cases. Reported by + Guido Vranken using Cryptofuzz in #4420. + * Fix a possible null pointer dereference if a memory allocation fails + in TLS PRF code. Reported by Michael Madsen in #6516. + * Fix a bug in which mbedtls_x509_crt_info() would produce non-printable + bytes when parsing certificates containing a binary RFC 4108 + HardwareModuleName as a Subject Alternative Name extension. Hardware + serial numbers are now rendered in hex format. Fixes #6262. + * Fix bug in error reporting in dh_genprime.c where upon failure, + the error code returned by mbedtls_mpi_write_file() is overwritten + and therefore not printed. + * In the bignum module, operations of the form (-A) - (+A) or (-A) - (-A) + with A > 0 created an unintended representation of the value 0 which was + not processed correctly by some bignum operations. Fix this. This had no + consequence on cryptography code, but might affect applications that call + bignum directly and use negative numbers. + * Fix undefined behavior (typically harmless in practice) of + mbedtls_mpi_add_mpi(), mbedtls_mpi_add_abs() and mbedtls_mpi_add_int() + when both operands are 0 and the left operand is represented with 0 limbs. + * Fix undefined behavior (typically harmless in practice) when some bignum + functions receive the most negative value of mbedtls_mpi_sint. Credit + to OSS-Fuzz. Fixes #6597. + * Fix undefined behavior (typically harmless in practice) in PSA ECB + encryption and decryption. + +------------------------------------------------------------------- Old: ---- mbedtls-2.28.1.tar.gz New: ---- mbedtls-2.28.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mbedtls.spec ++++++ --- /var/tmp/diff_new_pack.3PZfeN/_old 2022-12-22 16:23:21.178125641 +0100 +++ /var/tmp/diff_new_pack.3PZfeN/_new 2022-12-22 16:23:21.202125779 +0100 @@ -20,7 +20,7 @@ %define lib_crypto libmbedcrypto7 %define lib_x509 libmbedx509-1 Name: mbedtls -Version: 2.28.1 +Version: 2.28.2 Release: 0 Summary: Libraries for crypto and SSL/TLS protocols License: Apache-2.0 ++++++ mbedtls-2.28.1.tar.gz -> mbedtls-2.28.2.tar.gz ++++++ ++++ 27475 lines of diff (skipped)

1 0

commit votca for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package votca for openSUSE:Factory checked in at 2022-12-22 16:23:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca (Old) and /work/SRC/openSUSE:Factory/.votca.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca" Thu Dec 22 16:23:05 2022 rev:5 rq:1044186 version:2022.1 Changes: -------- --- /work/SRC/openSUSE:Factory/votca/votca.changes 2022-12-08 16:52:07.619772325 +0100 +++ /work/SRC/openSUSE:Factory/.votca.new.1835/votca.changes 2022-12-22 16:23:18.678111261 +0100 @@ -1,0 +2,23 @@ +Wed Dec 21 22:25:15 UTC 2022 - Christoph Junghans <junghans(a)votca.org> + +- Update to 2022.1 + - fix PROJECT_VERSION in subdirs ([gh#votca/votca#951]) + - make csg_resample and csg_stat spacing consistent + ([gh#votca/votca#956]) + - fix build on FreeBSD ([gh#votca/votca#959]) + - update CI container names ([gh#votca/votca#961]) + - Fix gw quadrature scheme ([gh#votca/votca#967]) + - update install guide for spack ([gh#votca/votca#972], + [gh#votca/votca#974]) + - drop gmx-2021 builds from CI ([gh#votca/votca#976]) + - update syntax for cmake 3.23 ([gh#votca/votca#978]) + - fix CI build on Ubuntu ([gh#votca/votca#981]) + - fix CI builds with icpx ([gh#votca/votca#984], + [gh#votca/votca#1004]) + - fix CI builds with ESPResSo 4.2.0 ([gh#votca/votca#993]) + - fix localization issue ([gh#votca/votca#998], + [gh#votca/votca#1000]) + - update github actions to new versions ([gh#votca/votca#1007], + [gh#votca/votca#1013]) + +------------------------------------------------------------------- Old: ---- votca-2022.tar.gz New: ---- votca-2022.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca.spec ++++++ --- /var/tmp/diff_new_pack.vEQYhW/_old 2022-12-22 16:23:19.742117381 +0100 +++ /var/tmp/diff_new_pack.vEQYhW/_new 2022-12-22 16:23:19.746117404 +0100 @@ -1,7 +1,7 @@ # # spec file for package votca # -# Copyright (c) 2021-2022 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2021-2022 Christoph Junghans # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: votca -Version: 2022 +Version: 2022.1 Release: 0 %define uversion %{version} %define sover 2022 ++++++ votca-2022.tar.gz -> votca-2022.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/votca/votca-2022.tar.gz /work/SRC/openSUSE:Factory/.votca.new.1835/votca-2022.1.tar.gz differ: char 13, line 1

1 0

commit python-rq for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-rq for openSUSE:Factory checked in at 2022-12-22 16:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rq (Old) and /work/SRC/openSUSE:Factory/.python-rq.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rq" Thu Dec 22 16:23:04 2022 rev:11 rq:1044179 version:1.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-rq/python-rq.changes 2022-12-12 17:42:30.494065822 +0100 +++ /work/SRC/openSUSE:Factory/.python-rq.new.1835/python-rq.changes 2022-12-22 16:23:15.546093247 +0100 @@ -1,0 +2,12 @@ +Thu Dec 22 08:21:10 UTC 2022 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Set BuildArch to noarch, this package doesn't have anything that depends on + the arch. + +------------------------------------------------------------------- +Thu Dec 22 06:34:46 UTC 2022 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Add multibuild for tests to avoid build cycle with python-sentry-sdk. + bsc#1206590 + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rq.spec ++++++ --- /var/tmp/diff_new_pack.0O9Px7/_old 2022-12-22 16:23:16.078096307 +0100 +++ /var/tmp/diff_new_pack.0O9Px7/_new 2022-12-22 16:23:16.086096353 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-rq +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -16,11 +16,19 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif + %define mod_name rq -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 -Name: python-rq +Name: python-rq%{psuffix} Version: 1.11.1 Release: 0 Summary: Easy Job Queues for Python @@ -29,10 +37,7 @@ URL: https://github.com/rq/rq Source: https://github.com/rq/rq/archive/v%{version}/%{mod_name}-%{version}.tar.gz BuildRequires: %{python_module click >= 5.0.0} -BuildRequires: %{python_module psutil} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module redis >= 3.5.0} -BuildRequires: %{python_module sentry-sdk} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: psmisc @@ -42,6 +47,15 @@ Requires: python-redis >= 3.5.0 Requires(post): update-alternatives Requires(postun):update-alternatives +BuildArch: noarch + +%if %{with test} +BuildRequires: %{python_module %{mod_name} = %{version}} +BuildRequires: %{python_module psutil} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module sentry-sdk} +%endif + %python_subpackages %description @@ -50,8 +64,9 @@ integrated into web stacks. %prep -%setup -q -n %{mod_name}-%{version} +%autosetup -p1 -n %{mod_name}-%{version} +%if !%{with test} %build %python_build @@ -61,13 +76,17 @@ %python_clone -a %{buildroot}%{_bindir}/rqinfo %python_clone -a %{buildroot}%{_bindir}/rqworker %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%if %{with test} %check export PATH="$PATH:%{buildroot}%{_bindir}" %{_sbindir}/redis-server --port 6379 & %pytest killall redis-server +%endif +%if !%{with test} %post %python_install_alternative rq %python_install_alternative rqinfo @@ -81,9 +100,11 @@ %files %{python_files} %doc README.md CHANGES.md %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/rq +%{python_sitelib}/rq-%{version}*-info %python_alternative %{_bindir}/rq %python_alternative %{_bindir}/rqinfo %python_alternative %{_bindir}/rqworker +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild>

1 0

commit gerbv for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gerbv for openSUSE:Factory checked in at 2022-12-22 16:23:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gerbv (Old) and /work/SRC/openSUSE:Factory/.gerbv.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gerbv" Thu Dec 22 16:23:01 2022 rev:12 rq:1044137 version:2.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gerbv/gerbv.changes 2022-11-20 19:46:59.541230314 +0100 +++ /work/SRC/openSUSE:Factory/.gerbv.new.1835/gerbv.changes 2022-12-22 16:23:12.290074520 +0100 @@ -1,0 +2,10 @@ +Sun Dec 4 21:21:22 UTC 2022 - Dirk M��ller <dmueller(a)suse.com> + +- update to 2.9.5: + * Replaced �� with - to fix charset issue in gerbv --version on wine + * Check for NULL schema source default + * Changed TinySCHEME version notice from 1.34 to 1.35 + * Fix draw.h include guard (PR#141 by @ooxi) + * Replaced �� with - to fix charset issue in gerbv --version on wine + +------------------------------------------------------------------- Old: ---- gerbv-2.9.4.tar.gz New: ---- gerbv-2.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gerbv.spec ++++++ --- /var/tmp/diff_new_pack.ZFpa3o/_old 2022-12-22 16:23:12.922078155 +0100 +++ /var/tmp/diff_new_pack.ZFpa3o/_new 2022-12-22 16:23:12.926078177 +0100 @@ -18,7 +18,7 @@ Name: gerbv %define libname lib%{name} -Version: 2.9.4 +Version: 2.9.5 Release: 0 %define somajor 1 Summary: Gerber File Viewer that supports the RS-274X Standard ++++++ gerbv-2.9.4.tar.gz -> gerbv-2.9.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/.github/workflows/ci.yaml new/gerbv-2.9.5/.github/workflows/ci.yaml --- old/gerbv-2.9.4/.github/workflows/ci.yaml 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/.github/workflows/ci.yaml 2022-11-20 18:45:12.000000000 +0100 @@ -22,7 +22,7 @@ name: ci${{ matrix.coverage }} # Coverage build has "-coverage" added to the name. steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get number of jobs for compiling run: echo "NUM_BUILD_JOBS=$((`nproc --all` * 4))" >> $GITHUB_ENV @@ -40,7 +40,7 @@ run: | sudo apt-get install libperlio-gzip-perl libjson-perl pushd ~ - git clone --depth=1 https://github.com/linux-test-project/lcov.git + git clone --depth=1 --branch=v1.16 https://github.com/linux-test-project/lcov.git pushd lcov make PREFIX=${LOCAL_INSTALL_PATH} install hash -r @@ -122,7 +122,7 @@ find gerbv.github.io -type f -name '.gitignore' -exec rm {} \; - name: Deploy gerbv.github.io - uses: JamesIves/github-pages-deploy-action(a)v4.3.3 + uses: JamesIves/github-pages-deploy-action(a)v4.4.1 with: repository-name: gerbv/gerbv.github.io branch: gh-pages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/NEWS new/gerbv-2.9.5/NEWS --- old/gerbv-2.9.4/NEWS 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/NEWS 2022-11-20 18:45:12.000000000 +0100 @@ -1,4 +1,23 @@ ======================================================================== +Release Notes for gerbv-2.9.5 +======================================================================== + +-gerbv: Replaced �� with - to fix charset issue in gerbv --version on wine + (PR#150 by @EricJarosch) +-gerbv: Check for NULL schema source default (PR#143 by @eyal0, reported by + @mrx23dot) + +-libgerbv: Changed TinySCHEME version notice from 1.34 to 1.35 (PR#151 by + @EricJarosch) +-libgerbv: Fix `draw.h' include guard (PR#141 by @ooxi) + +-ci: Checkout specific lcov release to increase CI robustness (PR#153 by + @ooxi) +-ci: Update github-pages-deploy-action to 4.4.1 (PR#148 by @ooxi) +-ci: Upgrade checkout to v3 (PR#146 by @eyal0) + + +======================================================================== Release Notes for gerbv-2.9.4 ======================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/configure.ac new/gerbv-2.9.5/configure.ac --- old/gerbv-2.9.4/configure.ac 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/configure.ac 2022-11-20 18:45:12.000000000 +0100 @@ -22,7 +22,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA -AC_INIT([gerbv], [m4_esyscmd(utils/git-version-gen.sh 2.9.4)]) +AC_INIT([gerbv], [m4_esyscmd(utils/git-version-gen.sh 2.9.5)]) AC_CONFIG_SRCDIR([src/gerbv.c]) AC_PREREQ([2.69]) AM_INIT_AUTOMAKE([1.9]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/src/draw.h new/gerbv-2.9.5/src/draw.h --- old/gerbv-2.9.4/src/draw.h 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/src/draw.h 2022-11-20 18:45:12.000000000 +0100 @@ -36,9 +36,6 @@ #include <cairo-svg.h> #include <cairo-pdf.h> -#endif /* DRAW_H */ - - /* * Convert a gerber image to a GDK clip mask to be used when creating pixmap */ @@ -49,3 +46,4 @@ gerbv_render_info_t *renderInfo, gboolean allowOptimization, gerbv_user_transformation_t transform, gboolean pixelOutput); +#endif /* DRAW_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/src/init.scm new/gerbv-2.9.5/src/init.scm --- old/gerbv-2.9.4/src/init.scm 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/src/init.scm 2022-11-20 18:45:12.000000000 +0100 @@ -1,4 +1,4 @@ -; Initialization file for TinySCHEME 1.34 +; Initialization file for TinySCHEME 1.35 ; Per R5RS, up to four deep compositions should be defined (define (caar x) (car (car x))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/src/interface.c new/gerbv-2.9.5/src/interface.c --- old/gerbv-2.9.4/src/interface.c 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/src/interface.c 2022-11-20 18:45:12.000000000 +0100 @@ -334,15 +334,18 @@ { "text/uri-list", 0, 1 }, }; - GSettingsSchema *settings_schema; + GSettingsSchema *settings_schema = NULL; const gchar *settings_id = "org.geda-user.gerbv"; screen.settings = NULL; /* Try to find settings schema, GSETTINGS_SCHEMA_DIR env. variable was * updated with fallback schema directory */ - settings_schema = g_settings_schema_source_lookup( - g_settings_schema_source_get_default(), - settings_id, TRUE); + GSettingsSchemaSource *settings_source = g_settings_schema_source_get_default(); + if (NULL != settings_source) { + settings_schema = g_settings_schema_source_lookup( + settings_source, + settings_id, TRUE); + } if (NULL != settings_schema) { g_settings_schema_unref(settings_schema); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gerbv-2.9.4/src/main.c new/gerbv-2.9.5/src/main.c --- old/gerbv-2.9.4/src/main.c 2022-11-03 19:41:47.000000000 +0100 +++ new/gerbv-2.9.5/src/main.c 2022-11-20 18:45:12.000000000 +0100 @@ -674,7 +674,7 @@ break; case 'V' : printf(_("gerbv version %s\n"), VERSION); - printf(_("Copyright (C) 2001��2008 by Stefan Petersen\n" + printf(_("Copyright (C) 2001-2008 by Stefan Petersen\n" "and the respective original authors listed in the source files.\n")); exit(0); case 'a' :

1 0

commit python-astropy for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-astropy for openSUSE:Factory checked in at 2022-12-22 16:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-astropy (Old) and /work/SRC/openSUSE:Factory/.python-astropy.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-astropy" Thu Dec 22 16:22:59 2022 rev:38 rq:1044141 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-astropy/python-astropy.changes 2022-11-29 10:53:11.052745658 +0100 +++ /work/SRC/openSUSE:Factory/.python-astropy.new.1835/python-astropy.changes 2022-12-22 16:23:10.738065593 +0100 @@ -1,0 +2,24 @@ +Wed Dec 21 22:56:59 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 5.2 + * Astropy 5.2 is a major release that adds significant new + functionality since the 5.1 release. + * In particular, this release includes: + * Quantity data types + * Updates to astropy.cosmology + * Topocentric ITRS Frame + * Enhanced Fixed Width ASCII Tables + * Accessing cloud-hosted FITS files + * Drawing the instrument beam and a physical scale bar on + celestial images + * Interior ticks and tick labels + * Support for tilde-prefixed paths + * CCDData PSF Image representation + * In addition to these major changes, Astropy 5.2 includes a + large number of smaller improvements and bug fixes. +- Move to PEP517 build +- Revert rpmlintrc: the whitelist error category has been removed + from rpmlint +- Add astropy-pr14194-numpy1.24.patch gh#astropy/astropy#14194 + +------------------------------------------------------------------- Old: ---- astropy-5.1.1.tar.gz New: ---- astropy-5.2.tar.gz astropy-pr14194-numpy1.24.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-astropy.spec ++++++ --- /var/tmp/diff_new_pack.X9Lwii/_old 2022-12-22 16:23:11.430069573 +0100 +++ /var/tmp/diff_new_pack.X9Lwii/_new 2022-12-22 16:23:11.434069597 +0100 @@ -54,33 +54,38 @@ %{?unbundle_wcs} Name: python-astropy%{psuffix} -Version: 5.1.1 +Version: 5.2 Release: 0 Summary: Community-developed python astronomy tools License: BSD-3-Clause URL: https://astropy.org Source: https://files.pythonhosted.org/packages/source/a/astropy/astropy-%{version}… +# SourceRepository: https://github.com/astropy/astropy # Mark wcs headers as false positives for devel-file-in-non-devel-package # These are used by the python files so they must be available. Source100: python-astropy-rpmlintrc -# https://docs.astropy.org/en/v5.0/install.html#requirements -BuildRequires: %{python_module Cython >= 0.29.22} +# PATCH-FIX-UPSTREAM +Patch1: https://github.com/astropy/astropy/pull/14194.patch#/astropy-pr14194-numpy1… +# https://docs.astropy.org/en/v5.2/install.html#requirements +BuildRequires: %{python_module Cython >= 0.29.30} BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module PyYAML >= 3.13} BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module extension-helpers} -BuildRequires: %{python_module numpy-devel >= 1.18} +BuildRequires: %{python_module numpy-devel >= 1.20} BuildRequires: %{python_module packaging >= 19.0} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pyerfa >= 2.0} BuildRequires: %{python_module setuptools_scm >= 6.2} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: hdf5-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros Requires: python-PyYAML >= 3.13 Requires: python-dbm -Requires: python-numpy >= 1.18 +Requires: python-numpy >= 1.20 Requires: python-packaging >= 19.0 Requires: python-pyerfa >= 2.0 Requires(post): update-alternatives @@ -98,12 +103,13 @@ Recommends: python-mpmath Recommends: python-pandas Recommends: python-pyarrow >= 5 -Recommends: python-scipy >= 1.3 +Recommends: python-scipy >= 1.5 Recommends: python-setuptools Recommends: python-sortedcontainers Recommends: python-typing_extensions >= 3.10.0.1 Conflicts: perl-Data-ShowTable Conflicts: python-matplotlib = 3.4.0 +Conflicts: python-matplotlib = 3.5.2 %if %{with system_cfitsio} BuildRequires: pkgconfig(cfitsio) %endif @@ -142,8 +148,8 @@ BuildRequires: %{python_module pytest-doctestplus >= 0.12} BuildRequires: %{python_module pytest-mpl} BuildRequires: %{python_module pytest-xdist} -BuildRequires: %{python_module sgp4} -BuildRequires: %{python_module skyfield} +BuildRequires: %{python_module sgp4 >= 2.3} +BuildRequires: %{python_module skyfield >= 1.20} # /SECTION %endif %python_subpackages @@ -159,8 +165,6 @@ %autosetup -p1 -n astropy-%{version} # avoid rpmlint zero-length error for empty module echo '# empty module' > astropy/samp/setup_package.py -# Reverse gh#astropy/astropy#13205, patch MPL instead -sed -i '/matplotlib/ s/,!=3.5.2//' setup.cfg # Make sure bundled libs are not used %if %{with system_cfitsio} @@ -188,11 +192,11 @@ %build %{?unbundle_libs} -%python_build +%pyproject_wheel %install %{?unbundle_libs} -%python_install +%pyproject_install for b in %{binaries}; do %python_clone -a %{buildroot}%{_bindir}/$b done @@ -209,8 +213,8 @@ donttest+=" or (test_standard_profile and test_main)" # segfaults on obs, but are okay when run on live system -- gh#astropy/astropy/13286 donttest+=" or test_celprm or test_prjprm" -# gh#astropy/astropy#13275 -donttest+=" or (test_precision and (test_day_frac_exact or test_resolution_never_decreases_utc))" +# gh#astropy/astropy#13805 -- requires fix in matplotlib +donttest+=" or test_units" %ifarch aarch64 # doctest failure because of precision errors donttest+=" or bayesian_info_criterion_lsq" @@ -248,7 +252,7 @@ %license LICENSE.rst licenses/* %{expand:%(for b in %{binaries}; do echo "%%python_alternative %%{_bindir}/$b"; done)} %{python_sitearch}/astropy/ -%{python_sitearch}/astropy-%{version}*-info +%{python_sitearch}/astropy-%{version}.dist-info %endif %changelog ++++++ astropy-5.1.1.tar.gz -> astropy-5.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-astropy/astropy-5.1.1.tar.gz /work/SRC/openSUSE:Factory/.python-astropy.new.1835/astropy-5.2.tar.gz differ: char 5, line 1 ++++++ astropy-pr14194-numpy1.24.patch ++++++ From 505533d3048e9193ea00a4eaae00490cc4f1c74d Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim(a)users.noreply.github.com> Date: Mon, 19 Dec 2022 14:41:48 -0500 Subject: [PATCH] Backport PR #14193: Fix compat with Numpy 1.24 --- astropy/units/quantity.py | 5 +++++ astropy/utils/compat/numpycompat.py | 2 +- astropy/utils/masked/function_helpers.py | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/astropy/units/quantity.py b/astropy/units/quantity.py index b98abfafb09..1a11625ae98 100644 --- a/astropy/units/quantity.py +++ b/astropy/units/quantity.py @@ -1679,27 +1679,32 @@ def itemset(self, *args): self.view(np.ndarray).itemset(*(args[:-1] + (self._to_own_unit(args[-1]),))) def tostring(self, order="C"): + """Not implemented, use ``.value.tostring()`` instead.""" raise NotImplementedError( "cannot write Quantities to string. Write array with" " q.value.tostring(...)." ) def tobytes(self, order="C"): + """Not implemented, use ``.value.tobytes()`` instead.""" raise NotImplementedError( "cannot write Quantities to bytes. Write array with q.value.tobytes(...)." ) def tofile(self, fid, sep="", format="%s"): + """Not implemented, use ``.value.tofile()`` instead.""" raise NotImplementedError( "cannot write Quantities to file. Write array with q.value.tofile(...)" ) def dump(self, file): + """Not implemented, use ``.value.dump()`` instead.""" raise NotImplementedError( "cannot dump Quantities to file. Write array with q.value.dump()" ) def dumps(self): + """Not implemented, use ``.value.dumps()`` instead.""" raise NotImplementedError( "cannot dump Quantities to string. Write array with q.value.dumps()" ) diff --git a/astropy/utils/compat/numpycompat.py b/astropy/utils/compat/numpycompat.py index 0698ef6279f..9b744448668 100644 --- a/astropy/utils/compat/numpycompat.py +++ b/astropy/utils/compat/numpycompat.py @@ -24,5 +24,5 @@ NUMPY_LT_1_22 = not minversion(np, "1.22") NUMPY_LT_1_22_1 = not minversion(np, "1.22.1") NUMPY_LT_1_23 = not minversion(np, "1.23") -NUMPY_LT_1_24 = not minversion(np, "1.24dev0") +NUMPY_LT_1_24 = not minversion(np, "1.24") NUMPY_LT_1_25 = not minversion(np, "1.25.0.dev0+151") diff --git a/astropy/utils/masked/function_helpers.py b/astropy/utils/masked/function_helpers.py index eefd099ba4a..7440ec5b59f 100644 --- a/astropy/utils/masked/function_helpers.py +++ b/astropy/utils/masked/function_helpers.py @@ -12,7 +12,7 @@ import numpy as np from astropy.units.quantity_helper.function_helpers import FunctionAssigner -from astropy.utils.compat import NUMPY_LT_1_23, NUMPY_LT_1_25 +from astropy.utils.compat import NUMPY_LT_1_23, NUMPY_LT_1_24 # This module should not really be imported, but we define __all__ # such that sphinx can typeset the functions with docstrings. @@ -587,7 +587,7 @@ def median(a, axis=None, out=None, **kwargs): a = Masked(a) - if NUMPY_LT_1_25: + if NUMPY_LT_1_24: keepdims = kwargs.pop("keepdims", False) r, k = np.lib.function_base._ureduce( a, func=_masked_median, axis=axis, out=out, **kwargs @@ -643,7 +643,7 @@ def quantile(a, q, axis=None, out=None, **kwargs): if not np.lib.function_base._quantile_is_valid(q): raise ValueError("Quantiles must be in the range [0, 1]") - if NUMPY_LT_1_25: + if NUMPY_LT_1_24: keepdims = kwargs.pop("keepdims", False) r, k = np.lib.function_base._ureduce( a, func=_masked_quantile, q=q, axis=axis, out=out, **kwargs ++++++ python-astropy-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.X9Lwii/_old 2022-12-22 16:23:11.518070080 +0100 +++ /var/tmp/diff_new_pack.X9Lwii/_new 2022-12-22 16:23:11.522070103 +0100 @@ -1,7 +1,4 @@ addFilter('devel-file-in-non-devel-package .*/wcs/.*') addFilter('hidden-file-or-dir .*/tests/data/.*') addFilter('zero-length .*/tests/data/.*') -# https://github.com/rpm-software-management/rpmlint/issues/965, https://docs.astropy.org/en/latest/development/testguide.html#astropy-test -addFilter('python-tests-in-package .*astropy/.*tests') -(No newline at EOF)

1 0

commit python-scikit-build for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-scikit-build for openSUSE:Factory checked in at 2022-12-22 16:22:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scikit-build (Old) and /work/SRC/openSUSE:Factory/.python-scikit-build.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scikit-build" Thu Dec 22 16:22:58 2022 rev:12 rq:1044136 version:0.16.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scikit-build/python-scikit-build.changes 2022-10-29 20:19:02.870831187 +0200 +++ /work/SRC/openSUSE:Factory/.python-scikit-build.new.1835/python-scikit-build.changes 2022-12-22 16:23:09.430058070 +0100 @@ -1,0 +2,25 @@ +Wed Dec 21 22:23:44 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.16.4 + * This releases backports additions for Windows ARM + cross-compiling via cibuildwheel from scikit-build-core 0.1.4. + * Initial experimental support for Windows ARM cross-compile in + #824 and #818 + * Replace mailing list with GitHub Discussions board in #823 + * Some CI updates in #811 and #812 +- Version 0.16.3 + * This release fixes logging issues using setuptools 65.6+ + affecting our tests. Pytest 7.2+ is now supported. setup.py + <command> and setup_requires are deprecated, and tests are + marked as such. + * Fix typo in usage.rst in #795, thanks to @chohner. + * Support pytest 7.2+ in #801. + * Change warning filtering in #802. + * Handle logging changes in setuptools 65.6+ in #807. + * Add deprecated markers to some tests in #807. + * Allow known warnings to show up in the tests #807. +- Version 0.16.2 + * This addresses one more small regression with the FindPython + change from 0.16.0 that was affecting conda. #793 + +------------------------------------------------------------------- Old: ---- scikit-build-0.16.1.tar.gz New: ---- scikit-build-0.16.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scikit-build.spec ++++++ --- /var/tmp/diff_new_pack.AGTIAs/_old 2022-12-22 16:23:10.094061889 +0100 +++ /var/tmp/diff_new_pack.AGTIAs/_new 2022-12-22 16:23:10.102061935 +0100 @@ -27,7 +27,7 @@ %define skip_python2 1 Name: python-scikit-build%{psuffix} -Version: 0.16.1 +Version: 0.16.4 Release: 0 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions License: MIT @@ -53,11 +53,10 @@ Requires: python-typing-extensions >= 3.7 %endif %if %{with test} +# Note: When tests fail try `osc build ---clean` in order to get rid of remnant numpy typing stubs in $HOME BuildRequires: %{python_module Cython >= 0.25.1} BuildRequires: %{python_module build >= 0.7} -BuildRequires: %{python_module flake8 >= 3.0.4} -BuildRequires: %{python_module path.py >= 11.5.0} -BuildRequires: %{python_module pytest >= 6.0.0 with %python-pytest < 7.2} +BuildRequires: %{python_module pytest >= 6.0.0} BuildRequires: %{python_module pytest-mock >= 1.10.4} BuildRequires: %{python_module pytest-virtualenv >= 1.2.5} BuildRequires: %{python_module requests} @@ -101,8 +100,6 @@ %check # test_pep518 needs a wheelhouse with downloaded wheels including platform dependent cmake donttest="test_pep518" -# https://github.com/scikit-build/scikit-build/issues/784 -donttest="$donttest or (test_hide_listing and True and bdist_wheel)" %pytest -k "not ($donttest)" %endif ++++++ scikit-build-0.16.1.tar.gz -> scikit-build-0.16.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.flake8 new/scikit-build-0.16.4/.flake8 --- old/scikit-build-0.16.1/.flake8 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.flake8 2022-12-16 22:59:22.000000000 +0100 @@ -2,5 +2,5 @@ max-line-length = 120 max-complexity = 18 show-source = True -extend-ignore = E203, E501, B950 -extend-select = B9 +extend-ignore = E203, E501 +extend-select = B902, B903, B904 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.github/actions/setup-nox/action.yml new/scikit-build-0.16.4/.github/actions/setup-nox/action.yml --- old/scikit-build-0.16.1/.github/actions/setup-nox/action.yml 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.github/actions/setup-nox/action.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -name: Setup Nox -description: 'Prepares all python versions for nox' - -runs: - using: composite - steps: - - uses: actions/setup-python@v4 - with: - python-version: "pypy-3.7" - - uses: actions/setup-python@v4 - with: - python-version: "pypy-3.8" - - uses: actions/setup-python@v4 - with: - python-version: "pypy-3.9" - - uses: actions/setup-python@v4 - with: - python-version: "3.6" - - uses: actions/setup-python@v4 - with: - python-version: "3.7" - - uses: actions/setup-python@v4 - with: - python-version: "3.8" - - uses: actions/setup-python@v4 - with: - python-version: "3.9" - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - name: "Install nox" - run: pipx install nox - shell: bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.github/workflows/cd.yml new/scikit-build-0.16.4/.github/workflows/cd.yml --- old/scikit-build-0.16.1/.github/workflows/cd.yml 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.github/workflows/cd.yml 2022-12-16 22:59:22.000000000 +0100 @@ -36,6 +36,6 @@ name: artifact path: dist - - uses: pypa/gh-action-pypi-publish(a)v1.5.1 + - uses: pypa/gh-action-pypi-publish(a)v1.6.4 with: password: ${{ secrets.pypi_password }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.github/workflows/ci.yml new/scikit-build-0.16.4/.github/workflows/ci.yml --- old/scikit-build-0.16.1/.github/workflows/ci.yml 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.github/workflows/ci.yml 2022-12-16 22:59:22.000000000 +0100 @@ -29,7 +29,7 @@ strategy: fail-fast: false matrix: - runs-on: [ubuntu-latest, macos-latest, windows-2019, windows-2022] + runs-on: [ubuntu-20.04, macos-latest, windows-2019, windows-2022] name: Tests on ${{ matrix.runs-on }} steps: @@ -54,7 +54,9 @@ echo "SKBUILD_TEST_FIND_VS2022_INSTALLATION_EXPECTED=1" >> $GITHUB_ENV - name: Setup nox - uses: ./.github/actions/setup-nox + uses: wntrblm/nox(a)2022.11.21 + with: + python-versions: "3.6,3.7,3.8,3.9,3.10,3.11" # We check all Python's on Linux, because it's fast. # We check minimum Python and maximum Python on all OS's. @@ -85,7 +87,7 @@ with: fetch-depth: 0 - - uses: cygwin/cygwin-install-action@v2 + - uses: cygwin/cygwin-install-action@v3 with: platform: x86_64 packages: cmake ninja git make gcc-g++ gcc-fortran python39 python39-devel python39-pip @@ -97,7 +99,6 @@ env: TMP: /tmp TEMP: /tmp - SETUPTOOLS_SCM_PRETEND_VERSION: "0.15" run: python3.9 -m nox -s tests-3.9 @@ -117,7 +118,7 @@ fetch-depth: 0 - name: Setup nox - uses: ./.github/actions/setup-nox + uses: wntrblm/nox(a)2022.11.21 - uses: actions/setup-python@v4 with: @@ -144,3 +145,14 @@ - name: Check metadata run: pipx run twine check dist/* + + + pass: + if: always() + needs: [tests, tests-pypy, dist] + runs-on: ubuntu-latest + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.gitignore new/scikit-build-0.16.4/.gitignore --- old/scikit-build-0.16.1/.gitignore 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.gitignore 2022-12-16 22:59:22.000000000 +0100 @@ -57,3 +57,5 @@ .coverage* skbuild/_version.py + +/*env*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/.pre-commit-config.yaml new/scikit-build-0.16.4/.pre-commit-config.yaml --- old/scikit-build-0.16.1/.pre-commit-config.yaml 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/.pre-commit-config.yaml 2022-12-16 22:59:22.000000000 +0100 @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: "v4.3.0" + rev: "v4.4.0" hooks: - id: check-added-large-files - id: check-case-conflict @@ -22,18 +22,18 @@ - id: fix-smartquotes - repo: https://github.com/PyCQA/isort - rev: "5.10.1" + rev: "5.11.1" hooks: - id: isort - repo: https://github.com/asottile/pyupgrade - rev: "v3.1.0" + rev: "v3.3.1" hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/psf/black - rev: "22.10.0" # Keep in sync with blacken-docs + rev: "22.12.0" # Keep in sync with blacken-docs hooks: - id: black exclude: ^docs/conf\.py$ @@ -46,7 +46,7 @@ - black==22.8.0 # keep in sync with black hook - repo: https://github.com/PyCQA/flake8 - rev: "5.0.4" + rev: "6.0.0" hooks: - id: flake8 exclude: "^docs/conf.py$" @@ -73,14 +73,14 @@ - id: rst-inline-touching-normal - repo: https://github.com/mgedmin/check-manifest - rev: "0.48" + rev: "0.49" hooks: - id: check-manifest stages: [manual] additional_dependencies: ["setuptools_scm[toml]"] - repo: https://github.com/pre-commit/mirrors-mypy - rev: "v0.982" + rev: "v0.991" hooks: - id: mypy files: ^skbuild diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/CHANGES.rst new/scikit-build-0.16.4/CHANGES.rst --- old/scikit-build-0.16.1/CHANGES.rst 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/CHANGES.rst 2022-12-16 22:59:22.000000000 +0100 @@ -3,13 +3,56 @@ ============= This is the list of changes to scikit-build between each release. For full -details, see the commit logs at http://github.com/scikit-build/scikit-build +details, see the commit logs at https://github.com/scikit-build/scikit-build Next Release ============ -We are hard at work on the next generation of scikit-build. We are also -continuing to fix bugs, make improvements, and backport changes here. +We are hard at work on the next generation of scikit-build +`scikit-build-core <https://github.com/scikit-build/scikit-build-core>`_, which +has had it's first non-development release. We are also continuing to fix bugs, +make improvements, and backport changes here. + +Documentation +------------- + +* scikit-build mailing list transitioned to the `scikit-build GitHub Discussions board <https://github.com/orgs/scikit-build/discussions>`_. See :issue:`800`. + * Transitioning away from the mailing list and adopting the GitHub Discussions will provide a more integrated platform enabling us to more effectively engage with the community. + * After sending a `last message <https://groups.google.com/g/scikit-build/c/jU7-EvvMPb8>`_ describing the transition, the mailing list was updated to be read-only and the welcome message was updated to redirect visitor toward the Discussions board. + + +Scikit-build 0.16.4 +=================== + +This releases backports additions for Windows ARM cross-compiling via +cibuildwheel from scikit-build-core 0.1.4. + +* Initial experimental support for Windows ARM cross-compile in :pr:`824` and :pr:`818` +* Replace mailing list with GitHub Discussions board in :pr:`823` +* Some CI updates in :pr:`811` and :pr:`812` + + +Scikit-build 0.16.3 +=================== + +This release fixes logging issues using setuptools 65.6+ affecting our tests. +Pytest 7.2+ is now supported. ``setup.py <command>`` and ``setup_requires`` +are deprecated, and tests are marked as such. + + +* Fix typo in usage.rst in :pr:`795`, thanks to :user:`chohner`. +* Support pytest 7.2+ in :pr:`801`. +* Change warning filtering in :pr:`802`. +* Handle logging changes in setuptools 65.6+ in :pr:`807`. +* Add deprecated markers to some tests in :pr:`807`. +* Allow known warnings to show up in the tests :pr:`807`. + + +Scikit-build 0.16.2 +=================== + +This addresses one more small regression with the FindPython change from +0.16.0 that was affecting conda. :pr:`793`. Scikit-build 0.16.1 =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/PKG-INFO new/scikit-build-0.16.4/PKG-INFO --- old/scikit-build-0.16.1/PKG-INFO 2022-10-29 17:35:33.958998200 +0200 +++ new/scikit-build-0.16.4/PKG-INFO 2022-12-16 22:59:30.974336900 +0100 @@ -1,15 +1,14 @@ Metadata-Version: 2.1 Name: scikit-build -Version: 0.16.1 +Version: 0.16.4 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions Home-page: https://github.com/scikit-build/scikit-build Author: The scikit-build team -Author-email: scikit-build(a)googlegroups.com License: MIT Project-URL: Documentation, https://scikit-build.readthedocs.io/ Project-URL: Bug Tracker, https://github.com/scikit-build/scikit-build/issues Project-URL: Changelog, https://scikit-build.readthedocs.io/en/latest/changes.html -Project-URL: Mailing List, https://groups.google.com/forum/#!forum/scikit-build +Project-URL: Discussions, https://github.com/orgs/scikit-build/discussions Project-URL: Examples, https://github.com/scikit-build/scikit-build-sample-projects Keywords: scikit-build Classifier: Development Status :: 2 - Pre-Alpha @@ -45,6 +44,10 @@ :target: https://codecov.io/gh/scikit-build/scikit-build :alt: Code coverage status +.. image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&l… + :target: https://github.com/orgs/scikit-build/discussions + :alt: GitHub Discussion + Improved build system generator for CPython C/C++/Fortran/Cython extensions. Better support is available for additional compilers, build systems, cross @@ -109,7 +112,7 @@ * Free software: MIT license * Documentation: http://scikit-build.readthedocs.org * Source code: https://github.com/scikit-build/scikit-build -* Mailing list: https://groups.google.com/forum/#!forum/scikit-build +* Discussions: https://github.com/orgs/scikit-build/discussions Support for this work was provided by NSF cooperative agreement `OAC-2209877 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=2209877>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/README.rst new/scikit-build-0.16.4/README.rst --- old/scikit-build-0.16.1/README.rst 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/README.rst 2022-12-16 22:59:22.000000000 +0100 @@ -12,6 +12,10 @@ :target: https://codecov.io/gh/scikit-build/scikit-build :alt: Code coverage status +.. image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&l… + :target: https://github.com/orgs/scikit-build/discussions + :alt: GitHub Discussion + Improved build system generator for CPython C/C++/Fortran/Cython extensions. Better support is available for additional compilers, build systems, cross @@ -76,7 +80,7 @@ * Free software: MIT license * Documentation: http://scikit-build.readthedocs.org * Source code: https://github.com/scikit-build/scikit-build -* Mailing list: https://groups.google.com/forum/#!forum/scikit-build +* Discussions: https://github.com/orgs/scikit-build/discussions Support for this work was provided by NSF cooperative agreement `OAC-2209877 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=2209877>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/docs/index.rst new/scikit-build-0.16.4/docs/index.rst --- old/scikit-build-0.16.1/docs/index.rst 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/docs/index.rst 2022-12-16 22:59:22.000000000 +0100 @@ -52,4 +52,4 @@ * Free software: MIT license * Documentation: http://scikit-build.readthedocs.io/en/latest/ * Source code: https://github.com/scikit-build/scikit-build -* Mailing list: https://groups.google.com/forum/#!forum/scikit-build +* Discussions: https://github.com/orgs/scikit-build/discussions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/docs/make_a_release.rst new/scikit-build-0.16.4/docs/make_a_release.rst --- old/scikit-build-0.16.1/docs/make_a_release.rst 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/docs/make_a_release.rst 2022-12-16 22:59:22.000000000 +0100 @@ -148,21 +148,11 @@ -10. Send an email to the `scikit-build mailing list`_ based on the following template: - - :: - - On behalf of the scikit-build team, I am pleased to announce that the version X.Y.Z is available for download: - - pip install --upgrade scikit-build <--- This line should be formatted using fixed size font - - Thank you to everyone who contributed their time to test, write issue reports and contribute patches! - - <copy here content of the changelog for release X.Y.X including the release name> +10. Add an entry to the ``Announcements`` category of the `scikit-build discussions board`_. .. note:: - For examples of announcements, see https://groups.google.com/g/scikit-build/search?q=announce%20subject%3Ascik… + For examples of announcements, see https://github.com/orgs/scikit-build/discussions/categories/announcements .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/ @@ -175,7 +165,7 @@ .. _PyPI: https://pypi.org/project/scikit-build .. _TestPyPI: https://test.pypi.org/project/scikit-build -.. _scikit-build mailing list: https://groups.google.com/g/scikit-build +.. _scikit-build discussions board: https://github.com/orgs/scikit-build/discussions/categories/announcements ----------------------- `Conda`_: Step-by-step diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/docs/usage.rst new/scikit-build-0.16.4/docs/usage.rst --- old/scikit-build-0.16.1/docs/usage.rst 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/docs/usage.rst 2022-12-16 22:59:22.000000000 +0100 @@ -155,7 +155,7 @@ - ``cmake_source_dir``: Relative directory containing the project ``CMakeLists.txt``. By default, it is set to the top-level directory where ``setup.py`` is found. -- ``cmake_process_manifest_hook``: Python function consumming the list of files to be +- ``cmake_process_manifest_hook``: Python function consuming the list of files to be installed produced by cmake. For example, ``cmake_process_manifest_hook`` can be used to exclude static libraries from the built wheel. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/noxfile.py new/scikit-build-0.16.4/noxfile.py --- old/scikit-build-0.16.1/noxfile.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/noxfile.py 2022-12-16 22:59:22.000000000 +0100 @@ -38,6 +38,8 @@ contained = "1" if version in known_MSVC else "0" env[f"SKBUILD_TEST_FIND_VS{version}_INSTALLATION_EXPECTED"] = contained + # Latest versions may break things, so grab them for testing! + session.install("-U", "setuptools", "wheel") session.install("-e", ".[test]") session.run("pytest", *posargs, env=env) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/pyproject.toml new/scikit-build-0.16.4/pyproject.toml --- old/scikit-build-0.16.1/pyproject.toml 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/pyproject.toml 2022-12-16 22:59:22.000000000 +0100 @@ -79,16 +79,18 @@ norecursedirs = ["_skbuild"] xfail_strict = true filterwarnings = [ - "error", - "ignore:setup.py install is deprecated:Warning", - "ignore:easy_install command is deprecated:Warning", - "ignore:.*ends with a trailing slash, which is not supported by setuptools:FutureWarning", + 'error', + 'default:setup.py install is deprecated:Warning', + 'default:easy_install command is deprecated:Warning', + 'ignore:.*ends with a trailing slash, which is not supported by setuptools:FutureWarning', "ignore:Config variable 'Py_DEBUG' is unset:RuntimeWarning", "ignore:Config variable 'WITH_PYMALLOC' is unset, Python ABI tag may be incorrect:RuntimeWarning", - 'ignore:\s*Installing .* as data is deprecated:Warning', - "ignore:shell/Perl-style subs.* are deprecated:DeprecationWarning", + 'default:\s*Installing .* as data is deprecated:Warning', + 'default:shell/Perl-style subs.* are deprecated:DeprecationWarning', + 'default:subprocess .* is still running:ResourceWarning', ] log_cli_level = "info" markers = [ - "fortran: fortran testing", + "fortran: Fortran testing", + "deprecated: These tests deprecated setuptools features", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/requirements-dev.txt new/scikit-build-0.16.4/requirements-dev.txt --- old/scikit-build-0.16.1/requirements-dev.txt 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/requirements-dev.txt 2022-12-16 22:59:22.000000000 +0100 @@ -3,8 +3,8 @@ coverage>=4.2 cython>=0.25.1 flake8>=3.0.4 -path.py>=11.5.0 -pytest>=6.0.0,<7.2.0 +importlib-metadata;python_version<"3.8" +pytest>=6.0.0 pytest-cov>=2.7.1 pytest-mock>=1.10.4 pytest-runner>=5.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/scikit_build.egg-info/PKG-INFO new/scikit-build-0.16.4/scikit_build.egg-info/PKG-INFO --- old/scikit-build-0.16.1/scikit_build.egg-info/PKG-INFO 2022-10-29 17:35:33.000000000 +0200 +++ new/scikit-build-0.16.4/scikit_build.egg-info/PKG-INFO 2022-12-16 22:59:30.000000000 +0100 @@ -1,15 +1,14 @@ Metadata-Version: 2.1 Name: scikit-build -Version: 0.16.1 +Version: 0.16.4 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions Home-page: https://github.com/scikit-build/scikit-build Author: The scikit-build team -Author-email: scikit-build(a)googlegroups.com License: MIT Project-URL: Documentation, https://scikit-build.readthedocs.io/ Project-URL: Bug Tracker, https://github.com/scikit-build/scikit-build/issues Project-URL: Changelog, https://scikit-build.readthedocs.io/en/latest/changes.html -Project-URL: Mailing List, https://groups.google.com/forum/#!forum/scikit-build +Project-URL: Discussions, https://github.com/orgs/scikit-build/discussions Project-URL: Examples, https://github.com/scikit-build/scikit-build-sample-projects Keywords: scikit-build Classifier: Development Status :: 2 - Pre-Alpha @@ -45,6 +44,10 @@ :target: https://codecov.io/gh/scikit-build/scikit-build :alt: Code coverage status +.. image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&l… + :target: https://github.com/orgs/scikit-build/discussions + :alt: GitHub Discussion + Improved build system generator for CPython C/C++/Fortran/Cython extensions. Better support is available for additional compilers, build systems, cross @@ -109,7 +112,7 @@ * Free software: MIT license * Documentation: http://scikit-build.readthedocs.org * Source code: https://github.com/scikit-build/scikit-build -* Mailing list: https://groups.google.com/forum/#!forum/scikit-build +* Discussions: https://github.com/orgs/scikit-build/discussions Support for this work was provided by NSF cooperative agreement `OAC-2209877 <https://www.nsf.gov/awardsearch/showAward?AWD_ID=2209877>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/scikit_build.egg-info/SOURCES.txt new/scikit-build-0.16.4/scikit_build.egg-info/SOURCES.txt --- old/scikit-build-0.16.1/scikit_build.egg-info/SOURCES.txt 2022-10-29 17:35:33.000000000 +0200 +++ new/scikit-build-0.16.4/scikit_build.egg-info/SOURCES.txt 2022-12-16 22:59:30.000000000 +0100 @@ -21,7 +21,6 @@ requirements.txt setup.py .github/dependabot.yml -.github/actions/setup-nox/action.yml .github/workflows/cd.yml .github/workflows/ci.yml docs/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/scikit_build.egg-info/requires.txt new/scikit-build-0.16.4/scikit_build.egg-info/requires.txt --- old/scikit-build-0.16.1/scikit_build.egg-info/requires.txt 2022-10-29 17:35:33.000000000 +0200 +++ new/scikit-build-0.16.4/scikit_build.egg-info/requires.txt 2022-12-16 22:59:30.000000000 +0100 @@ -19,8 +19,7 @@ coverage>=4.2 cython>=0.25.1 flake8>=3.0.4 -path.py>=11.5.0 -pytest<7.2.0,>=6.0.0 +pytest>=6.0.0 pytest-cov>=2.7.1 pytest-mock>=1.10.4 pytest-runner>=5.1 @@ -29,3 +28,6 @@ ubelt>=0.8.2 virtualenv xdoctest>=0.10.0 + +[test:python_version < "3.8"] +importlib-metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/setup.py new/scikit-build-0.16.4/setup.py --- old/scikit-build-0.16.1/setup.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/setup.py 2022-12-16 22:59:22.000000000 +0100 @@ -26,14 +26,13 @@ long_description_content_type="text/x-rst; charset=UTF-8", long_description=readme + "\n\n" + history, author="The scikit-build team", - author_email="scikit-build(a)googlegroups.com", url="https://github.com/scikit-build/scikit-build", packages=setuptools.find_packages(include=["skbuild*"]), project_urls={ "Documentation": "https://scikit-build.readthedocs.io/", "Bug Tracker": "https://github.com/scikit-build/scikit-build/issues", "Changelog": "https://scikit-build.readthedocs.io/en/latest/changes.html", - "Mailing List": "https://groups.google.com/forum/#!forum/scikit-build", + "Discussions": "https://github.com/orgs/scikit-build/discussions", "Examples": "https://github.com/scikit-build/scikit-build-sample-projects", }, package_data={"skbuild": ["resources/cmake/*.cmake", "py.typed", "*.pyi"]}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/_version.py new/scikit-build-0.16.4/skbuild/_version.py --- old/scikit-build-0.16.1/skbuild/_version.py 2022-10-29 17:35:33.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/_version.py 2022-12-16 22:59:30.000000000 +0100 @@ -1,5 +1,5 @@ # coding: utf-8 # file generated by setuptools_scm # don't change, don't track in version control -__version__ = version = '0.16.1' -__version_tuple__ = version_tuple = (0, 16, 1) +__version__ = version = '0.16.4' +__version_tuple__ = version_tuple = (0, 16, 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/cmaker.py new/scikit-build-0.16.4/skbuild/cmaker.py --- old/scikit-build-0.16.1/skbuild/cmaker.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/cmaker.py 2022-12-16 22:59:22.000000000 +0100 @@ -4,6 +4,7 @@ import argparse +import configparser import contextlib import glob import itertools @@ -289,6 +290,7 @@ [ f"{prefix}_EXECUTABLE:PATH={sys.executable}", f"{prefix}_ROOT_DIR:PATH={sys.prefix}", + f"{prefix}_INCLUDE_DIR:PATH={python_include_dir}", f"{prefix}_FIND_REGISTRY:STRING=NEVER", ] ) @@ -302,7 +304,7 @@ if generator.toolset: cmd.extend(["-T", generator.toolset]) - if generator.architecture: + if generator.architecture and "Visual Studio" in generator.name: cmd.extend(["-A", generator.architecture]) if ninja_executable_path is not None: cmd.append(f"-DCMAKE_MAKE_PROGRAM:FILEPATH={ninja_executable_path}") @@ -367,6 +369,8 @@ if not python_version: python_version = ".".join(map(str, sys.version_info[:2])) + assert isinstance(python_version, str) + return python_version # NOTE(opadron): The try-excepts raise the cyclomatic complexity, but we @@ -476,12 +480,23 @@ >>> print('python_library = {!r}'.format(python_library)) python_library = '.../conda/envs/py37/include/python3.7m' """ + # On Windows, support cross-compiling in the same way as setuptools + # When cross-compiling, check DIST_EXTRA_CONFIG first + config_file = os.environ.get("DIST_EXTRA_CONFIG", None) + if config_file and Path(config_file).is_file(): + cp = configparser.ConfigParser() + cp.read(config_file) + result = cp.get("build_ext", "library_dirs", fallback="") + if result: + minor = sys.version_info[1] + return str(Path(result) / f"python3{minor}.lib") + # This seems to be the simplest way to detect the library path with # modern python versions that avoids the complicated construct below. # It avoids guessing the library name. Tested with cpython 3.8 and # pypy 3.8 on Ubuntu. - libdir = sysconfig.get_config_var("LIBDIR") - ldlibrary = sysconfig.get_config_var("LDLIBRARY") + libdir: Optional[str] = sysconfig.get_config_var("LIBDIR") + ldlibrary: Optional[str] = sysconfig.get_config_var("LDLIBRARY") if libdir and ldlibrary and os.path.exists(libdir): if sysconfig.get_config_var("MULTIARCH"): masd = sysconfig.get_config_var("multiarchsubdir") @@ -492,7 +507,7 @@ if os.path.exists(libdir_masd): libdir = libdir_masd libpath = os.path.join(libdir, ldlibrary) - if os.path.exists(libpath): + if libpath and os.path.exists(libpath): return libpath return CMaker._guess_python_library(python_version) @@ -500,7 +515,7 @@ @staticmethod def _guess_python_library(python_version: str) -> Optional[str]: # determine direct path to libpython - python_library = sysconfig.get_config_var("LIBRARY") + python_library: Optional[str] = sysconfig.get_config_var("LIBRARY") # if static (or nonexistent), try to find a suitable dynamic libpython if not python_library or os.path.splitext(python_library)[1][-2:] == ".a": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/command/build_py.py new/scikit-build-0.16.4/skbuild/command/build_py.py --- old/scikit-build-0.16.1/skbuild/command/build_py.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/command/build_py.py 2022-12-16 22:59:22.000000000 +0100 @@ -7,7 +7,7 @@ from setuptools.command.build_py import build_py as _build_py from ..constants import CMAKE_INSTALL_DIR -from ..utils import distribution_hide_listing, distutils_log +from ..utils import distribution_hide_listing, logger from . import set_build_base_mixin @@ -38,7 +38,7 @@ """ with distribution_hide_listing(self.distribution): super().run(*args, **kwargs) - distutils_log.info("copied %d files", self.outfiles_count) + logger.info("copied %d files", self.outfiles_count) def find_modules(self) -> List[Tuple[str, str, str]]: """Finds individually-specified Python modules, ie. those listed by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/command/clean.py new/scikit-build-0.16.4/skbuild/command/clean.py --- old/scikit-build-0.16.1/skbuild/command/clean.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/command/clean.py 2022-12-16 22:59:22.000000000 +0100 @@ -7,7 +7,7 @@ from distutils.command.clean import clean as _clean from ..constants import CMAKE_BUILD_DIR, CMAKE_INSTALL_DIR, SKBUILD_DIR -from ..utils import distutils_log +from ..utils import logger from . import set_build_base_mixin @@ -20,7 +20,7 @@ super().run() for dir_ in (CMAKE_INSTALL_DIR(), CMAKE_BUILD_DIR(), SKBUILD_DIR()): if os.path.exists(dir_): - distutils_log.info("removing '%s'", dir_) + logger.info("removing '%s'", dir_) # This seems to be there but isn't typed in the stubs TODO if not self.dry_run and os.path.exists(dir_): # type: ignore[attr-defined] rmtree(dir_) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/command/install_lib.py new/scikit-build-0.16.4/skbuild/command/install_lib.py --- old/scikit-build-0.16.1/skbuild/command/install_lib.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/command/install_lib.py 2022-12-16 22:59:22.000000000 +0100 @@ -5,7 +5,7 @@ from setuptools.command.install_lib import install_lib as _install_lib -from ..utils import distribution_hide_listing, distutils_log +from ..utils import distribution_hide_listing, logger from . import CommandMixinProtocol, set_build_base_mixin @@ -17,5 +17,5 @@ with distribution_hide_listing(self.distribution): outfiles: List[str] = super().install() # type: ignore[misc] if outfiles is not None: - distutils_log.info("copied %d files", len(outfiles)) + logger.info("copied %d files", len(outfiles)) return outfiles diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/command/install_scripts.py new/scikit-build-0.16.4/skbuild/command/install_scripts.py --- old/scikit-build-0.16.1/skbuild/command/install_scripts.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/command/install_scripts.py 2022-12-16 22:59:22.000000000 +0100 @@ -5,7 +5,7 @@ from setuptools.command.install_scripts import install_scripts as _install_scripts -from ..utils import distribution_hide_listing, distutils_log +from ..utils import distribution_hide_listing, logger from . import CommandMixinProtocol, set_build_base_mixin @@ -16,4 +16,4 @@ """Handle --hide-listing option.""" with distribution_hide_listing(self.distribution): super().run(*args, **kwargs) # type: ignore[misc] - distutils_log.info("copied %d files", len(self.outfiles)) + logger.info("copied %d files", len(self.outfiles)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/command/sdist.py new/scikit-build-0.16.4/skbuild/command/sdist.py --- old/scikit-build-0.16.1/skbuild/command/sdist.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/command/sdist.py 2022-12-16 22:59:22.000000000 +0100 @@ -4,7 +4,7 @@ from setuptools.command.sdist import sdist as _sdist -from ..utils import distribution_hide_listing, distutils_log +from ..utils import distribution_hide_listing, logger from . import CommandMixinProtocol, set_build_base_mixin @@ -15,7 +15,7 @@ """Handle --hide-listing option.""" with distribution_hide_listing(self.distribution): super().make_release_tree(base_dir, files) # type: ignore[misc] - distutils_log.info("copied %d files", len(files)) + logger.info("copied %d files", len(files)) def make_archive( self, @@ -27,7 +27,7 @@ group: Optional[str] = None, ) -> str: """Handle --hide-listing option.""" - distutils_log.info("creating '%s' %s archive and adding '%s' to it", base_name, _format, base_dir) + logger.info("creating '%s' %s archive and adding '%s' to it", base_name, _format, base_dir) with distribution_hide_listing(self.distribution): # type: ignore[attr-defined] return super().make_archive(base_name, _format, root_dir, base_dir, owner, group) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/platform_specifics/abstract.py new/scikit-build-0.16.4/skbuild/platform_specifics/abstract.py --- old/scikit-build-0.16.1/skbuild/platform_specifics/abstract.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/platform_specifics/abstract.py 2022-12-16 22:59:22.000000000 +0100 @@ -230,7 +230,7 @@ cmd = [cmake_exe_path, "../", "-G", generator.name] if generator.toolset: cmd.extend(["-T", generator.toolset]) - if generator.architecture: + if generator.architecture and "Visual Studio" in generator.name: cmd.extend(["-A", generator.architecture]) cmd.extend(cmake_args) cmd.extend(generator.args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/platform_specifics/windows.py new/scikit-build-0.16.4/skbuild/platform_specifics/windows.py --- old/scikit-build-0.16.1/skbuild/platform_specifics/windows.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/platform_specifics/windows.py 2022-12-16 22:59:22.000000000 +0100 @@ -33,6 +33,12 @@ "2022": "1930", # VS 2022 - can be +9 } +ARCH_TO_MSVC_ARCH = { + "Win32": "x86", + "ARM64": "x86_arm64", + "x64": "x86_amd64", +} + class CachedEnv(TypedDict): PATH: str @@ -108,6 +114,15 @@ return self._vs_help +def _compute_arch() -> str: + """Currently only supports Intel -> ARM cross-compilation.""" + if platform.machine() == "ARM64" or "arm64" in os.environ.get("SETUPTOOLS_EXT_SUFFIX", "").lower(): + return "ARM64" + if platform.architecture()[0] == "64bit": + return "x64" + return "Win32" + + class CMakeVisualStudioIDEGenerator(CMakeGenerator): """ Represents a Visual Studio CMake generator. @@ -184,7 +199,7 @@ .. note:: - - For VS 2017 and newer, returns `path` based on the result of invoking ``vswhere.exe``. + - Returns `path` based on the result of invoking ``vswhere.exe``. """ return _find_visual_studio_2017_or_newer(vs_version) @@ -200,24 +215,17 @@ Return a dictionary of environment variables corresponding to ``vs_version`` that can be used with :class:`CMakeVisualStudioCommandLineGenerator`. - The ``vs_toolset`` is used only for Visual Studio 2017 or newer (``vs_version >= 14``). + The ``vs_toolset`` is used only for Visual Studio 2017 or newer (``vs_version >= 15``). If specified, ``vs_toolset`` is used to set the `-vcvars_ver=XX.Y` argument passed to ``vcvarsall.bat`` script. """ # Set architecture - arch = "x86" - if platform.machine() == "ARM64": - arch = "x86_arm64" - elif platform.architecture()[0] == "64bit": - if vs_version < 14: - arch = "amd64" - else: - arch = "x86_amd64" + vc_arch = ARCH_TO_MSVC_ARCH[_compute_arch()] # If any, return cached version - cache_key = ",".join([str(vs_version), arch, str(vs_toolset)]) + cache_key = ",".join([str(vs_version), vc_arch, str(vs_toolset)]) if cache_key in __get_msvc_compiler_env_cache: return __get_msvc_compiler_env_cache[cache_key] @@ -230,7 +238,7 @@ # Set vcvars_ver argument based on toolset vcvars_ver = "" - if vs_toolset is not None and vs_version >= 15: + if vs_toolset is not None: match = re.findall(r"^v(\d\d)(\d+)$", vs_toolset)[0] if match: match_str = ".".join(match) @@ -238,7 +246,7 @@ try: out_bytes = subprocess.check_output( - f'cmd /u /c "{vcvarsall}" {arch} {vcvars_ver} && set', + f'cmd /u /c "{vcvarsall}" {vc_arch} {vcvars_ver} && set', stderr=subprocess.STDOUT, shell=sys.platform.startswith("cygwin"), ) @@ -280,10 +288,10 @@ If set, the ``toolset`` defines the `Visual Studio Toolset` to select. - The platform (32-bit or 64-bit) is automatically selected based - on the value of ``platform.architecture()[0]``. + The platform (32-bit or 64-bit or ARM) is automatically selected. """ + arch = _compute_arch() vc_env = _get_msvc_compiler_env(VS_YEAR_TO_VERSION[year], toolset) env = {str(key.upper()): str(value) for key, value in vc_env.items()} - super().__init__(name, env, args=args) + super().__init__(name, env, arch=arch, args=args) self._description = f"{self.name} ({CMakeVisualStudioIDEGenerator(year, toolset).description})" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/setuptools_wrap.py new/scikit-build-0.16.4/skbuild/setuptools_wrap.py --- old/scikit-build-0.16.1/skbuild/setuptools_wrap.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/setuptools_wrap.py 2022-12-16 22:59:22.000000000 +0100 @@ -451,7 +451,7 @@ print("Traceback (most recent call last):", file=sys.stderr) traceback.print_tb(sys.exc_info()[2]) print(file=sys.stderr, flush=True) - sys.exit(ex) + sys.exit(ex) # type: ignore[arg-type] # Convert source dir to a path relative to the root # of the project @@ -639,14 +639,14 @@ _save_cmake_spec(cmake_spec) cmkr.make(make_args, install_target=cmake_install_target, env=env) except SKBuildGeneratorNotFoundError as ex: - sys.exit(ex) + sys.exit(ex) # type: ignore[arg-type] except SKBuildError as ex: import traceback # pylint: disable=import-outside-toplevel print("Traceback (most recent call last):", file=sys.stderr) traceback.print_tb(sys.exc_info()[2]) print(file=sys.stderr, flush=True) - sys.exit(ex) + sys.exit(ex) # type: ignore[arg-type] # If needed, set reasonable defaults for package_dir for package in packages: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/skbuild/utils/__init__.py new/scikit-build-0.16.4/skbuild/utils/__init__.py --- old/scikit-build-0.16.1/skbuild/utils/__init__.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/skbuild/utils/__init__.py 2022-12-16 22:59:22.000000000 +0100 @@ -3,6 +3,7 @@ import contextlib import logging import os +import sys from contextlib import contextmanager from typing import ( Any, @@ -23,18 +24,31 @@ from distutils.filelist import FileList from distutils.text_file import TextFile -distutils_log: logging.Logger +if sys.version_info >= (3, 8): + from typing import Protocol +else: + from typing_extensions import Protocol + + +class CommonLog(Protocol): + def info(self, __msg: str, *args: object) -> None: + ... + + +logger: CommonLog try: import setuptools.logging # noqa: F401 - distutils_log = logging.getLogger("skbuild") - distutils_log.setLevel(logging.INFO) + skb_log = logging.getLogger("skbuild") + skb_log.setLevel(logging.INFO) logging_module = True + logger = skb_log except ImportError: - from distutils import log as distutils_log # type: ignore[misc] + from distutils import log as distutils_log + logger = distutils_log logging_module = False @@ -45,7 +59,7 @@ def _log_warning(msg: str, *args: object) -> None: try: if logging_module: - distutils_log.warning(msg, *args) + skb_log.warning(msg, *args) else: distutils_log.warn(msg, *args) # pylint: disable=deprecated-method except ValueError: @@ -195,14 +209,16 @@ """ hide_listing = hasattr(distribution, "hide_listing") and distribution.hide_listing # type: ignore[attr-defined] - + wheel_log = logging.getLogger("wheel") + root_log = logging.getLogger() # setuptools 65.6+ needs this hidden too if logging_module: # Setuptools 60.2+, will always be on Python 3.6+ - old_level = distutils_log.getEffectiveLevel() - if hide_listing: - distutils_log.setLevel(logging.WARNING) + old_wheel_level = wheel_log.getEffectiveLevel() + old_root_level = root_log.getEffectiveLevel() try: if hide_listing: + wheel_log.setLevel(logging.WARNING) + root_log.setLevel(logging.WARNING) # The classic logger doesn't respond to set_threshold anymore, # but it does log info and above to stdout, so let's hide that with open(os.devnull, "w", encoding="utf-8") as f, contextlib.redirect_stdout(f): @@ -210,16 +226,18 @@ else: yield hide_listing finally: - distutils_log.setLevel(old_level) + if hide_listing: + wheel_log.setLevel(old_wheel_level) + root_log.setLevel(old_root_level) else: old_threshold = distutils_log._global_log.threshold # type: ignore[attr-defined] if hide_listing: - distutils_log.set_threshold(distutils_log.WARN) # type: ignore[attr-defined] + distutils_log.set_threshold(distutils_log.WARN) try: yield hide_listing finally: - distutils_log.set_threshold(old_threshold) # type: ignore[attr-defined] + distutils_log.set_threshold(old_threshold) def parse_manifestin(template: str) -> List[str]: @@ -250,8 +268,8 @@ # malformed lines, or a ValueError from the lower-level # convert_path function except (DistutilsTemplateError, ValueError) as msg: - filename = template_file.filename if hasattr(template_file, "filename") else "Unknown" # type: ignore[attr-defined] - current_line = template_file.current_line if hasattr(template_file, "current_line") else "Unknown" # type: ignore[attr-defined] + filename = template_file.filename if hasattr(template_file, "filename") else "Unknown" + current_line = template_file.current_line if hasattr(template_file, "current_line") else "Unknown" print(f"{filename}, line {current_line}: {msg}", flush=True) return file_list.files finally: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/__init__.py new/scikit-build-0.16.4/tests/__init__.py --- old/scikit-build-0.16.1/tests/__init__.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/__init__.py 2022-12-16 22:59:22.000000000 +0100 @@ -247,7 +247,7 @@ yield -def project_setup_py_test(project, setup_args, tmp_dir=None, verbose_git=True, disable_languages_test=False): +def project_setup_py_test(project, setup_args, tmp_dir=None, verbose_git=True, disable_languages_test=False, ret=False): def dec(fun): @functools.wraps(fun) def wrapped(*iargs, **ikwargs): @@ -260,7 +260,9 @@ with execute_setup_py(wrapped.tmp_dir, wrapped.setup_args, disable_languages_test=disable_languages_test): result2 = fun(*iargs, **ikwargs) - return wrapped.tmp_dir, result2 + if ret: + return wrapped.tmp_dir, result2 + return None wrapped.project = project wrapped.setup_args = setup_args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/conftest.py new/scikit-build-0.16.4/tests/conftest.py --- old/scikit-build-0.16.1/tests/conftest.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/conftest.py 2022-12-16 22:59:22.000000000 +0100 @@ -4,6 +4,12 @@ import pytest +if sys.version_info < (3, 8): + import importlib_metadata as metadata +else: + from importlib import metadata + + DIR = os.path.dirname(os.path.abspath(__file__)) BASE = os.path.dirname(DIR) @@ -43,3 +49,26 @@ monkeypatch.setenv("PIP_FIND_LINKS", pep518_wheelhouse) monkeypatch.setenv("PIP_NO_INDEX", "true") return pep518_wheelhouse + + +def pytest_report_header() -> str: + interesting_packages = { + "build", + "distro", + "packaging", + "pip", + "setuptools", + "virtualenv", + "wheel", + } + valid = [] + for package in interesting_packages: + try: + version = metadata.version(package) # type: ignore[no-untyped-call] + except ModuleNotFoundError: + continue + valid.append(f"{package}=={version}") + reqs = " ".join(sorted(valid)) + pkg_line = f"installed packages of interest: {reqs}" + + return "\n".join([pkg_line]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_cmaker.py new/scikit-build-0.16.4/tests/test_cmaker.py --- old/scikit-build-0.16.1/tests/test_cmaker.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_cmaker.py 2022-12-16 22:59:22.000000000 +0100 @@ -204,6 +204,7 @@ [ f"{prefix}_EXECUTABLE", f"{prefix}_ROOT_DIR", + f"{prefix}_INCLUDE_DIR", f"{prefix}_FIND_IMPLEMENTATIONS", f"{prefix}_FIND_REGISTRY", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_distribution.py new/scikit-build-0.16.4/tests/test_distribution.py --- old/scikit-build-0.16.1/tests/test_distribution.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_distribution.py 2022-12-16 22:59:22.000000000 +0100 @@ -1,11 +1,11 @@ -import os +from pathlib import Path import pytest -from path import Path from . import initialize_git_repo_and_commit, prepare_project -DIST_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../dist")) +DIR = Path(__file__).parent.resolve() +DIST_DIR = DIR.parent / "dist" # Test if package can be imported to allow testing on # conda-forge where ``pytest-virtualenv`` is not available. @@ -13,7 +13,7 @@ def test_source_distribution(virtualenv): - sdists = Path(DIST_DIR).files(match="*.tar.gz") if Path(DIST_DIR).exists() else [] + sdists = DIST_DIR.glob("*.tar.gz") if DIST_DIR.exists() else [] if not sdists: pytest.skip("no source distribution available") assert len(sdists) == 1 @@ -28,7 +28,7 @@ def test_wheel(virtualenv): - wheels = Path(DIST_DIR).files(match="*.whl") if Path(DIST_DIR).exists() else [] + wheels = DIST_DIR.glob("*.whl") if DIST_DIR.exists() else [] if not wheels: pytest.skip("no wheel available") assert len(wheels) == 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_hello_cpp.py new/scikit-build-0.16.4/tests/test_hello_cpp.py --- old/scikit-build-0.16.1/tests/test_hello_cpp.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_hello_cpp.py 2022-12-16 22:59:22.000000000 +0100 @@ -11,7 +11,7 @@ import pytest -from skbuild.constants import CMAKE_BUILD_DIR, CMAKE_INSTALL_DIR, SKBUILD_DIR +from skbuild.constants import CMAKE_BUILD_DIR, SKBUILD_DIR from skbuild.utils import push_dir from . import SAMPLES_DIR, _copy_dir, _tmpdir, get_ext_suffix, project_setup_py_test @@ -21,7 +21,7 @@ def test_hello_builds(): with push_dir(): - @project_setup_py_test("hello-cpp", ["build"]) + @project_setup_py_test("hello-cpp", ["build"], ret=True) def run(): pass @@ -84,7 +84,7 @@ expected_distribution_name = "hello-1.2.3" - @project_setup_py_test("hello-cpp", ["bdist_wheel"]) + @project_setup_py_test("hello-cpp", ["bdist_wheel"], ret=True) def build_wheel(): whls = glob.glob("dist/*.whl") assert len(whls) == 1 @@ -113,7 +113,7 @@ dry_run = dry_run == "with-dry-run" - @project_setup_py_test("hello-cpp", ["build"]) + @project_setup_py_test("hello-cpp", ["build"], ret=True) def run_build(): pass @@ -163,25 +163,22 @@ # Check that a project can be cleaned twice in a row run_build() - print("<<-->>") - run_clean() - print("<<-->>") - run_clean() + capfd.readouterr() + caplog.clear() - _, clean1_out, clean2_out = capfd.readouterr()[0].split("<<-->>") - - clean1_out = clean1_out.strip() - clean2_out = clean2_out.strip() - - assert "running clean" == clean1_out.splitlines()[0] - if caplog.text.count("removing") != 3: - assert f"removing '{CMAKE_INSTALL_DIR()}'" == clean1_out.splitlines()[1] - assert f"removing '{CMAKE_BUILD_DIR()}'" == clean1_out.splitlines()[2] - assert f"removing '{SKBUILD_DIR()}'" == clean1_out.splitlines()[3] + run_clean() + txt1 = caplog.text + msg = capfd.readouterr().out + txt1 + assert "running clean" in msg + caplog.clear() - assert "running clean" == clean2_out + run_clean() + txt2 = caplog.text + msg = capfd.readouterr().out + txt2 + assert "running clean" in msg +(a)pytest.mark.deprecated @project_setup_py_test("hello-cpp", ["develop"]) def test_hello_develop(): for expected_file in [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_hello_pure.py new/scikit-build-0.16.4/tests/test_hello_pure.py --- old/scikit-build-0.16.1/tests/test_hello_pure.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_hello_pure.py 2022-12-16 22:59:22.000000000 +0100 @@ -58,7 +58,7 @@ def test_hello_clean(capfd): with push_dir(): - @project_setup_py_test("hello-pure", ["build"], disable_languages_test=True) + @project_setup_py_test("hello-pure", ["build"], disable_languages_test=True, ret=True) def run_build(): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_issue274_support_default_package_dir.py new/scikit-build-0.16.4/tests/test_issue274_support_default_package_dir.py --- old/scikit-build-0.16.1/tests/test_issue274_support_default_package_dir.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_issue274_support_default_package_dir.py 2022-12-16 22:59:22.000000000 +0100 @@ -1,3 +1,5 @@ +import pytest + from . import ( _tmpdir, execute_setup_py, @@ -8,11 +10,13 @@ ) +(a)pytest.mark.deprecated @project_setup_py_test("issue-274-support-default-package-dir", ["install"], disable_languages_test=True) def test_install_command(): pass +(a)pytest.mark.deprecated def test_test_command(): with push_dir(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_issue274_support_one_package_without_package_dir.py new/scikit-build-0.16.4/tests/test_issue274_support_one_package_without_package_dir.py --- old/scikit-build-0.16.1/tests/test_issue274_support_one_package_without_package_dir.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_issue274_support_one_package_without_package_dir.py 2022-12-16 22:59:22.000000000 +0100 @@ -1,3 +1,5 @@ +import pytest + from . import ( _tmpdir, execute_setup_py, @@ -8,11 +10,13 @@ ) +(a)pytest.mark.deprecated @project_setup_py_test("issue-274-support-one-package-without-package-dir", ["install"], disable_languages_test=True) def test_install_command(): pass +(a)pytest.mark.deprecated def test_test_command(): with push_dir(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py new/scikit-build-0.16.4/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py --- old/scikit-build-0.16.1/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py 2022-12-16 22:59:22.000000000 +0100 @@ -1,6 +1,9 @@ +import pytest + from . import project_setup_py_test +(a)pytest.mark.deprecated @project_setup_py_test("issue-334-configure-cmakelist-non-cp1252-encoding", ["install"], disable_languages_test=True) def test_install_command(): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_logging.py new/scikit-build-0.16.4/tests/test_logging.py --- old/scikit-build-0.16.1/tests/test_logging.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_logging.py 2022-12-16 22:59:22.000000000 +0100 @@ -1,8 +1,9 @@ +import logging from types import SimpleNamespace import pytest -from skbuild.utils import distribution_hide_listing, distutils_log +from skbuild.utils import distribution_hide_listing setuptools_logging = pytest.importorskip("setuptools.logging") @@ -14,7 +15,7 @@ distribution.hide_listing = True with distribution_hide_listing(distribution): - distutils_log.info("This is hidden") + logging.getLogger("wheel").info("This is hidden") assert "This is hidden" not in caplog.text @@ -26,6 +27,6 @@ distribution.hide_listing = False with distribution_hide_listing(distribution): - distutils_log.info("This is not hidden") + logging.getLogger("wheel").info("This is not hidden") assert "This is not hidden" in caplog.text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_setup.py new/scikit-build-0.16.4/tests/test_setup.py --- old/scikit-build-0.16.1/tests/test_setup.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_setup.py 2022-12-16 22:59:22.000000000 +0100 @@ -146,7 +146,7 @@ ("banana", False, str), ), ) -def test_cmake_install_dir_keyword(cmake_install_dir, expected_failed, error_code_type, capsys): +def test_cmake_install_dir_keyword(cmake_install_dir, expected_failed, error_code_type, capsys, caplog): # ------------------------------------------------------------------------- # "SOURCE" tree layout: @@ -220,6 +220,7 @@ message = str(e) out, _ = capsys.readouterr() + out += caplog.text assert failed == expected_failed if failed: @@ -320,6 +321,7 @@ assert "CMake version 99.98.97 or higher is required." in message +(a)pytest.mark.deprecated @pytest.mark.filterwarnings("ignore:setuptools.installer is deprecated:Warning") @pytest.mark.skipif( os.environ.get("CONDA_BUILD", "0") == "1", @@ -379,7 +381,7 @@ @pytest.mark.parametrize("distribution_type", ("pure", "skbuild")) -def test_script_keyword(distribution_type, capsys): +def test_script_keyword(distribution_type, capsys, caplog): # ------------------------------------------------------------------------- # @@ -458,12 +460,13 @@ pass out, _ = capsys.readouterr() + out += caplog.text for message in messages: assert to_platform_path(message) in out @pytest.mark.parametrize("distribution_type", ("pure", "skbuild")) -def test_py_modules_keyword(distribution_type, capsys): +def test_py_modules_keyword(distribution_type, capsys, caplog): # ------------------------------------------------------------------------- # @@ -539,6 +542,7 @@ pass out, _ = capsys.readouterr() + out += caplog.text for message in messages: assert to_platform_path(message) in out @@ -943,7 +947,7 @@ @pytest.mark.parametrize("with_cmake_source_dir", [0, 1]) -def test_cmake_install_into_pure_package(with_cmake_source_dir, capsys): +def test_cmake_install_into_pure_package(with_cmake_source_dir, capsys, caplog): # ------------------------------------------------------------------------- # "SOURCE" tree layout: @@ -1056,6 +1060,7 @@ ] out, _ = capsys.readouterr() + out += caplog.text for message in messages: assert to_platform_path(message) in out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-build-0.16.1/tests/test_skbuild.py new/scikit-build-0.16.4/tests/test_skbuild.py --- old/scikit-build-0.16.1/tests/test_skbuild.py 2022-10-29 17:35:21.000000000 +0200 +++ new/scikit-build-0.16.4/tests/test_skbuild.py 2022-12-16 22:59:22.000000000 +0100 @@ -82,9 +82,9 @@ this_platform = platform.system().lower() if this_platform not in generator_platform[generator]: - pytest.skip(f"{generator} generator is available only on {this_platform.title()}") + pytest.skip(f"{generator} generator is not available on {this_platform.title()}") - @project_setup_py_test("hello-cpp", ["build"]) + @project_setup_py_test("hello-cpp", ["build"], ret=True) def run_build(): pass @@ -127,8 +127,8 @@ @pytest.mark.skipif(sys.platform != "win32", reason="Requires Windows") -(a)pytest.mark.parametrize("vs_year", ["2015", "2017", "2019", "2022"]) -def test_platform_windows_find_visual_studio(vs_year): +(a)pytest.mark.parametrize("vs_year", ["2017", "2019", "2022"]) +def test_platform_windows_find_visual_studio(vs_year, capsys): """If the environment variable ``SKBUILD_TEST_FIND_VS<vs_year>_INSTALLATION_EXPECTED`` is set, this test asserts the value returned by :func:`skbuild.platforms.windows.find_visual_studio()`. It skips the test otherwise. @@ -143,6 +143,8 @@ valid_path_expected = bool(int(os.environ[env_var])) vs_path = find_visual_studio(VS_YEAR_TO_VERSION[vs_year]) if valid_path_expected: + with capsys.disabled(): + print(f"\nFound VS {vs_year} @ {vs_path}") assert os.path.exists(vs_path) else: assert vs_path == "" @@ -160,7 +162,7 @@ if arch == "64bit": vs_generator += " Win64" - @project_setup_py_test("hello-cpp", ["build", "-G", vs_generator]) + @project_setup_py_test("hello-cpp", ["build", "-G", vs_generator], ret=True) def run_build(): pass

1 0

commit netsniff-ng for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netsniff-ng for openSUSE:Factory checked in at 2022-12-22 16:22:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netsniff-ng (Old) and /work/SRC/openSUSE:Factory/.netsniff-ng.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netsniff-ng" Thu Dec 22 16:22:56 2022 rev:9 rq:1044113 version:0.6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/netsniff-ng/netsniff-ng.changes 2021-02-03 19:54:43.137602061 +0100 +++ /work/SRC/openSUSE:Factory/.netsniff-ng.new.1835/netsniff-ng.changes 2022-12-22 16:23:08.486052641 +0100 @@ -1,0 +2,7 @@ +Wed Dec 21 16:15:37 UTC 2022 - Michael Pujos <pujos.michael(a)gmail.com> + +- fixed build failure caused by make install failing due to make 4.4 + behavior change in target ordering when parrallelism is enabled. + For this, -j1 is passed to make install to disable parrallelism + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netsniff-ng.spec ++++++ --- /var/tmp/diff_new_pack.41SeLY/_old 2022-12-22 16:23:08.974055447 +0100 +++ /var/tmp/diff_new_pack.41SeLY/_new 2022-12-22 16:23:08.998055585 +0100 @@ -1,7 +1,7 @@ # # spec file for package netsniff-ng # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2012 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -76,7 +76,8 @@ make %{?_smp_mflags} ETCDIR=%{_sysconfdir} Q= STRIP=: CFLAGS="%{optflags}" %install -make install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR=%{buildroot} +# disable parrallel execution with -j1 because it cause an error with make 4.4 +make -j1 install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR=%{buildroot} %files %license COPYING

1 0

commit os-autoinst for openSUSE:Factory
by Source-Sync 22 Dec '22

22 Dec '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package os-autoinst for openSUSE:Factory checked in at 2022-12-22 16:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old) and /work/SRC/openSUSE:Factory/.os-autoinst.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-autoinst" Thu Dec 22 16:22:53 2022 rev:353 rq:1044115 version:4.6.1671527615.519846f Changes: -------- --- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst.changes 2022-12-17 20:36:52.448713406 +0100 +++ /work/SRC/openSUSE:Factory/.os-autoinst.new.1835/os-autoinst.changes 2022-12-22 16:23:07.110044726 +0100 @@ -1,0 +2,10 @@ +Tue Dec 20 09:13:42 UTC 2022 - okurz(a)suse.com + +- Update to version 4.6.1671527615.519846f: + * log: Print PID + * Fix uncoverable comments + * Add switch to silence tidy + * Mark uncoverable branch in 02-test_ocr.t + * Add tesseract-ocr to test OCR in CI + +------------------------------------------------------------------- Old: ---- os-autoinst-4.6.1671186166.693557b.obscpio New: ---- os-autoinst-4.6.1671527615.519846f.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-autoinst-test.spec ++++++ --- /var/tmp/diff_new_pack.AQrCVw/_old 2022-12-22 16:23:08.162050777 +0100 +++ /var/tmp/diff_new_pack.AQrCVw/_new 2022-12-22 16:23:08.170050823 +0100 @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1671186166.693557b +Version: 4.6.1671527615.519846f Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later ++++++ os-autoinst.spec ++++++ --- /var/tmp/diff_new_pack.AQrCVw/_old 2022-12-22 16:23:08.198050984 +0100 +++ /var/tmp/diff_new_pack.AQrCVw/_new 2022-12-22 16:23:08.206051030 +0100 @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1671186166.693557b +Version: 4.6.1671527615.519846f Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later ++++++ os-autoinst-4.6.1671186166.693557b.obscpio -> os-autoinst-4.6.1671527615.519846f.obscpio ++++++ /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-4.6.1671186166.693557b.obscpio /work/SRC/openSUSE:Factory/.os-autoinst.new.1835/os-autoinst-4.6.1671527615.519846f.obscpio differ: char 49, line 1 ++++++ os-autoinst.obsinfo ++++++ --- /var/tmp/diff_new_pack.AQrCVw/_old 2022-12-22 16:23:08.278051444 +0100 +++ /var/tmp/diff_new_pack.AQrCVw/_new 2022-12-22 16:23:08.282051467 +0100 @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1671186166.693557b -mtime: 1671186166 -commit: 693557b4f8542674800a71deb867fe50dc0e8c08 +version: 4.6.1671527615.519846f +mtime: 1671527615 +commit: 519846f2d0cafd0b1f81d51f61ed08fae6ac9310

1 0