From 8d81ffac43fcfeefbbb94e7b0f6f2014e95807d2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 26 Jun 2025 00:16:48 +0100 Subject: [PATCH 001/133] gnu: python-hdmedians: Switch to Pytest backend. * gnu/packages/statistics.scm (python-hdmedians)[source]: Add patch fixing tests. [arguments] : Provide "--pyargs" option to tests against compiled module. : Remove 'build-extensions. [native-inputs]: Remove python-nose; add python-pytest. * gnu/packages/patches/python-hdmedians-replace-nose.patch: New file * gnu/local.mk (dist_patch_DATA): Register new patch. Change-Id: I86c577a55c2c273bd6504d225af8056f65593f77 --- gnu/local.mk | 1 + .../python-hdmedians-replace-nose.patch | 95 +++++++++++++++++++ gnu/packages/statistics.scm | 20 ++-- 3 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/python-hdmedians-replace-nose.patch diff --git a/gnu/local.mk b/gnu/local.mk index 634045a8ac8..580b457604c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2037,6 +2037,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-clarabel-blas.patch \ %D%/packages/patches/python-docrepr-fix-tests.patch \ %D%/packages/patches/python-feedparser-missing-import.patch \ + %D%/packages/patches/python-hdmedians-replace-nose.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch \ %D%/packages/patches/python-mohawk-pytest.patch \ diff --git a/gnu/packages/patches/python-hdmedians-replace-nose.patch b/gnu/packages/patches/python-hdmedians-replace-nose.patch new file mode 100644 index 00000000000..2341fee2cdb --- /dev/null +++ b/gnu/packages/patches/python-hdmedians-replace-nose.patch @@ -0,0 +1,95 @@ +This patch is from the upstream pull request. +https://github.com/daleroberts/hdmedians/pull/10. +It adds compatibility with Pytest and drops Nose. + +diff --git a/hdmedians/tests/test_geomedian.py b/hdmedians/tests/test_geomedian.py +index 0bc37e9..ff5f938 100644 +--- a/hdmedians/tests/test_geomedian.py ++++ b/hdmedians/tests/test_geomedian.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -124,10 +124,12 @@ def test_nangeomedian_axis_one_two_good(): + def test_nangeomedian_axis_bad(): + data = np.array([[1.0, np.nan, 1.0], + [2.0, 1.0, 1.0]]) +- assert_raises(IndexError, hd.nangeomedian, data, axis=2) ++ with pytest.raises(IndexError): ++ hd.nangeomedian(data, axis=2) + + + def test_nangeomedian_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nangeomedian, data) ++ with pytest.raises(ValueError): ++ hd.nangeomedian(data) +diff --git a/hdmedians/tests/test_medoid.py b/hdmedians/tests/test_medoid.py +index c5e0a7f..4fbdf80 100644 +--- a/hdmedians/tests/test_medoid.py ++++ b/hdmedians/tests/test_medoid.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -59,7 +59,7 @@ def test_medoid_in_set_random(): + s = [list(x) for x in a.T] + m = hd.medoid(a) + idx = s.index(list(m)) +- assert_true(idx > -1) ++ assert(idx > -1) + + + def test_medoid_noaxis(): +@@ -85,7 +85,8 @@ def test_medoid_axis_one(): + + + def test_medoid_axis_bad(): +- assert_raises(IndexError, hd.medoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.medoid(DATA1, axis=2) + + + def test_medoid_noaxis_indexonly(): +@@ -136,7 +137,8 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) + + + def test_nanmedoid_axis_zero(): +@@ -170,7 +172,8 @@ def test_nanmedoid_axis_one_indexonly(): + + + def test_nanmedoid_axis_bad(): +- assert_raises(IndexError, hd.nanmedoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.nanmedoid(DATA1, axis=2) + + + def test_nanmedoid_two_obs(): +@@ -184,4 +187,5 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 28a619e6641..b33d99e29f8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1100,19 +1100,19 @@ correlated samples from Markov Chain Monte Carlo (MCMC).") (uri (pypi-uri "hdmedians" version)) (sha256 (base32 - "1mn2k8srnmfy451l7zvb2l4hn9701bc5awjm6q3vmqbicyqyqyml")))) + "1mn2k8srnmfy451l7zvb2l4hn9701bc5awjm6q3vmqbicyqyqyml")) + (patches (search-patches "python-hdmedians-replace-nose.patch")))) (build-system pyproject-build-system) (arguments (list - #:phases - '(modify-phases %standard-phases - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before running the tests. - (invoke "python" "setup.py" "build_ext" "--inplace")))))) - (propagated-inputs (list python-cython python-numpy python-setuptools - python-wheel)) - (native-inputs (list python-nose)) + #:test-flags #~(list "--pyargs" "hdmedians"))) + (native-inputs + (list python-pytest)) + (propagated-inputs + (list python-cython + python-numpy + python-setuptools + python-wheel)) (home-page "http://github.com/daleroberts/hdmedians") (synopsis "High-dimensional medians") (description "Various definitions for a high-dimensional median exist and From dd86d04db7768823227d31621da086a53cbe7cfe Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 29 Jul 2025 15:23:53 +0100 Subject: [PATCH 002/133] gnu: python-pdoc3: Fix tests. * gnu/packages/python-xyz.scm (python-pdoc3) [arguments] : Use 'unittest. [native-inputs]: Remove python-wheel. Change-Id: If307d72856cc7109ede8479939e62ed1638d1b7e --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 382a9e4b0ad..1f068cef941 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -37650,11 +37650,13 @@ keyboard-friendly package.") (sha256 (base32 "11z318lnvd7nxkpw2556hh6hvid6gi8mxgv4zf8x2m57hx5yi98y")))) (build-system pyproject-build-system) + (arguments + (list #:test-backend #~'unittest + #:test-flags #~(list "-v" "pdoc.test"))) (native-inputs (list python-setuptools-git python-setuptools - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-mako python-markdown)) From 55a7b39d1720b57dc7d021dd5e2edf68f6f7045c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 16 Jul 2025 15:07:32 +0100 Subject: [PATCH 003/133] gnu: Add python-domdf-python-tools. * gnu/packages/python-xyz.scm (python-domdf-python-tools): New variable. Change-Id: If3da8a2193001129bcc95b2bc2866bbdabe60547 --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f068cef941..695c9c53aa7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -762,6 +762,29 @@ Sorensen distance, plus some bonuses. All distance computations are implemented in pure Python, and most of them are also implemented in C.") (license license:gpl2+))) +(define-public python-domdf-python-tools + (package + (name "python-domdf-python-tools") + (version "3.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "domdf_python_tools" version)) + (sha256 + (base32 "16727afn92bp6hj4hvp27scc5ldz1y27z9abbxgi9sgiyk90iqra")))) + (build-system pyproject-build-system) + (native-inputs (list python-hatch-requirements-txt)) + (arguments (list #:tests? #f)) ;no tests in PyPI archive + (propagated-inputs + (list python-natsort + python-typing-extensions)) + (home-page "https://github.com/domdfcoding/domdf_python_tools") + (synopsis "Helpful functions for Python") + (description + "This package provide helpfull functions for Python's testing and +packaging tasks.") + (license license:expat))) + (define-public python-fastnumbers (package (name "python-fastnumbers") From 00a7c426290f6ffd34f197c6bc6b7e2c703dbad2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 28 Jul 2025 13:45:00 +0100 Subject: [PATCH 004/133] gnu: python-dask-image: Reduce closure size. * gnu/packages/python-science.scm (python-dask-image): [propagated-inputs]: Remove python-pandas-2; add python-pandas. [native-inputs]: Remove python-coverage, python-flake8, python-pytest-cov, python-pytest-flake8, python-twine, and python-wheel. Change-Id: I30880cb0abc6d24533871f072d4277fed644c82d --- gnu/packages/python-science.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 0305036316a..a5086b91908 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -904,21 +904,15 @@ optimization and generally improved organization.") (string-append "version = \"" #$version "\"")))))))) (propagated-inputs (list python-dask python-numpy - python-pandas-2 + python-pandas python-pims python-scipy python-tifffile)) (native-inputs - (list python-coverage - python-flake8 - python-pytest - python-pytest-cov - python-pytest-flake8 + (list python-pytest python-pytest-timeout python-setuptools - python-setuptools-scm - python-twine - python-wheel)) + python-setuptools-scm)) (home-page "https://github.com/dask/dask-image") (synopsis "Distributed image processing") (description "This is a package for image processing with Dask arrays. From d5fee3edc7b78068e660a362496a603bbd128305 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 31 Jul 2025 21:15:39 +0100 Subject: [PATCH 005/133] gnu: python-colorthief: Do not try to run tests. * gnu/packages/python-xyz.scm (python-colorthief): Tests were absent in PyPI or Git. [arguments] : Disable them. [native-inputs]: Remove python-wheel. Change-Id: Ib63b612913a3b494c7c0f4a717a790d71230f8d6 --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 695c9c53aa7..adf138707d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2382,7 +2382,9 @@ as functions or string constants to form colored terminal output.") (sha256 (base32 "08bjsmmkihyksms2vgndslln02rvw56lkxz28d39qrnxbg4v1707")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools python-wheel)) + (arguments + (list #:tests? #f)) ;no tests in PyPI or Git + (native-inputs (list python-setuptools)) (propagated-inputs (list python-pillow)) (home-page "https://github.com/fengsp/color-thief-py") (synopsis "Grab the color palette of an image") From a22e75ea4a00e7d33411697e312c83cdf8c1878f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 4 Aug 2025 21:42:21 +0100 Subject: [PATCH 006/133] gnu: python-validate-email: Switch to pyproject-build-system. * gnu/packages/python-xyz.scm (python-validate-email): [build-system]: Use pyproject. [native-inputs]: Add python-setuptools. Change-Id: I2b33349f1e940353a1bbda564cf07b6c9438b33f --- gnu/packages/python-xyz.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index adf138707d9..51998334ea3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27357,12 +27357,14 @@ input.") (version "1.3") (source (origin - (method url-fetch) - (uri (pypi-uri "validate_email" version)) - (sha256 - (base32 - "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq")))) - (build-system python-build-system) + (method url-fetch) + (uri (pypi-uri "validate_email" version)) + (sha256 + (base32 "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;no tests in PyPI or Git + (native-inputs + (list python-setuptools)) (home-page "https://github.com/syrusakbary/validate_email") (synopsis "Verifies if an email address is valid and really exists") (description "@code{validate_email} can be used to verify if an email From b9601426abc84ea09f5beb69c2707771a87bf5b4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 15:48:21 +0100 Subject: [PATCH 007/133] gnu: python-pyliblo3: Fix build. * gnu/packages/audio.scm (python-pyliblo3): [arguments] : Use custom. : Add 'fix-compilation. Change-Id: Ie188c8038c239db94871593f0dfbf6e3b0ea899e --- gnu/packages/audio.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 17486d61503..25fc36bc59a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3616,8 +3616,25 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (base32 "1rr2m8jxa5yxyb3pw6h93kvdxg7x0m6sxxxvgn34vq8k8mg1kz21")))) (build-system pyproject-build-system) - (native-inputs (list python-cython python-setuptools python-wheel)) - (inputs (list liblo)) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "test/unit.py") + #:phases + #~(modify-phases %standard-phases + ;; long is not available and replaced by int, proposed in + ;; . + (add-after 'unpack 'fix-compilation + (lambda _ + (substitute* "pyliblo3/_liblo.pyx" + (("long\\(") "int(") + ((", long") ""))))))) + (native-inputs + (list python-cython + python-setuptools + python-wheel)) + (inputs + (list liblo)) (home-page "https://github.com/gesellkammer/pyliblo3") (synopsis "Python bindings for liblo") (description From 8e8b222ab13ced629e0f50633f8167003ac0d9cf Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 10:10:33 +0100 Subject: [PATCH 008/133] gnu: python-blake3: Fix build. * gnu/packages/python-crypto.scm (python-blake3)[arguments] : Add pyproject-build-system-modules : Likewise. : Simplify 'build-python-module, and 'install-python-module. Remove 'install-python-library. [native-inputs]: Remove python-pypa-build and python-wheel; add maturin. Change-Id: Ib45da9873b40697ba2166bb31f11da16f4872223 --- gnu/packages/python-crypto.scm | 58 ++++++---------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index adf821df29e..6b0270a2c61 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -340,59 +340,21 @@ production use. Include this module and use its backends at your own risk.") (arguments (list #:install-source? #f + #:imported-modules `(,@%pyproject-build-system-modules + ,@%cargo-build-system-modules) + #:modules `((guix build cargo-build-system) + ((guix build pyproject-build-system) #:prefix py:) + (guix build utils)) #:phases #~(modify-phases %standard-phases - (add-after 'install 'build-python-module - (lambda _ - ;; We don't use maturin. - (delete-file "pyproject.toml") - (call-with-output-file "pyproject.toml" - (lambda (port) - (format port "\ -[build-system] -build-backend = 'setuptools.build_meta' -requires = ['setuptools'] -"))) - (call-with-output-file "setup.cfg" - (lambda (port) - (format port "\ - -[metadata] -name = blake3 -version = ~a - -[options] -packages = find: - -[options.packages.find] -exclude = - src* - c_impl* - tests* - Cargo.toml -" #$version))) - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (add-after 'build 'build-python-module + (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module - (lambda* (#:key outputs #:allow-other-keys) - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) - (add-after 'install-python-module 'install-python-library - (lambda _ - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages"))) - (mkdir-p site) - (copy-file "target/release/libblake3.so" - (string-append site "/blake3.so")))))))) - (inputs (cargo-inputs 'python-blake3)) + (assoc-ref py:%standard-phases 'install))))) (native-inputs (list python-wrapper - python-pypa-build - python-wheel)) + maturin)) + (inputs (cargo-inputs 'python-blake3)) (home-page "https://github.com/oconnor663/blake3-py") (synopsis "Python bindings for the Rust blake3 crate") (description "This package provides Python bindings for the Rust crate of From a36fa389f1f642116e52c9e41cd3b98a0b600af5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 14 Jul 2025 16:27:33 +0100 Subject: [PATCH 009/133] gnu: python-apipkg: Update to 3.0.2. * gnu/packages/python-xyz.scm (python-apipkg): Update to 3.0.2. [build-system]: Use pyproject. [native-inputs]: Remove python-pytest and python-setuptools-scm; add python-hatch-vcs and python-hatchling. Change-Id: I87fe8543f29506b6a453984de6191b97503e97c5 --- gnu/packages/python-xyz.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 51998334ea3..c1f7d49b1fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20288,21 +20288,23 @@ to your log entries.") (define-public python-apipkg (package (name "python-apipkg") - (version "1.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "apipkg" version)) - (sha256 - (base32 - "1xhak74yj3lqflvpijg15rnkklrigvsp5q7s4as4h6a157d8q8ip")))) - (build-system python-build-system) + (version "3.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "apipkg" version)) + (sha256 + (base32 "03ay7j57mfh4sa8vh9qwid1ggwdc0lasyw3ycsmgv5r6z2j63an7")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;no tests in PyPI archvie (native-inputs - (list python-pytest python-setuptools-scm)) + (list python-hatch-vcs + python-hatchling)) + (home-page "https://github.com/pytest-dev/apipkg") (synopsis "Namespace control and lazy-import mechanism") (description "With apipkg you can control the exported namespace of a Python package and greatly reduce the number of imports for your users. It is a small pure Python module that works on virtually all Python versions.") - (home-page "https://github.com/pytest-dev/apipkg") (license license:expat))) (define-public python-execnet From 0c91c8afa3af244f53ed206a0f0e1d9fc0b2a1f8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 20:39:47 +0100 Subject: [PATCH 010/133] gnu: python-changeo: Adjust inputs. * gnu/packages/bioinformatics.scm (python-changeo)[propagated-inputs]: Remove python-importlib-resources-6; add python-importlib-resources. Change-Id: I3e738146d68d6c20387451ae14791329df2bc968 --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3b56fde1840..a3a4538c991 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4757,7 +4757,7 @@ high-throughput sequencing of B cell and T cell repertoires.") (propagated-inputs (list python-airr python-biopython - python-importlib-resources-6 + python-importlib-resources python-numpy python-packaging python-pandas From 97a34a55ce7d4b3ce3df3f508a57a175df2f5e4a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 21:00:53 +0100 Subject: [PATCH 011/133] gnu: python-changeo: Adjust style. * gnu/packages/bioinformatics.scm (python-changeo): Re-order fields, activate tests. [source]: Switch to PyPI archive which provides tests. [native-inputs]: Remove python-airr and python-wheel; add python-pytest. [home-page]: Use the one which is provided by PyPI. Change-Id: I5b21bc984f197d7fa634efb0672b5cbb6fc85447 --- gnu/packages/bioinformatics.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a3a4538c991..7136271fa64 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4742,18 +4742,19 @@ high-throughput sequencing of B cell and T cell repertoires.") (package (name "python-changeo") (version "1.3.4") - (home-page "https://github.com/immcantation/changeo") (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "changeo" version)) (sha256 - (base32 - "1230bb7672n6nqkrw2fvrprknchhlvvxb76l1r4g6ybrq0g7l0rb")))) + (base32 "0jm4chddpl929a8daicp9mv14nwzf2hajpjfhzckg6x8cpgc1087")))) (build-system pyproject-build-system) + (arguments + (list + #:build-backend "setuptools.build_meta")) + (native-inputs + (list python-pytest + python-setuptools)) (propagated-inputs (list python-airr python-biopython @@ -4764,13 +4765,7 @@ high-throughput sequencing of B cell and T cell repertoires.") python-presto python-pyyaml python-scipy)) - (native-inputs - (list python-airr - python-setuptools - python-wheel)) - (arguments - (list - #:build-backend "setuptools.build_meta")) + (home-page "http://changeo.readthedocs.io") (synopsis "Repertoire clonal assignment toolkit") (description "Change-O is a collection of tools for processing the output of V(D)J alignment tools, assigning clonal clusters to immunoglobulin (Ig) From bce2687761de5c46e0f598d426aa1bd5a73e90f4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 01:30:45 +0100 Subject: [PATCH 012/133] gnu: python-esptool: Update to 5.0.2. * gnu/packages/engineering.scm (python-esptool): Update to 5.0.2. [propagated-inputs]: Remove python-rich-click-next; add python-rich-click. [native-inputs]: Remove python-wheel. Change-Id: I3365176fbe02cb8bd2e190d1e584b91d27643b28 --- gnu/packages/engineering.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5c810617771..6b44955b94b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2112,7 +2112,7 @@ multiple services and devices with hundreds of supported integrations.") (define-public python-esptool (package (name "python-esptool") - (version "5.0.1") + (version "5.0.2") (source (origin (method git-fetch) @@ -2121,7 +2121,7 @@ multiple services and devices with hundreds of supported integrations.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04asqw6g4lhkz6fqn22wwk2wjq5q8c00m2k8wylksrc0v2f582i9")))) + (base32 "1wl75j6ncm5lahy9pzc38qivhaf9p42a2bijishdkwkw388fs6x1")))) (build-system pyproject-build-system) (arguments (list @@ -2143,11 +2143,10 @@ multiple services and devices with hundreds of supported integrations.") python-pyserial python-pyyaml python-reedsolo - python-rich-click-next)) + python-rich-click)) (native-inputs (list python-pyelftools python-pytest - python-setuptools - python-wheel)) + python-setuptools)) (home-page "https://github.com/espressif/esptool") (synopsis "Bootloader utility for Espressif ESP8266 & ESP32 chips") (description From 3f7d891ba4783ae2c29234e06583d44dcbead267 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 28 Jul 2025 15:44:21 +0100 Subject: [PATCH 013/133] gnu: python-flask-restx: Switch to pyproject, fix buld. * gnu/packages/python-web.scm (python-flask-restx): [build-system]: Use pyproject. [argument] : Utilze it and rework skipped tests. : Use default 'check. [propagated-inputs]: Add python-importlib-resources and python-werkzeug. [native-inputs]: Add python-setuptools. Change-Id: Idd82b4d255854a21953533c3a66c74adeb6ac596 --- gnu/packages/python-web.scm | 53 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1d433664b1e..e934c82f70c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -9180,40 +9180,47 @@ requests.") (name "python-flask-restx") (version "1.3.0") (source - ;; We fetch from the Git repo because there are no tests in the PyPI - ;; archive. (origin - (method git-fetch) + (method git-fetch) ;no tests in PyPI archive (uri (git-reference - (url "https://github.com/python-restx/flask-restx") - (commit version))) + (url "https://github.com/python-restx/flask-restx") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1qmm3i1cdv0bvzsc1gn4ql2dsf1fbx85fk69vcmzpsdxzczmw508")))) - (build-system python-build-system) - (propagated-inputs - (list python-aniso8601 python-flask python-jsonschema python-pytz)) + (build-system pyproject-build-system) + (arguments + (list + ;; 1214 passed, 6 skipped, 16 deselected, 3 warnings + #:test-flags + #~(list "--benchmark-skip" + ;; ValueError: http://www.google.com is not a valid URL. Domain + ;; does not exists. + "--deselect=tests/test_inputs.py::URLTest::test_check" + "-k" (string-join + ;; See: . + (list "not test_rfc822_value" + "test_iso8601_value" + ;; assert 404 == 2000 + "test_specs_endpoint_host_and_subdomain" + ;; ValueError: test@gmail.com is not a valid email + "test_valid_value_check") + " and not ")))) (native-inputs (list python-blinker python-faker python-pytest python-pytest-benchmark python-pytest-flask - python-pytest-mock)) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "--benchmark-skip" "-k" - ;; Those tests need internet access - (string-join - '("not test_check" - "not test_valid_value_check" - "not test_override_app_level" - "not test_redirect" - "not test_swagger") - " and "))))))) + python-pytest-mock + python-setuptools)) + (propagated-inputs + (list python-aniso8601 + python-flask + python-importlib-resources + python-jsonschema + python-pytz + python-werkzeug)) (home-page "https://github.com/python-restx/flask-restx") (synopsis "Framework for fast, easy and documented API development with Flask") From f11fcd0f6247baaf9a9840aea17892e6fe4e11c9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 4 Aug 2025 22:38:23 +0100 Subject: [PATCH 014/133] gnu: python-flex: Switch to pyproject-build-system. * gnu/packages/python-xyz.scm (python-flex): Add a maintenance note to remove the packages in the future. [build-system]: Use pyproject. [arguments] : No tests in PyPI archive provided. [native-inputs]: Add python-seuptools. Change-Id: I61cb165c089a97514ead78317158f21591003c32 --- gnu/packages/python-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c1f7d49b1fd..e50ce1cb674 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27373,6 +27373,9 @@ input.") address is valid and really exists.") (license license:lgpl3+))) +;; XXX: Project has no updates since 2019, consider to remove when nothing +;; depends on it in the next refresh cycle. +;; See: . (define-public python-flex (package (name "python-flex") @@ -27384,7 +27387,10 @@ input.") (sha256 (base32 "1sr91f5sqywj4040jm3cq4333fp8hbmmr7v6v05a3h0sgyixcbi9")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;no tests in PyPI archive + (native-inputs + (list python-setuptools)) (propagated-inputs (list python-click python-jsonpointer From 84527ea25477e48622dcccb5886ab8cdb435584a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 28 Jul 2025 16:15:24 +0100 Subject: [PATCH 015/133] gnu: python-graphene: Update to 3.4.3. * gnu/packages/python-xyz.scm (python-graphene): Update to 3.4.3. [build-system]: Use pyproject. [propagated-inputs]: Remove python-aniso8601, python-promise, and python-six; add python-dateutil and python-typing-extensions. [native-inputs]: Add python-setuptools. Change-Id: I193d1b7580c4647357d6150d49a9a5e5610d590b --- gnu/packages/python-xyz.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e50ce1cb674..70c29cd81d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25179,26 +25179,29 @@ numbers, real numbers, mixed types and more, and comes with a shell command (define-public python-graphene (package (name "python-graphene") - (version "3.0") + (version "3.4.3") (source - (origin - (method url-fetch) - (uri (pypi-uri "graphene" version)) - (sha256 - (base32 - "08m1n2ydk48c18cvl8474v3pwwacjl1vgq61m9qs00122mp0cj5g")))) - (build-system python-build-system) - (propagated-inputs - (list python-graphql-core python-graphql-relay python-aniso8601 - python-promise python-six)) + (origin + (method url-fetch) + (uri (pypi-uri "graphene" version)) + (sha256 + (base32 "1aha3bnrafxd823q4swdmlvbprfb17v3fga4g3hffpz7ija8cdra")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f)) ; no tests/ in the PyPI tarball + (list #:tests? #f)) ;XXX: tests fail to load + (native-inputs + (list python-setuptools)) + (propagated-inputs + (list python-dateutil + python-graphql-core + python-graphql-relay + python-typing-extensions)) (home-page "https://graphene-python.org/") (synopsis "GraphQL Framework for Python") (description - "Graphene is a Python library for building GraphQL schemas/types. - A GraphQL schema describes your data model, and provides a GraphQL server - with an associated set of resolve methods that know how to fetch data.") + "Graphene is a Python library for building GraphQL schemas/types. A +GraphQL schema describes your data model, and provides a GraphQL server with +an associated set of resolve methods that know how to fetch data.") (license license:expat))) (define-public python-random2 From aa52e30c41e372861279d6d7ff9a2df38f3486a7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 10:56:10 +0100 Subject: [PATCH 016/133] gnu: python-numpy-documentation: Fix build. * gnu/packages/python-xyz.scm (python-numpy-documentation): [arguments] : Do not delete 'build, extract all build steps from 'install; PDF build fails and excluded for now. [native-inputs]: Remove python-sphinx-panels; {texlive-local-tree}: add texlive-cmap. [description]: Remove mention of PDF. Change-Id: I5f154ec681b127fd4c74667ec097a6409eacf099 --- gnu/packages/python-xyz.scm | 79 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 70c29cd81d8..7f10e69ddd4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10748,47 +10748,50 @@ numpysane has: "texmf-dist/fonts/opentype/public/gnu-freefont")) (setenv "GUIX_TEXMF" (string-append (getenv "GUIX_TEXMF") ":" (getcwd) "/texmf-dist")))) - (delete 'build) + (replace 'build + (lambda _ + (chdir "doc") + (let ((sphinxopts (string-append + "SPHINXOPTS=-j" + (number->string (parallel-job-count))))) + ;; Do not treat warnings as errors. + (substitute* "Makefile" + ((" -WT ") " -T ")) + (setenv "HOME" "/tmp") + ;; Build the PDF documentation. + (invoke "make" "latex-build" sphinxopts) + ;; FIXME: PDF build fails + ;; (invoke "make" "-C" "build/latex" "all-pdf" sphinxopts) + ;; Build the HTML documentation + (invoke "make" "html" sphinxopts) + ;; Build the Info documentation. The issues worked around + ;; below can be tracked at + ;; https://github.com/numpy/numpy/issues/12278. + (substitute* "source/conf.py" + ;; The root document should be "index", not "contents". + (("\"contents\"") "'index'") + ;; Disable Sphinx extensions that produce broken Texinfo. + ((".*'numpydoc'.*") "") + ((".*'sphinx.ext.autodoc'.*") "") + ((".*'sphinx.ext.autosummary'.*") "")) + (invoke "make" "info" sphinxopts)))) (replace 'install (lambda _ (let* ((data (string-append #$output "/share")) (doc (string-append data "/doc/numpy")) (html (string-append doc "/html")) - (info (string-append data "/info")) - (sphinxopts (string-append - "SPHINXOPTS=-j" - (number->string (parallel-job-count))))) - (with-directory-excursion "doc" - ;; Do not treat warnings as errors. - (substitute* "Makefile" - ((" -WT ") " -T ")) - (setenv "HOME" "/tmp") - ;; Build the PDF documentation. - (invoke "make" "latex-build" sphinxopts) - (invoke "make" "-C" "build/latex" "all-pdf" sphinxopts) - ;; Build the HTML documentation - (invoke "make" "html" sphinxopts) - ;; Build the Info documentation. The issues worked around - ;; below can be tracked at - ;; https://github.com/numpy/numpy/issues/12278. - (substitute* "source/conf.py" - ;; The root document should be "index", not "contents". - (("\"contents\"") "'index'") - ;; Disable Sphinx extensions that produce broken Texinfo. - ((".*'numpydoc'.*") "") - ((".*'sphinx.ext.autodoc'.*") "") - ((".*'sphinx.ext.autosummary'.*") "")) - (invoke "make" "info" sphinxopts) - ;; Install the HTML documentation. - (mkdir-p html) - (copy-recursively "build/html" html) - ;; Install the PDF reference and user manuals. - (install-file "build/latex/numpy-ref.pdf" doc) - (install-file "build/latex/numpy-user.pdf" doc) - ;; Install the info manual. - (install-file "build/texinfo/numpy.info" info) - (symlink (string-append html "/_images") - (string-append info "/numpy-figures"))))))))) + (info (string-append data "/info"))) + ;; Install the HTML documentation. + (mkdir-p html) + (copy-recursively "build/html" html) + ;; Install the PDF reference and user manuals. + ;; FIXME: + ;; (install-file "build/latex/numpy-ref.pdf" doc) + ;; (install-file "build/latex/numpy-user.pdf" doc) + ;; Install the info manual. + (install-file "build/texinfo/numpy.info" info) + (symlink (string-append html "/_images") + (string-append info "/numpy-figures")))))))) (native-inputs (list font-gnu-freefont perl @@ -10802,11 +10805,11 @@ numpysane has: python-scipy ;used by matplotlib python-sphinx python-sphinx-design - python-sphinx-panels texinfo (texlive-local-tree (list texlive-cbfonts texlive-cm-super + texlive-cmap texlive-expdlist texlive-fandol texlive-greek-fontenc @@ -10818,7 +10821,7 @@ numpysane has: (propagated-inputs '()) (synopsis "Documentation for the @code{python-numpy} package") (description "This package provides the complete NumPy documentation in -the Texinfo, HTML, and PDF formats."))) +the Texinfo, and HTML formats."))) (define-public python-numpy-stl (package From d12318893c23e00d5a4847b82ca0d945b38d325b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 16 Jul 2025 21:20:39 +0100 Subject: [PATCH 017/133] gnu: python-jaraco-packaging: Update to 9.4.0. * gnu/packages/python-xyz.scm (python-jaraco-packaging): Update to 9.4.0. [arguments] : Disable them. [propagated-inputs]: Remove python-pytest, python-pytest-checkdocs, python-pytest-flake8, python-rst.linker, python-setuptools, python-setuptools-scm, and python-six; add python-pypa-build, python-virtualenv, python-domdf-python-tools, and python-jaraco-context. [native-inputs]: Add python-setuptools and python-setuptools-scm. Change-Id: Ic2b9c97d6c31dfeaed17c6e642bde7744119f3f1 --- gnu/packages/python-xyz.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7f10e69ddd4..27c653261b4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14200,26 +14200,25 @@ module with a few extra procedures.") (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") - (version "6.1") + (version "9.4.0") ;the latest version compatible with python-pypa-build@0.9.0 (source (origin (method url-fetch) (uri (pypi-uri "jaraco.packaging" version)) (sha256 (base32 - "0zimrnkh33b9g8ffw11mjh6kvs54cy5gcjw1h5cl1r7dc833dmkm")))) + "1djpwmw2gmb6i9by1bc4lh4qlkvifgsqfj5alb9xz7pa80fcm416")))) (build-system pyproject-build-system) (arguments - (list #:test-flags - '(list "-k" "not project and not test_revived_distribution"))) + (list #:tests? #f)) ;no tests in PyPI archive + (native-inputs + (list python-setuptools + python-setuptools-scm)) (propagated-inputs - (list python-pytest - python-pytest-checkdocs - python-pytest-flake8 - python-rst.linker - python-setuptools - python-setuptools-scm - python-six + (list python-pypa-build + python-virtualenv + python-domdf-python-tools + python-jaraco-context python-sphinx)) (home-page "https://github.com/jaraco/jaraco.packaging") (synopsis "Tools to supplement packaging Python releases") From 686f511c68fc0ac53f5d61e27534cb2e77879e5a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 8 Aug 2025 13:28:53 +0100 Subject: [PATCH 018/133] gnu: python-pyclibrary: Adjust inputs. * gnu/packages/python-xyz.scm (python-pyclibrary) [propagated-inputs]: Remove python-pyparsing-2.4.7; add python-pyparsing. [native-inputs]: Remove python-wheel. Change-Id: Ifc03f143b92ebedfc938f7feb6363e5c96b064c1 --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 27c653261b4..dce9ca7cb40 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28179,9 +28179,12 @@ Rust Python extensions implemented with @code{PyO3} or @code{rust-cpython}.") (add-after 'unpack 'set-version (lambda _ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" "0.2.2")))))) - (native-inputs (list python-pytest python-setuptools - python-setuptools-scm python-wheel)) - (propagated-inputs (list python-pyparsing-2.4.7)) + (native-inputs + (list python-pytest + python-setuptools + python-setuptools-scm)) + (propagated-inputs + (list python-pyparsing)) (home-page "https://github.com/MatthieuDartiailh/pyclibrary") (synopsis "Wrap dynamic libraries in Python") (description From abe55a3f2711991597ce4559f17c0eb94c6b7853 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 29 Jul 2025 16:25:08 +0100 Subject: [PATCH 019/133] gnu: python-pypugjs: Update to 5.12.0. * gnu/packages/python-xyz.scm (python-pypugjs): Update to 5.12.0. [arguments] : Drop it, as all tests passed just fine. : Remove 'disable-pyramid. [propagated-inputs]: Remove python-six. [native-inputs]: Remove python-coverage, python-flake8, python-nose, and python-wheel. Change-Id: I8d421e7777d37ed2caf1b040d71a72b58cfba66c --- gnu/packages/python-xyz.scm | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dce9ca7cb40..cf74f55d3e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8188,7 +8188,7 @@ templates. A format string can be provided to control the output.") (define-public python-pypugjs (package (name "python-pypugjs") - (version "5.9.12") + (version "5.12.0") (source (origin (method git-fetch) @@ -8197,29 +8197,16 @@ templates. A format string can be provided to control the output.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0zj7a560h973cl7brfw1nmyhgm8rp8j80wnih0shvhmw4ql23lpa")))) + (base32 "008wxvh2p08i8mlgak8hz3z057m06m4ydrca2ickl2m593476xi4")))) (build-system pyproject-build-system) - (arguments - (list - #:test-flags '(list "pypugjs/testsuite/") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-pyramid - (lambda _ - ;; pyramid is outdated and pyramid-mako is unpackaged. - (substitute* "setup.cfg" - (("'(pyramid|pyramid-mako)[^']*',") ""))))))) - (native-inputs (list python-coverage - python-django + (native-inputs (list python-django python-jinja2 - python-flake8 python-flask python-mako - python-nose python-poetry-core python-pytest - python-tornado-6 - python-wheel)) - (propagated-inputs (list python-charset-normalizer python-six)) + python-tornado-6)) + (propagated-inputs (list python-charset-normalizer)) (home-page "https://github.com/kakulukia/pypugjs") (synopsis "Convert Pug source files into different template languages") (description From b0dae2fc97af57a8b470007a5edbc9316afbe8e4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 5 Aug 2025 16:02:56 +0100 Subject: [PATCH 020/133] gnu: python-sphinxcontrib-github-alt: Switch to pyproject. * gnu/packages/sphinx.scm (python-sphinxcontrib-github-alt): [build-system]: Use pyproject-build-system. [native-inputs]: Add python-flit-core. Change-Id: I0a403a5eadf7b76c4448781ff20ca18ff466cb2d --- gnu/packages/sphinx.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 0d92d7d9cca..7893ecf3aa2 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -560,9 +560,14 @@ size responsive web components.") (sha256 (base32 "1x9af78vamjjcdrrhiah3wg613jv7gm8yh9vvqfrmf4vam6mimyg")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (arguments + `(#:tests? #f)) ;no tests + (native-inputs + (list python-flit-core)) (propagated-inputs - (list python-docutils python-sphinx)) + (list python-docutils + python-sphinx)) (home-page "https://github.com/jupyter/sphinxcontrib_github_alt") (synopsis "Link to GitHub pages from Sphinx docs") (description From 0d4b171308dbc0c355b645e58f4b514b3bfe6805 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 11:13:23 +0100 Subject: [PATCH 021/133] gnu: repo2docker: Update to 2024.07.0. * gnu/packages/jupyter.scm (repo2docker): Update to 2024.07.0. Change-Id: I5c0bea8245b6072b85c5c3cb901a8c6c86056276 --- gnu/packages/jupyter.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 19409552a05..e694fa6761a 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -1073,7 +1073,7 @@ version to the original file.") (define-public repo2docker (package (name "repo2docker") - (version "2024.03.0") + (version "2024.07.0") (source (origin (method git-fetch) (uri (git-reference @@ -1082,7 +1082,7 @@ version to the original file.") (file-name (git-file-name name version)) (sha256 (base32 - "1bcnl91j6p3315lk2mmn02jq6mjsn68m9rcw5rkln4c9fx1160rx")))) + "1fg71bldvfiln8h91sca4bjhwk7vdh80rhf0514qk6vqpikpx4cb")))) (outputs '("out" "doc")) (build-system pyproject-build-system) (arguments From 71724e752e7d4091fab4abe75a110a3ac071f48c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 12 Jul 2025 22:17:33 +0100 Subject: [PATCH 022/133] gnu: s-tui: Use python-psutil. * gnu/packages/admin.scm (s-tui): [inputs]: Remove python-psutil-7; add python-psutil. Change-Id: I97816f7827b64d6facfa4b31d038ec303a91a6a1 --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fb38a5349e1..8bf6c1d5127 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2874,7 +2874,7 @@ development, not the kernel implementation of ACPI.") python-setuptools python-wheel)) (inputs - (list python-psutil-7 + (list python-psutil python-urwid-3)) (home-page "https://github.com/amanusk/s-tui") (synopsis "Interactive terminal stress test and monitoring tool") From 3eb053cc689f91e5cb7b9f46f589db6fb74aeaa4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 17 Jun 2025 18:49:18 +0100 Subject: [PATCH 023/133] gnu: solaar: Switch to pyproject. * gnu/packages/admin.scm (solaar)[build-system]: Switch to pyproject-build-system. [native-inputs]: Add python-setuptools, python-wheel, python-pytest-mock and python-typing-extensions. Change-Id: Ic4bebcf4d616d759c184eb096cbc085d505935fd --- gnu/packages/admin.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8bf6c1d5127..11638b539b6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5125,23 +5125,22 @@ cache of unix and unix-like systems.") (package (name "solaar") (version "1.1.14") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pwr-Solaar/Solaar") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "000700waw4z6ab40naycapjgqz8yvz9ny1px94ni4pwf8f3kh0vh")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'setenv-PATH - (lambda _ - (setenv "PYTHONPATH" "lib")))))) - (native-inputs (list python-pytest)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pwr-Solaar/Solaar") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "000700waw4z6ab40naycapjgqz8yvz9ny1px94ni4pwf8f3kh0vh")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-pytest-mock + python-setuptools + python-typing-extensions + python-wheel)) (propagated-inputs (list python-pygobject python-pyudev From e89238cce739d23234f01bf0c7d9675ffdb7dd67 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Thu, 19 Jun 2025 09:58:49 +0200 Subject: [PATCH 024/133] gnu: ulauncher: Improve style. * gnu/packages/xdisorg.scm (ulauncher): Run guix style and properly pin the commit with a git-version. Signed-off-by: Sharlatan Hellseher --- gnu/packages/xdisorg.scm | 115 ++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 79610831ccc..34772da6e89 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2166,64 +2166,67 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (license license:gpl3+))) (define-public ulauncher - (package - (name "ulauncher") - (version "6.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Ulauncher/Ulauncher") - (commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-libX11 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "ulauncher/utils/xinit.py" - (("libX11.so.6") - (search-input-file inputs "/lib/libX11.so"))))) - (add-after 'unpack 'fix-usr - (lambda _ - (substitute* "setup.py" - (("\\{sys.prefix\\}") - (string-append #$output))))) - (add-after 'unpack 'fix-os-release - (lambda _ - (define (touch file) - (call-with-output-file file - (const #t))) - (let* ((hard-path "/etc/os-release") - (fixed-path (string-append #$output - hard-path))) - ;; Make it relative - ;; Update hardcoded path to something - ;; within the build enviroment. - (substitute* "ulauncher/utils/environment.py" - ((hard-path) - fixed-path)) - ;; Create directory for the dummy file. - (mkdir-p (string-append #$output "/etc")) - (touch fixed-path)))) - (add-before 'check 'env-setup - ;; The test require access to home to put temporary files. - (lambda _ - (setenv "HOME" - (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) - (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) - (home-page "https://ulauncher.io") - (synopsis "Application launcher for Linux") - (description - "Ulauncher is a fast application launcher for Linux. It is written in + (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") + (revision "4")) + (package + (name "ulauncher") + (version (git-version "6.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ulauncher/Ulauncher") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-libX11 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ulauncher/utils/xinit.py" + (("libX11.so.6") + (search-input-file inputs "/lib/libX11.so"))))) + (add-after 'unpack 'fix-usr + (lambda _ + (substitute* "setup.py" + (("\\{sys.prefix\\}") + (string-append #$output))))) + (add-after 'unpack 'fix-os-release + (lambda _ + (define (touch file) + (call-with-output-file file + (const #t))) + (let* ((hard-path "/etc/os-release") + (fixed-path (string-append #$output hard-path))) + ;; Make it relative + ;; Update hardcoded path to something + ;; within the build enviroment. + (substitute* "ulauncher/utils/environment.py" + ((hard-path) + fixed-path)) + ;; Create directory for the dummy file. + (mkdir-p (string-append #$output "/etc")) + (touch fixed-path)))) + (add-before 'check 'env-setup + ;; The test require access to home to put temporary files. + (lambda _ + (setenv "HOME" + (getcwd))))))) + (native-inputs (list intltool python-distutils-extra python-mock)) + (inputs (list libx11 python-levenshtein python-pycairo)) + (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas + python-pygobject webkitgtk-with-libsoup2)) + (home-page "https://ulauncher.io") + (synopsis "Application launcher for Linux") + (description + "Ulauncher is a fast application launcher for Linux. It is written in Python, using GTK+, and features: App Search (fuzzy matching), Calculator, Extensions, Shortcuts, File browser mode and Custom Color Themes.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public rofi (package From c668deb7514ab21bcf527f2dc2e2b469720817ec Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Thu, 19 Jun 2025 09:58:50 +0200 Subject: [PATCH 025/133] gnu: ulauncher: Update to 6.0.0-18.901ce03. * gnu/packages/xdisorg.scm (ulauncher): Update to 6.0.0-18.901ce03. [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Ignore some failing tests. {phases}: Remove deprecated phase 'fix-usr. Add phase 'fix-bash. [native-inputs]: Remove python-distutils-extra. Add python-pytest, python-pytest-mock, python-setuptools, python-wheel. [propagated-inputs]: Add python-xlib. Signed-off-by: Sharlatan Hellseher --- gnu/packages/xdisorg.scm | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 34772da6e89..4e04c55f6f9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2166,8 +2166,8 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (license license:gpl3+))) (define-public ulauncher - (let ((commit "1e68d47473f8e77d375cb4eca644c3cda68ed7e9") - (revision "4")) + (let ((commit "901ce03beb157ff8fb354558594495eb74c6de7b") + (revision "18")) (package (name "ulauncher") (version (git-version "6.0.0" revision commit)) @@ -2179,10 +2179,14 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1c2czlrsf5aq8c88qliqbnqvf04q9cnjc1j6hivqa0w260mzjll1")))) - (build-system python-build-system) + (base32 "0qrqpbqrrklfgqr48zafzggrbzns2q6h27nh63skfd9w582nsajg")))) + (build-system pyproject-build-system) (arguments (list + #:test-flags + ;; XXX: Most likely require a running X server. + #~(list "--ignore=tests/ui/test_preferences_server.py" + "--ignore=tests/ui/test_result_widget.py") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-libX11 @@ -2190,11 +2194,11 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (substitute* "ulauncher/utils/xinit.py" (("libX11.so.6") (search-input-file inputs "/lib/libX11.so"))))) - (add-after 'unpack 'fix-usr - (lambda _ - (substitute* "setup.py" - (("\\{sys.prefix\\}") - (string-append #$output))))) + (add-after 'unpack 'fix-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/modes/shortcuts/test_run_script.py" + (("/bin/bash") + (search-input-file inputs "bin/bash"))))) (add-after 'unpack 'fix-os-release (lambda _ (define (touch file) @@ -2216,10 +2220,19 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (lambda _ (setenv "HOME" (getcwd))))))) - (native-inputs (list intltool python-distutils-extra python-mock)) + (native-inputs (list intltool + python-mock + python-pytest + python-pytest-mock + python-setuptools + python-wheel)) (inputs (list libx11 python-levenshtein python-pycairo)) - (propagated-inputs (list keybinder libwnck gsettings-desktop-schemas - python-pygobject webkitgtk-with-libsoup2)) + (propagated-inputs (list keybinder + libwnck + gsettings-desktop-schemas + python-pygobject + python-xlib + webkitgtk-with-libsoup2)) (home-page "https://ulauncher.io") (synopsis "Application launcher for Linux") (description From 3411805a2202457cb185e3632a5ae853ec4cb854 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 28 Jul 2025 15:09:02 +0100 Subject: [PATCH 026/133] gnu: xauth: Remove cmdtest from native inputs. cmdtest is not required any longer to run unit tests and the project is not maintained since 2011, see . * gnu/packages/xorg.scm (xauth) [native-inputs]: Remove cmdtest. Change-Id: I649ccd9c81dfd8a7923a7db73b758a60a81d8581 --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4acff9f0b92..c3c3a70339d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2109,7 +2109,7 @@ server.") (inputs (list libxmu libxext libxau libx11)) (native-inputs - (list cmdtest pkg-config)) + (list pkg-config)) (home-page "https://www.x.org/wiki/") (synopsis "X authority file utility") (description From 9d2e2fc5335e70391db944be7d7bb904c00280db Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 28 Jun 2025 21:36:03 +0100 Subject: [PATCH 027/133] gnu: proot: Use python-docutils-0.19 for rst2mamn. * gnu/packages/linux.scm (proot): [native-inputs]: Remove python-docutils; add python-docutils-0.19. Change-Id: I7c150b9a72ffc07cc573cd3ab3bfefc3fed5cc91 --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e55488101de..6dd1c0c6ee0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9717,7 +9717,7 @@ Text-based output formats: CSV, XML, Netfilter's LOG, Netfilter's conntrack coreutils pkg-config ;; For rst2man, used to generate the manual page. - python-docutils)) + python-docutils-0.19)) (inputs (list libarchive talloc)) (home-page "https://github.com/proot-me/PRoot") (synopsis "Unprivileged chroot, bind mount, and binfmt_misc") From 2b401dde7d9de0e2568a4b91c577c2008601d1eb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 28 Jun 2025 21:19:04 +0100 Subject: [PATCH 028/133] gnu: gandi.cli: Improve package. * gnu/packages/networking.scm (gandi.cli): Apply G-expressions. [build-system]: Use pyproject. [arguments]: Remove trailing #t from lambdas. [native-inputs]: Remove python-docutils and python-tox; add python-docutils-0.19, python-setuptools, and python-wheel. Change-Id: I1dc1c0a51d26fa48153c11c1bc656b0b000d37fd --- gnu/packages/networking.scm | 58 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ee938b4cb0a..48409e3917f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -100,6 +100,7 @@ #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix utils) @@ -2031,34 +2032,41 @@ round-robin fashion.") (uri (pypi-uri name version)) (sha256 (base32 "1h36jahbp7273wn3yd747kbiwjc0bm3sja67bcxdsd54ln0vyndg")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-store-file-names - (lambda _ - (substitute* (list "gandi/cli/modules/cert.py" - "gandi/cli/tests/commands/test_certificate.py") - (("openssl") (which "openssl"))) - #t)) - (add-after 'install 'install-documentation - ;; The included man page may be outdated but we install it anyway, - ;; since it's mentioned in 'gandi --help' and better than nothing. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man1 (string-append out "/share/man/man1"))) - (mkdir-p man1) - (with-output-to-file (string-append man1 "/gandi.1") - (lambda _ - (invoke "rst2man.py" "gandicli.man.rst"))) - #t)))))) + (list + #:test-flags + #~(list "--pyargs" "gandi.cli") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-store-file-names + (lambda _ + (substitute* (list "gandi/cli/modules/cert.py" + "gandi/cli/tests/commands/test_certificate.py") + (("openssl") (which "openssl"))))) + (add-after 'install 'install-documentation + ;; The included man page may be outdated but we install it anyway, + ;; since it's mentioned in 'gandi --help' and better than nothing. + (lambda _ + (let* ((man1 (string-append #$output "/share/man/man1"))) + (mkdir-p man1) + (with-output-to-file (string-append man1 "/gandi.1") + (lambda _ + (invoke "rst2man.py" "gandicli.man.rst"))))))))) (native-inputs - (list python-docutils ; for rst2man.py - python-pytest python-pytest-cov python-tox)) - (propagated-inputs - (list openssh)) ; used by gandi/cli/modules/iass.py + (list python-docutils-0.19 + python-pytest + python-pytest-cov + python-setuptools + python-wheel)) (inputs - (list openssl python-click-7 python-ipy python-pyyaml python-requests)) + (list openssl + python-click-7 + python-ipy + python-pyyaml + python-requests)) + (propagated-inputs + (list openssh)) (home-page "https://cli.gandi.net") (synopsis "Command-line interface to the Gandi.net Web API") (description From 18e36c6487c7cec9560037bfc83b9107782d348d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 28 Jun 2025 21:26:25 +0100 Subject: [PATCH 029/133] gnu: gandi.cli: Rename variable. * gnu/packages/networking.scm (gandi.cli): Rename to gandi-cli and deprecate gandi.cli. (gandi-cli): New variable. Change-Id: I082481f310e1fe968987906ad67df7c57d410390 --- gnu/packages/networking.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 48409e3917f..94988ba416c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2022,9 +2022,9 @@ replies, fping will send out a ping packet and move on to the next target in a round-robin fashion.") (license license:expat))) -(define-public gandi.cli +(define-public gandi-cli (package - (name "gandi.cli") + (name "gandi-cli") (version "1.6") (source (origin @@ -2075,6 +2075,9 @@ manage, and delete Internet resources from Gandi.net such as domain names, virtual machines, and certificates.") (license license:gpl3+))) +(define-public gandi.cli + (deprecated-package "gandi.cli" gandi-cli)) + (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.conf. From c3953a8ef5f5c168662fc509d934a3d1fb7e3be9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 29 Jul 2025 16:25:03 +0100 Subject: [PATCH 030/133] gnu: python-charset-normalizer-3: Set to python-charset-normalizer. * gnu/packages/python-xyz.scm (python-charset-normalizer-3): Set to python-charset-normalizer. Change-Id: I15b2aba11e2892f011095703575c76b463c2f576 --- gnu/packages/python-xyz.scm | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf74f55d3e6..47f728ea1f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19766,35 +19766,7 @@ taking a new approach. All IANA character set names for which the Python core library provides codecs are supported.") (license license:expat))) -(define-public python-charset-normalizer-3 - (package - (inherit python-charset-normalizer) - (name "python-charset-normalizer") - (version "3.4.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "charset_normalizer" version)) - (sha256 - (base32 "0qqfk84ka3d9hh0yf7n8y0qa0yn08ncdacjjckzix8ybkv5cxbjv")))) - (build-system pyproject-build-system) - (arguments - (substitute-keyword-arguments (package-arguments - python-charset-normalizer) - ((#:phases phases - '%standard-phases) - #~(modify-phases #$phases - ;; https://github.com/jawah/charset_normalizer/issues/625 - ;; https://github.com/jawah/charset_normalizer/pull/626 - (add-after 'unpack 'fix-scripts - (lambda _ - (substitute* "pyproject.toml" - (("charset_normalizer:cli.cli_detect") - "charset_normalizer.cli:cli_detect")))))))) - (native-inputs - (list python-pytest - python-setuptools - python-wheel)))) +(define-public python-charset-normalizer-3 python-charset-normalizer) (define-public python-docopt (package From 114dff9b742d75be8770c49e8e1338d9f25389ee Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 21:50:22 +0100 Subject: [PATCH 031/133] gnu: python-flit-core-next: Set to python-flit-core. * gnu/packages/python-build.scm (python-flit-core-next): Set to python-flit-core. Change-Id: I8ae01214661186b2adb2c7855d54d8c71daeeeb2 --- gnu/packages/python-build.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index a4821191a9e..b80b5f8791e 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -663,16 +663,7 @@ specified by PEP 517, @code{flit_core.buildapi}.") (delete "python-toml") (prepend python-tomli))))) -(define-public python-flit-core-next - (package/inherit python-flit-core - (name "python-flit-core") - (version "3.12.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flit" version)) - (sha256 - (base32 "0h1pxi2hgr95321bgl45l86693zl14l3shj0idsyg4k9v56z700w")))))) +(define-public python-flit-core-next python-flit-core) (define-public python-flit-scm (package From dc1688d32cd14c41961d78ae75cc371d208b58e4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 12 Jul 2025 14:36:23 +0100 Subject: [PATCH 032/133] gnu: python-hypothesis-next: Set to python-hypothesis. * gnu/packages/check.scm (python-hypothesis-next): Set to python-hypothesis. Change-Id: Ia5d79b545d6da266db7a14d0b602e02196a6bd3e --- gnu/packages/check.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e83eb410de7..d98319e6246 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2836,24 +2836,9 @@ instantly.") much larger range of examples than you would ever want to write by hand. It’s based on the Haskell library, Quickcheck, and is designed to integrate seamlessly into your existing Python unit testing work flow.") - (home-page "https://hypothesis.works/") (license license:mpl2.0))) -(define-public python-hypothesis-next - (package - (inherit python-hypothesis) - (name "python-hypothesis") - (version "6.131.8") - (source - (origin - (method url-fetch) - (uri (pypi-uri "hypothesis" version)) - (sha256 - (base32 "1wx4ii5dxfp9gajfb5bqd3a2d1a38rbmvb620kj0cvlyvxkv5nk8")))) - (build-system pyproject-build-system) - (native-inputs - (list python-setuptools-next - python-wheel)))) +(define-public python-hypothesis-next python-hypothesis) ;; WARNING: This package is a dependency of mesa. (define-public python-lit From a62aa944cba91a128651c192d6b1d8b5bffded36 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 23:24:23 +0100 Subject: [PATCH 033/133] gnu: python-poetry-core-next: Set to python-poetry-core. * gnu/packages/python-build.scm (python-poetry-core-next): Set to python-poetry-core. Change-Id: Ia69fc596e654b0e015636c8b347a36f449366c72 --- gnu/packages/python-build.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index b80b5f8791e..062859808d1 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -601,15 +601,7 @@ a light weight, fully compliant, self-contained package allowing PEP 517 compatible build front-ends to build Poetry managed projects.") (license license:expat))) -(define-public python-poetry-core-next - (package/inherit python-poetry-core - (version "2.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "poetry_core" version)) - (sha256 - (base32 "015a0802radb2x5wsbywm4fggv4s1srh8zyml5v58xgrxg8bpnzr")))))) +(define-public python-poetry-core-next python-poetry-core) ;;; This package exists to bootstrap python-tomli. (define-public python-flit-core-bootstrap From a9ecf05cac3f2a1cfee1bb435cdfb68320a9a461 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 09:03:27 +0100 Subject: [PATCH 034/133] gnu: python-requests-next: Set to python-requests. Replace all python-requests-next occurrences with python-requests. * gnu/packages/python-web.scm (python-requests-next): Set to python-requests. Change-Id: I712b71f12a2ebad3dfdfd882f24799fd6dd8e054 --- gnu/packages/astronomy.scm | 8 ++++---- gnu/packages/python-web.scm | 17 ++--------------- gnu/packages/video.scm | 4 ++-- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 65bdf3b0bea..d561202f99a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2456,7 +2456,7 @@ astronomical images, especially when there is no WCS information available.") python-fsspec python-gwcs python-pillow - python-requests-next + python-requests python-roman-datamodels python-s3fs python-s3path @@ -3895,7 +3895,7 @@ code to be greatly simplified.") python-photutils python-pypdf2 python-regions - python-requests-next + python-requests python-scikit-image python-scikit-learn python-scipy @@ -8836,7 +8836,7 @@ SunPy.") python-parfive python-pyerfa python-reproject - python-requests-next + python-requests python-scikit-image python-scipy ;; python-spiceypy ; Not packed yet in Guix, long journey. @@ -8868,7 +8868,7 @@ to the SolarSoft data analysis environment.") python-mpl-animators python-parfive python-pyerfa - python-requests-next))))) + python-requests))))) (define-public python-sunpy-soar (package diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e934c82f70c..e4b24f2359a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5283,20 +5283,7 @@ APIs.") than Python’s urllib2 library.") (license license:asl2.0))) -(define-public python-requests-next - (package - (inherit python-requests) - (name "python-requests") - (version "2.32.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "requests" version)) - (sha256 - (base32 "0q5742pnibwy74169kacin3dmqg9jzmzk7qab5aq5caffcbm8djm")))) - (native-inputs - (modify-inputs (package-native-inputs python-requests) - (prepend nss-certs-for-test))))) +(define-public python-requests-next python-requests) (define-public python-requests-kerberos (package @@ -5343,7 +5330,7 @@ python-requests.") python-pytest python-waitress)) (propagated-inputs - (list python-requests-next + (list python-requests python-urllib3-next)) (home-page "https://gitlab.com/thelabnyc/requests-unixsocket2") (synopsis "Talk HTTP via a UNIX domain socket") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fc0091d31b8..f3ceb4a9dcb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3203,7 +3203,7 @@ video streaming services of the Finnish national broadcasting company Yle.") python-certifi python-mutagen python-pycryptodomex - python-requests-next ; TODO Remove this special package + python-requests ; TODO Remove this special package python-urllib3 python-websockets)) (native-inputs @@ -3373,7 +3373,7 @@ Both command-line and GTK2 interface are available.") python-wcwidth python-websockets python-urllib3 - python-requests-next + python-requests python-pycryptodomex python-mutagen python-brotli From 45c16de228eb82c39d533edb73ce57101168ac2e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 22:11:32 +0100 Subject: [PATCH 035/133] gnu: python-setuptools-next: Set to python-setuptools. Replace all python-setuptools-next occurrences with python-setuptools. * gnu/packages/python-build.scm (python-setuptools-next): Set to python-setuptools. Change-Id: I9e5e0881310d160ec56be785f2dd2140364fa8e5 --- gnu/packages/astronomy.scm | 87 +++++++++++++++-------------- gnu/packages/audio.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/code.scm | 2 +- gnu/packages/django.scm | 4 +- gnu/packages/electronics.scm | 14 ++--- gnu/packages/game-development.scm | 2 +- gnu/packages/machine-learning.scm | 26 ++++----- gnu/packages/messaging.scm | 4 +- gnu/packages/parallel.scm | 4 +- gnu/packages/python-build.scm | 18 +----- gnu/packages/python-compression.scm | 2 +- gnu/packages/python-science.scm | 2 +- gnu/packages/python-web.scm | 20 +++---- gnu/packages/python-xyz.scm | 60 ++++++++++---------- gnu/packages/shells.scm | 2 +- gnu/packages/statistics.scm | 6 +- gnu/packages/sugar.scm | 38 ++++++------- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 21 files changed, 144 insertions(+), 157 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d561202f99a..112b175919e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -901,7 +901,7 @@ corrections.") python-pytest-doctestplus python-pytest-astropy python-pytest-astropy-header - python-setuptools-next)) + python-setuptools)) (inputs (list python-astropy python-numpy @@ -1879,7 +1879,7 @@ model-fitting photometry or morphological analyses.") python-pytest-cov python-pytest-doctestplus python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm-next)) (propagated-inputs (list python-sunpy)) @@ -1976,7 +1976,7 @@ Main features: python-pytest-doctestplus python-pytest-remotedata python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs @@ -2047,7 +2047,7 @@ implementation of the ASDF Standard.") python-pytest-astropy python-pytest-xdist python-scipy - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -2073,7 +2073,7 @@ Astropy objects.") #:phases #~(modify-phases %standard-phases (delete 'sanity-check)))) (native-inputs - (list python-setuptools-next + (list python-setuptools python-wheel)) (propagated-inputs (list python-importlib-metadata @@ -2108,7 +2108,7 @@ Astropy objects.") (native-inputs (list python-numpy python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -2212,7 +2212,7 @@ up-front for extensibility.") (native-inputs (list python-asdf-bootstrap python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -2233,7 +2233,7 @@ implementation package such as asdf-astropy.") #:phases #~(modify-phases %standard-phases (delete 'sanity-check)))) (native-inputs - (list python-setuptools-next + (list python-setuptools python-wheel)) (propagated-inputs '())))) @@ -2256,7 +2256,7 @@ implementation package such as asdf-astropy.") (list python-asdf python-pytest python-pytest-openfiles - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -3134,7 +3134,7 @@ Origins Spectrograph}.") (native-inputs (list gfortran python-packaging - python-setuptools-next + python-setuptools python-wheel which)) ; for fortran/Makefile (propagated-inputs @@ -3280,7 +3280,7 @@ bad pixel tracking throughout the reduction process.") python-pytest python-pytest-cov python-pytest-remotedata - python-setuptools-next + python-setuptools python-setuptools-scm python-xarray)) (propagated-inputs @@ -3366,7 +3366,7 @@ attempting to maintain ISTP compliance (native-inputs (list python-pytest-astropy-header python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs @@ -3674,7 +3674,7 @@ Spectrograph}.") python-pytest python-pytest-astropy python-pytest-doctestplus - python-setuptools-next + python-setuptools python-setuptools-scm python-stsynphot python-wheel)) @@ -3778,7 +3778,7 @@ Cesium.") python-pytest-mpl python-pytest-remotedata python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm-next)) (propagated-inputs (list python-aiohttp @@ -3836,8 +3836,9 @@ help you search, obtain and use DKIST data as part of your Python software.") (list python-astropy-minimal python-gwcs python-pytest - python-setuptools-next - python-setuptools-scm)) + python-setuptools + python-setuptools-scm + python-wheel)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/spacetelescope/drizzle") @@ -3962,7 +3963,7 @@ used with local NetDRMS sites.") (native-inputs (list python-pytest python-pytest-doctestplus - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-astropy python-scipy)) @@ -3991,7 +3992,7 @@ implemented using the astropy.modeling framework.") #:tests? #f)) ;no tests in tarball (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-astropy python-fastapi @@ -4092,7 +4093,7 @@ tools for astronomers.") (native-inputs (list python-cython python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/sncosmo/extinction") @@ -4307,7 +4308,7 @@ astronomy-specific functionality") (native-inputs (list python-pytest python-pytest-mpl - python-setuptools-next + python-setuptools python-setuptools-scm-next)) (propagated-inputs (list python-astrodendro @@ -4365,7 +4366,7 @@ across many files.") (native-inputs (list python-objgraph python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm-next xorg-server-for-tests)) (propagated-inputs @@ -4490,8 +4491,10 @@ specifically pulsar timing array signals.") (native-inputs (list python-pytest python-pytest-astropy - python-setuptools-next - python-setuptools-scm-next)) + python-pyyaml + python-setuptools + python-setuptools-scm-next + python-wheel)) (propagated-inputs (list python-asdf python-asdf-astropy @@ -4819,7 +4822,7 @@ observationally-derived galaxy merger catalogs.") (list ffmpeg python-pooch python-pytest-astropy - python-setuptools-next + python-setuptools python-setuptools-scm)) (propagated-inputs (list python-dkist @@ -4926,7 +4929,7 @@ milliarcsecond).") python-pytest-cov python-pytest-doctestplus python-requests-mock - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -6065,7 +6068,7 @@ position-frequency slice.") python-pandas python-pytest python-scipy - python-setuptools-next)) + python-setuptools)) (inputs (list cpl)) (propagated-inputs @@ -6144,7 +6147,7 @@ functions, so that they can be called with scalar or array inputs.") (build-system pyproject-build-system) (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-pycpl)) (native-search-paths @@ -6930,7 +6933,7 @@ PSF} describing how the optical system spreads light from sources.") python-pytest python-pytest-astropy python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm python-stpreview)) (propagated-inputs @@ -7471,7 +7474,7 @@ but has evolved to support other missions as well.") (setenv "NUMBA_CACHE_DIR" "/tmp")))))) (native-inputs (list ;; python-pytest - python-setuptools-next + python-setuptools python-wheel)) (propagated-inputs (list python-astropy @@ -7756,7 +7759,7 @@ of axis order, spatial projections, and spectral units that exist in the wild. (native-inputs (list python-matplotlib python-pytest-astropy - python-setuptools-next + python-setuptools python-setuptools-scm python-spectral-cube)) (propagated-inputs @@ -7994,7 +7997,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") python-pytest python-pytest-xdist python-pytest-doctestplus - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8045,7 +8048,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") python-pytest-doctestplus python-pytest-xdist python-scipy - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs @@ -8085,7 +8088,7 @@ implemented in the @acronym{JWST, James Webb Space Telescope} and (native-inputs (list python-pytest python-pytest-doctestplus - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs @@ -8116,7 +8119,7 @@ implementing calibration pipeline software.") (native-inputs (list python-pytest python-roman-datamodels - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8153,7 +8156,7 @@ implementing calibration pipeline software.") ;; . #:tests? #f)) (native-inputs - (list python-setuptools-next + (list python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8295,7 +8298,7 @@ spectra, and data.") python-pytest-doctestplus python-pytest-env python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8342,7 +8345,7 @@ pipelines.") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs @@ -8401,7 +8404,7 @@ task}.") (arguments (list #:tests? #f)) ; no tests in PyPI or git (native-inputs - (list python-setuptools-next + (list python-setuptools python-setuptools-scm-next)) (propagated-inputs (list python-astropy @@ -8677,7 +8680,7 @@ Telescope, HST}).") python-pytest-doctestplus python-pytest-xdist python-reproject - python-setuptools-next + python-setuptools python-setuptools-scm-next python-streamtracer python-sympy)) @@ -8813,7 +8816,7 @@ SunPy.") python-pytest-mock python-pytest-mpl python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm-next)) (propagated-inputs (list python-asdf @@ -8968,7 +8971,7 @@ to the SolarSoft data analysis environment.") python-pytest-astropy python-pytest-doctestplus python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm-next python-sunpy-minimal)) (propagated-inputs @@ -9075,7 +9078,7 @@ of the old packages.") (native-inputs (list python-pytest python-scipy - python-setuptools-next + python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 25fc36bc59a..0048409c0ac 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3777,7 +3777,7 @@ files.") (native-inputs (list python-pytest python-pytest-cov - python-setuptools-next)) + python-setuptools)) (inputs (list libsndfile portaudio)) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 684f2247556..69c4d2ac3c2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -248,7 +248,7 @@ data units.") python-importlib-metadata python-packaging python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm-next python-sphinx python-sphinxcontrib-newsfeed diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 26e109640b1..6dda1bbd203 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1118,7 +1118,7 @@ expressions, and its ability to generate emacs-style TAGS files.") ;; network access. (arguments (list #:tests? #f)) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (inputs (list python-pyyaml python-radon diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 9fa12b524cd..674dd543d32 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -327,7 +327,7 @@ and adapters that are useful for non-trivial configuration scenarios.") python-pytest python-pytest-cov ; runs by default python-pytest-django - python-setuptools-next + python-setuptools python-shortuuid python-wheel)) (home-page "https://github.com/django-extensions/django-extensions") @@ -1026,7 +1026,7 @@ to asyncio and Pydantic.") (invoke "django-admin" "test" "tests" "--pythonpath=."))))))) (propagated-inputs (list python-asgiref python-django)) - (native-inputs (list python-pytest python-setuptools-next python-wheel)) + (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://django-htmx.readthedocs.io/en/latest/") (synopsis "Extensions for using Django with htmx") (description "This package provides a Django extension to work with diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 8247c284c91..9cae45735f2 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1241,7 +1241,7 @@ verification.") (list iverilog nvc python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-find-libpython)) (home-page "https://github.com/cocotb/cocotb") @@ -1285,7 +1285,7 @@ and Verilog RTL using Python.") (list iverilog nvc python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-cocotb python-packaging @@ -1323,7 +1323,7 @@ and reusable bus interfaces to be used with @code{cocotb}.") "test_xcelium") " and not ")))) (native-inputs - (list python-pytest python-setuptools-next)) + (list python-pytest python-setuptools)) (propagated-inputs (list python-jinja2)) (home-page "https://github.com/olofk/edalize/") @@ -1359,7 +1359,7 @@ some tool-specific options are set.") (lambda _ (chdir "testsuite")))) #:test-flags #~(list "test_all.py"))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (propagated-inputs (list python-networkx python-six)) (home-page "https://ohwr.gitlab.io/project/hdl-make/") (synopsis "Generate multi-purpose makefiles for HDL projects") @@ -1391,7 +1391,7 @@ and simulation Makefiles.") (build-system pyproject-build-system) (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-colorama)) (home-page "https://m-labs.hk/gateware/migen/") @@ -1430,7 +1430,7 @@ Python program.") (invoke "make" "iverilog" "core"))))))) (build-system pyproject-build-system) (native-inputs - (list iverilog python-setuptools-next python-pytest)) + (list iverilog python-setuptools python-pytest)) (home-page "http://www.myhdl.org/") (synopsis "Python as a Hardware Description Language") (description "This package provides a library to turn Python into @@ -1534,7 +1534,7 @@ design.") (list python-pytest-cov python-pytest-html python-pytest-xdist - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-pyyaml)) (home-page "https://github.com/jeremiah-c-leary/vhdl-style-guide/") diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 12287be3582..275912d83db 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1565,7 +1565,7 @@ and multimedia programs in the Python language.") (setenv "HOME" "/tmp")))))) (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-pygame python-pyperclip diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7cfe022fa37..bd8b232615e 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -243,7 +243,7 @@ family of functions.") python-tqdm)) (native-inputs (list python-numpy python-pytest - python-setuptools-next)) + python-setuptools)) (home-page "https://github.com/SYSTRAN/faster-whisper") (synopsis "Whisper transcription reimplementation") (description @@ -291,7 +291,7 @@ CTranslate2, which is a inference engine for transformer models.") python-pytest python-requests python-scipy - python-setuptools-next + python-setuptools python-torchvision)) (home-page "https://github.com/pyro-ppl/funsor") (synopsis "Tensor-like library for functions and distributions") @@ -1095,7 +1095,7 @@ cardinality matching from a bipartite graph.") (base32 "03d4kgakpgj54c3pl9dkqrkbmj6w13gmczkds5jagf3n85c1hgg1")))) (build-system pyproject-build-system) (native-inputs - (list python-pytest python-setuptools-next)) + (list python-pytest python-setuptools)) (propagated-inputs (list python-deprecated python-hopcroftkarp @@ -1360,7 +1360,7 @@ storing tensors safely.") (lambda _ (chdir "python")))))) (native-inputs - (list pkg-config protobuf python-pytest python-setuptools-next)) + (list pkg-config protobuf python-pytest python-setuptools)) (propagated-inputs (list sentencepiece)) (synopsis "SentencePiece python wrapper") (description "This package provides a Python wrapper for the SentencePiece @@ -1677,7 +1677,7 @@ operators and standard data types.") (append (list cmake-minimal python-pytest - python-setuptools-next) + python-setuptools) (filter (lambda (pkg) (member (or (%current-target-system) @@ -1815,7 +1815,7 @@ with a single function call.") python-pytest python-pytorch python-sentencepiece - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-coloredlogs python-flatbuffers @@ -2323,7 +2323,7 @@ visualizing high-dimensional data sets.") ;; python-scikit-learn (arguments '(#:tests? #f)) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (propagated-inputs (list python-numpy python-scipy python-scikit-learn python-joblib)) (home-page "https://epistasislab.github.io/scikit-rebate/") @@ -2436,7 +2436,7 @@ data by providing clean labels during training.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "-m" "cma.test"))))))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/CMA-ES/pycma") (synopsis "Python implementation of CMA-ES") @@ -3461,7 +3461,7 @@ in a fast and accurate way.") (propagated-inputs (list python-ipython python-numpy python-pandas python-scipy)) (native-inputs - (list python-nose python-setuptools-next)) + (list python-nose python-setuptools)) (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, @@ -4954,7 +4954,7 @@ as torchvision, torchtext, and others.") (native-inputs (list python-pytest python-pytest-cov - python-setuptools-next)) + python-setuptools)) (home-page "https://github.com/magmax/python-readchar") (synopsis "Library to easily read single chars and key strokes") (description "This package provides a Python library to easily read single @@ -5075,7 +5075,7 @@ feedback.") python-psutil python-requests-mock python-scikit-learn - python-setuptools-next)) + python-setuptools)) (home-page "https://lightning.ai/") (synopsis "Deep learning framework to train, deploy, and ship AI products") (description @@ -5223,7 +5223,7 @@ and common image transformations for computer vision.") (when tests? (invoke "python3" "tests.py"))))))) (propagated-inputs - (list python-numpy python-setuptools-next)) + (list python-numpy python-setuptools)) (home-page "https://github.com/bshillingford/python-torchfile") (synopsis "Torch7 binary serialized file parser") (description "This package enables you to deserialize Lua @@ -5635,7 +5635,7 @@ algorithm for dense (LAPJV) or sparse (LAPMOD) matrices.") (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;tests require launching the server (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (propagated-inputs (list python-jsonpatch python-networkx diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1dadd943765..26ea6d55fe7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3251,7 +3251,7 @@ designed for experienced users.") (native-inputs (list python-matrix-nio python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-click python-distro @@ -3308,7 +3308,7 @@ designed for experienced users.") (list python-pytest python-pytest-cov python-pytest-mock - python-setuptools-next)) + python-setuptools)) (home-page "https://github.com/zulip/zulip-terminal") (synopsis "Zulip's official terminal client") (description "This package contains Zulip's official terminal client.") diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index fdfc9e70456..19361bcfb60 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -425,7 +425,7 @@ cluster/resource management systems.") (when tests? (invoke "python" "./pathos/tests/__main__.py"))))))) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (propagated-inputs (list python-dill python-multiprocess @@ -464,7 +464,7 @@ execution environment.") (when tests? (invoke "python" "./ppft/tests/__main__.py"))))))) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (home-page "https://pypi.org/project/ppft/") (synopsis "Fork of Parallel Python") (description diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 062859808d1..f6ef6f0e337 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -361,23 +361,7 @@ facilitate packaging Python projects, where packaging includes: (native-inputs (list python-wheel-0.40)))) -(define-public python-setuptools-next - (package - (inherit python-setuptools) - (name "python-setuptools") - (version "79.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version)) - (sha256 - (base32 "127svm8cdpvmq37gcrbvdr9fhrhs0nscnzh63gypjc1wyfwfg30j")) - (modules '((guix build utils))) - (snippet - #~(begin - (for-each delete-file - (find-files "setuptools" "^(cli|gui).*\\.exe$")))))) - (build-system pyproject-build-system))) +(define-public python-setuptools-next python-setuptools) (define-public python-wheel (package diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 4d659a6b5ac..f78324df34f 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -827,7 +827,7 @@ install: libbitshuffle.so (arguments (list #:tests? #f)) ;no tests (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (home-page "https://github.com/kYwzor/uncompresspy") (synopsis "Uncompressing LZW files in Python") (description diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index a5086b91908..7762c05e3f4 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -2948,7 +2948,7 @@ swarm algorithm.") (native-inputs (list python-pytest python-pytest-xdist - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-joblib python-matplotlib diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e4b24f2359a..f66e88c7110 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3397,7 +3397,7 @@ be written directly in Python without templates.") #:test-flags ;; XXX: requires network access. #~(list "--ignore=tests/unit/credentials_test.py"))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (propagated-inputs (list python-certifi python-dateutil python-pytz python-urllib3)) (home-page "https://github.com/minio/minio-py") @@ -5128,7 +5128,7 @@ sanitizer Rust crate.") (sha256 (base32 "0sqgg8jmg2j14f4h96h0rs42kr460v65lhanps6lhdvj5zp81cbh")))) (build-system pyproject-build-system) - (native-inputs (list python-psutil python-pytest python-setuptools-next)) + (native-inputs (list python-psutil python-pytest python-setuptools)) (home-page "https://github.com/daanzu/py-webrtcvad-wheels") (synopsis "Python interface to the WebRTC Voice Activity Detector (VAD)") (description @@ -5239,7 +5239,7 @@ APIs.") (arguments ;; The test tries to open a connection to a remote server. `(#:tests? #f)) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-apiron)) (home-page "https://github.com/teffalump/beren") (synopsis "REST client for Orthanc DICOM servers") @@ -5510,7 +5510,7 @@ protocol, both client and server for Python asyncio module. (build-system pyproject-build-system) (arguments (list #:test-flags #~(list "mohawk/tests.py"))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/kumar303/mohawk") (synopsis "Library for Hawk HTTP authorization") (description @@ -7541,7 +7541,7 @@ users, gradebooks, and more.") (base32 "1gncv3l11za0mpxvmpaf5n5j3jzp282rz62yml4ha4z55q930d8l")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;There are no tests. - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-beautifulsoup4)) (home-page "https://breakingcode.wordpress.com/") (synopsis "Python bindings to the Google search engine") @@ -9718,7 +9718,7 @@ over IMAP: (sha256 (base32 "1fdbxp176p17sn5xc1418mz2vk00hlcsd5qmi2fdcfphqal6raan")))) (build-system pyproject-build-system) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/nephila/giturlparse") (synopsis "Git URL parsing module") (description @@ -9741,7 +9741,7 @@ and rewriting of remote git URLs from various hosting providers.") (base32 "02mdzhgdz3sprgc26qb084zy639h2zw2yc8d2vm1r18ap9k51ayq")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ; tests require external resources. - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/sethmlarson/hstspreload") (synopsis "Chromium HSTS Preload list as a Python package") (description @@ -10106,7 +10106,7 @@ SOCKS5(h), HTTP tunnel).") (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;no tests in PyPI archive - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-azure-nspkg)) (home-page "https://github.com/Azure/azure-storage-python") (synopsis "Microsoft Azure Storage Namespace package") @@ -10656,7 +10656,7 @@ real-life projects with legacy data and diverse storage providers.") (sha256 (base32 "083ir0nccm14431mmn243862gq731ww98fwpd95zm1yccvpzdy68")))) (build-system pyproject-build-system) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/earwig/mwparserfromhell") (synopsis "Python parser for MediaWiki wikicode") (description @@ -11312,7 +11312,7 @@ and FastAPI.") (base32 "0psrlvax8249ccs2rvgdygpckzz22vxjcyzr2pql06d48k61gk54")))) (build-system pyproject-build-system) (arguments (list #:tests? #false)) ; There are no tests. - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://pypi.org/project/whereismyip/") (synopsis "Queries multiple geolocation services until one succeeds") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47f728ea1f0..183298f1f47 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -330,7 +330,7 @@ (build-system pyproject-build-system) (native-inputs (list python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm)) (home-page "https://github.com/Lykos153/AnnexRemote") (synopsis "Helper module to easily develop git-annex special remotes") @@ -2279,7 +2279,7 @@ decorators, including variants of the Python standard library's python-packaging python-pytest python-pytest-mpl - python-setuptools-next + python-setuptools python-setuptools-scm)) (home-page "https://colorcet.holoviz.org/") (synopsis "Collection of perceptually uniform colormaps") @@ -3527,7 +3527,7 @@ point types: (list python-pytest python-pytest-xdist python-scikit-image - python-setuptools-next)) + python-setuptools)) (inputs (list openjpeg ; glymur/lib/openjp2.py libtiff)) ; glymur/lib/tiff.py @@ -5397,7 +5397,7 @@ for the standard @code{argparse} library.") (build-system pyproject-build-system) (native-inputs (list python-pytest - python-setuptools-next + python-setuptools python-wheel)) (home-page "https://github.com/eerimoq/bitstruct") (synopsis "Python values to and C bit field structs converter") @@ -6669,7 +6669,7 @@ defined.") (list python-pytest python-setuptools-scm)) (propagated-inputs - (list python-setuptools-next)) + (list python-setuptools)) (home-page "https://extension-helpers.readthedocs.io") (synopsis "Astropy ecosystem utilities for building and installing packages") (description @@ -10902,7 +10902,7 @@ objects.") (base32 "1yigkhvjgbl9nrlijn4iwcs6k7i5y58drix1331cd1hb9wzn35z7")))) (build-system pyproject-build-system) (propagated-inputs (list python-networkx python-numpy)) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/bkmgit/python-colormath2") (synopsis "Color math and conversion library") (description @@ -12960,7 +12960,7 @@ experimental data and metadata at the Laboratory for Fluorescence Dynamics.") python-numpy python-pillow python-pytest - python-setuptools-next + python-setuptools python-wheel)) (inputs (list ffmpeg-7)) @@ -17984,7 +17984,7 @@ tasks, sockets, files, locks, and queues.") (list pkg-config python-cython python-pytest - python-setuptools-next + python-setuptools python-sphinx)) (inputs (list bzip2 @@ -18159,7 +18159,7 @@ structures.") (rename-file "wfetch/wfetch.py" "wfetch/wfetch") (install-file "wfetch/wfetch" bin) (copy-recursively "wfetch/icons" share))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (inputs (list python-pyowm python-fire python-termcolor python-requests)) (synopsis "Command-line tool to display weather info") (description @@ -22322,7 +22322,7 @@ the same purpose: to provide Python bindings for libmagic.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "run-tests.py"))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (inputs (list python-dateutil python-magic)) (home-page "https://s3tools.org/s3cmd") (synopsis "Command line tool for S3-compatible storage services") @@ -24291,7 +24291,7 @@ as well.") ;; XXX: There is a tests/run_tests.py file but all it does is a ;; sanity check. #:tests? #f)) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-appdirs python-jedi python-prompt-toolkit python-pygments)) (home-page "https://github.com/jonathanslenders/ptpython") @@ -25036,7 +25036,7 @@ numbers, real numbers, mixed types and more, and comes with a shell command (when tests? ;; XXX: Taken from tox.ini. (invoke "python" "unittest-core.py"))))))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (propagated-inputs (list python-defusedxml python-orjson python-packaging python-psutil)) (home-page "https://github.com/nicolargo/glances") @@ -29169,7 +29169,7 @@ jmerle/competitive-companion.") #:test-flags ;; These tests require network connections #~(list "--ignore=tests/command_version.py"))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (inputs (list time)) (propagated-inputs (list python-online-judge-api-client python-colorama python-requests)) @@ -29324,7 +29324,7 @@ compatible with @code{asyncio}.") (("setup\\(") "setup_method(") (("teardown\\(") "teardown_method(")) (rename-file "test.py" "glob2_test.py")))))) - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/miracle2k/python-glob2/") (synopsis "Extended Version of the python buildin glob module") (description "This is an extended version of the Python @@ -30429,7 +30429,7 @@ preload_resources\ (format #t "test suite not run~%"))))))) (propagated-inputs (list python-dill)) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://pypi.org/project/multiprocess/") (synopsis "Multiprocessing and multithreading in Python") (description @@ -31684,7 +31684,7 @@ repository is provided via Python API and as a compressed JSON file.") (list #:tests? #f)) ; No tests. (propagated-inputs (list python-pyyaml)) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://apps.fz-juelich.de/jsc/jube/jube2/docu/index.html") (synopsis "Benchmarking environment") (description @@ -32263,7 +32263,7 @@ native API of @code{python-argparse}.") (setenv "HOME" "/tmp/guix") ; must end on USERNAME... (invoke "python" "./pox/tests/__main__.py"))))))) (native-inputs - (list python-setuptools-next + (list python-setuptools which)) ;pox/tests/test_shutils.py (home-page "https://pypi.org/project/pox/") (synopsis "Python utilities for file system exploration and automated builds") @@ -32770,7 +32770,7 @@ with features similar to the @command{wget} utility.") python-translate-toolkit python-translation-finder python-watchdog)) - (native-inputs (list qttools-5 fontforge python-setuptools-next)) + (native-inputs (list qttools-5 fontforge python-setuptools)) (home-page "https://framagit.org/tyreunom/offlate") (synopsis "Offline translation interface for online translation tools") (description @@ -32803,7 +32803,7 @@ an upload option to send your work back to the platform.") (when tests? (apply invoke "python" "-m" "unittest" test-flags))))))) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (home-page "https://github.com/ppannuto/python-titlecase") (synopsis "Capitalize strings similar to book titles") (description @@ -33695,7 +33695,7 @@ dictionaries.") #:test-flags #~(list "--ignore-glob=pyzo/yoton/tests/*" ; XXX: yoton is outdated. "--ignore=pyzo/codeeditor/_test.py"))) ; XXX: cannot import qt. - (native-inputs (list python-pytest python-setuptools-next)) + (native-inputs (list python-pytest python-setuptools)) (propagated-inputs (list python-pyqt)) (home-page "https://pyzo.org") (synopsis "Python IDE for scientific computing") @@ -36663,7 +36663,7 @@ graph can be output for rendering by GraphViz or yEd.") (native-inputs (list python-pytest python-pytest-benchmark - python-setuptools-next)) + python-setuptools)) (home-page "https://github.com/mrocklin/multipledispatch/") (synopsis "Multiple dispatch for Python based on pattern matching") (description @@ -36785,7 +36785,7 @@ worry whether all dependencies that use LooseVersion have migrated.") (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (native-inputs (list python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -36815,7 +36815,7 @@ cons cells in Python.") #~(list "--deselect=tests/test_dispatch.py::test_unification"))) (native-inputs (list python-pytest - python-setuptools-next + python-setuptools python-setuptools-scm)) (propagated-inputs (list python-cons @@ -36859,7 +36859,7 @@ cons cells in Python.") " and not ")))) (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-cons python-etuples @@ -36939,7 +36939,7 @@ key-value pairs from a @code{.env} file and set them as environment variables.") (mkdir-p bindir) (copy-file "date2name/__init__.py" binary) (chmod binary #o555))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (synopsis "Handling time-stamps and date-stamps in file names") (description "By default, date2name gets the modification time of matching files and @@ -37883,7 +37883,7 @@ and has plugins for many other formats.") (base32 "0cxj4zqcxzi3c5kw649jxmdpnbyrkrwx4licxdg6zc317v8gxw54")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;no tests - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-requests)) (home-page "https://github.com/notebook-sharing-space/nbss-upload") (synopsis "Upload notebooks to a notebooksharing.space instance") @@ -39395,7 +39395,7 @@ Communication.") (build-system pyproject-build-system) (arguments '(#:tests? #f)) ;there are no tests (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (propagated-inputs (list python-colorama python-termcolor)) (home-page "https://github.com/AbhijithAJ/clrprint") (synopsis "Print colorful output in the terminal") @@ -39443,7 +39443,7 @@ files.") "1ckn8n37i7b65h0i385ycn0w8sg9na0iabz0kmhxxc1wj0hddkw9")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;no tests - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/hmillerbakewell/musical-scales") (synopsis "Retrieve a scale based on a given mode and starting note") (description @@ -39688,7 +39688,7 @@ window managers.") (base32 "0ag3zz4r3cwpj769m2aw3l8yj93phsydzfz02dig5z81cc025rck")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;no tests - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-i3ipc)) (home-page "https://github.com/nwg-piotr/autotiling") (synopsis "Automatically tile windows in i3 and Sway") @@ -40205,7 +40205,7 @@ with one function call. IceCream makes print debugging a little sweeter.") (string-append "not test_trigrams" " and not test_word_ids") "test/test_ngrams.py"))) (propagated-inputs (list python-cffi)) - (native-inputs (list python-pytest python-setuptools-next + (native-inputs (list python-pytest python-setuptools python-setuptools-scm-next python-wheel)) (home-page "https://github.com/mideind/Icegrams") (synopsis "Trigram statistics for Icelandic") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 267b5736425..64e53fc6e53 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -669,7 +669,7 @@ ksh, and tcsh.") python-pytest-subprocess python-pytest-timeout python-requests - python-setuptools-next)) + python-setuptools)) (inputs (list python-distro python-ply diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b33d99e29f8..038fafcc325 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -671,7 +671,7 @@ and a lot more.") "dcor/tests"))) (native-inputs (list python-pytest - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-joblib python-numba @@ -1349,7 +1349,7 @@ Meier, Nelson Aalen and regression.") (base32 "1bkikqjya6gkds3n4qj6svvyz6czkwrc5s66ffb62l6wi4v2f89a")))) (build-system pyproject-build-system) - (native-inputs (list python-pandas python-pytest python-setuptools-next + (native-inputs (list python-pandas python-pytest python-setuptools python-wheel)) (propagated-inputs (list python-numpy python-scikit-learn)) (home-page "https://github.com/scikit-learn-contrib/MAPIE") @@ -1404,7 +1404,7 @@ conformal prediction methods intervals.") (native-inputs (list python-cython-3 python-matplotlib - python-setuptools-next + python-setuptools python-setuptools-scm)) (home-page (string-append "https://www.statsmodels.org/v" version "/")) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 973b9e41f7a..98302c25c20 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -443,7 +443,7 @@ the Sugar Toolkit.") (lambda _ (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (propagated-inputs (list gtk+ gstreamer @@ -504,7 +504,7 @@ a Tetris-like game.") telepathy-glib webkitgtk-for-gtk3)) (inputs (list (list glib "bin"))) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://help.sugarlabs.org/browse.html") (synopsis "Sugar activity to browse the internet") (description "Browse is a web browser activity for the Sugar desktop.") @@ -563,7 +563,7 @@ import pygame ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ sugar-toolkit-gtk3)) (inputs (list python-pygame)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://github.com/sugarlabs/cellgame") (synopsis "Cell game for Sugar") (description "This game for the Sugar desktop is based on the mechanisms @@ -616,7 +616,7 @@ present in gene regulatory networks.") python-pygobject sugar-toolkit-gtk3 telepathy-glib)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://help.sugarlabs.org/chat.html") (synopsis "Sugar activity to chat") (description "Chat is an activity used to exchange messages with friends @@ -664,7 +664,7 @@ or classmates.") gtk+ python-pygobject sugar-toolkit-gtk3)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://github.com/sugarlabs/classify-cats") (synopsis "Classify cats based on various criteria") (description "This is a Sugar activity where players classify cats based @@ -727,7 +727,7 @@ import logging python-pygobject sugar-toolkit-gtk3)) (inputs (list python-pygame)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://github.com/sugarlabs/sugar-commander") (synopsis "Manage your Sugar journal") (description @@ -780,7 +780,7 @@ the Journal.") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) (native-inputs - (list sugar-toolkit-gtk3 python-sphinx python-setuptools-next)) + (list sugar-toolkit-gtk3 python-sphinx python-setuptools)) (propagated-inputs (list webkitgtk-for-gtk3)) (home-page "https://github.com/sugarlabs/help-activity") (synopsis "Sugar activity for accessing documentation and manuals") @@ -823,7 +823,7 @@ users with easy access to documentation and manuals.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ @@ -901,7 +901,7 @@ and @file{.pls}.") ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ sugar-toolkit-gtk3)) (inputs (list coreutils net-tools procps)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://help.sugarlabs.org/log.html") (synopsis "Log activity for the Sugar learning environment") (description @@ -942,7 +942,7 @@ looking for why an activity or Sugar is not working properly.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ telepathy-glib)) (inputs (list sugar-toolkit-gtk3 gettext-minimal)) @@ -999,7 +999,7 @@ for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ gdk-pixbuf)) (inputs (list python-pybox2d python-pygame sugar-toolkit-gtk3 @@ -1047,7 +1047,7 @@ life with forces (think gravity, Newton!), friction (scrrrrape), and inertia (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list cairo @@ -1101,7 +1101,7 @@ Journal entries that have been ‘starred’.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list evince @@ -1166,7 +1166,7 @@ import pygame (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; These libraries are accessed via gobject introspection. (propagated-inputs (list gtk+)) (inputs (list python-pygame sugar-toolkit-gtk3 gettext-minimal)) @@ -1214,7 +1214,7 @@ hesitate to feast on the goat.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gtk+ vte/gtk+-3 sugar-toolkit-gtk3)) (inputs (list gettext-minimal)) @@ -1293,7 +1293,7 @@ a Command-Line Interface (CLI) to the system.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list gstreamer @@ -1375,7 +1375,7 @@ import logging gtk+ python-pygobject sugar-toolkit-gtk3)) - (native-inputs (list gettext-minimal python-setuptools-next)) + (native-inputs (list gettext-minimal python-setuptools)) (home-page "https://github.com/sugarlabs/turtlepond") (synopsis "Turtle-based strategy game") (description "Turtle in a Pond is a strategy game. The goal is to @@ -1420,7 +1420,7 @@ surround the turtle before it runs off the screen.") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) (native-inputs - (list gettext-minimal sugar-toolkit-gtk3 python-setuptools-next)) + (list gettext-minimal sugar-toolkit-gtk3 python-setuptools)) (inputs (list setxkbmap)) (home-page "https://help.sugarlabs.org/en/typing_turtle.html") (synopsis "Learn typing") @@ -1465,7 +1465,7 @@ typist.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) ;; All these libraries are accessed via gobject introspection. (propagated-inputs (list abiword diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b3ca37dbf18..8aa8419b297 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2833,7 +2833,7 @@ execution of any hook written in any language before every commit.") (native-inputs (list python-docutils ;; The following inputs are only needed to run the tests. - python-setuptools-next python-setuptools-scm-next python-wheel unzip which)) + python-setuptools python-setuptools-scm-next python-wheel unzip which)) (inputs (list python-wrapper)) ;; Find third-party extensions. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f3ceb4a9dcb..5d491abe403 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6592,7 +6592,7 @@ can also directly record to WebM or MP4 if you prefer.") (list python-dbus python-pygobject python-pytest - python-setuptools-next + python-setuptools python-wheel)) (propagated-inputs (list python-pylast diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4e04c55f6f9..88d06c98f8c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2850,7 +2850,7 @@ both binary and text data.") (arguments '(#:tests? #f)) ; Not clear how to make tests pass. (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (inputs (list xclip xsel)) (home-page "https://github.com/asweigart/pyperclip") From 8eed064deee42ffbc5b753863c2b823963371bb7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 22:19:45 +0100 Subject: [PATCH 036/133] gnu: python-setuptools-scm-next: Set to python-setuptools-scm. Replace all python-setuptools-scm-next occurrences with python-setuptools-scm. * gnu/packages/python-build.scm (python-setuptools-scm-next): Set to python-setuptools-scm. Change-Id: I929ca14d24ed05efecded4c23ff02c42d50098c6 --- gnu/packages/astronomy.scm | 62 ++++++++++++++++---------------- gnu/packages/calendar.scm | 2 +- gnu/packages/python-build.scm | 31 +--------------- gnu/packages/python-science.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/version-control.scm | 2 +- 7 files changed, 37 insertions(+), 66 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 112b175919e..04726d39724 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1880,7 +1880,7 @@ model-fitting photometry or morphological analyses.") python-pytest-doctestplus python-pytest-xdist python-setuptools - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-sunpy)) (home-page "https://aia.lmsal.com/") @@ -1977,7 +1977,7 @@ Main features: python-pytest-remotedata python-pytest-xdist python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-asdf-standard @@ -2726,7 +2726,7 @@ constraints (i.e., altitude, airmass, moon separation/illumination, etc.) python-pytest-astropy-header python-pytest-doctestplus python-pytest-xdist - python-setuptools-scm-next + python-setuptools-scm python-sgp4 python-skyfield python-threadpoolctl)) @@ -2880,7 +2880,7 @@ celestial-to-terrestrial coordinate transformations.") pkg-config python-cython-3 python-extension-helpers - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-astropy-iers-data python-configobj ;to replace custom module @@ -3096,7 +3096,7 @@ Herschel.") python-pytest python-pytest-cov python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -3367,7 +3367,7 @@ attempting to maintain ISTP compliance (list python-pytest-astropy-header python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-colorama @@ -3779,7 +3779,7 @@ Cesium.") python-pytest-remotedata python-pytest-xdist python-setuptools - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-aiohttp python-asdf @@ -3880,7 +3880,7 @@ code to be greatly simplified.") python-pytest python-pytest-remotedata python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astrocut @@ -3934,7 +3934,7 @@ final image.") (list python-astropy-minimal python-pytest-astropy python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-numpy @@ -4309,7 +4309,7 @@ astronomy-specific functionality") (list python-pytest python-pytest-mpl python-setuptools - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-astrodendro python-astropy @@ -4367,7 +4367,7 @@ across many files.") (list python-objgraph python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm xorg-server-for-tests)) (propagated-inputs (list python-astropy @@ -4493,7 +4493,7 @@ specifically pulsar timing array signals.") python-pytest-astropy python-pyyaml python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-asdf @@ -5455,7 +5455,7 @@ on: python-pytest-doctestplus python-pytest-mpl python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -5553,7 +5553,7 @@ Carlo.") python-pytest-xdist python-scipy python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-sunpy-minimal python-wheel)) (propagated-inputs @@ -7052,7 +7052,7 @@ well as ephemerides services (list python-cython python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-numpy)) @@ -7076,7 +7076,7 @@ well as ephemerides services (list python-cython python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-numpy @@ -7542,7 +7542,7 @@ Computing Cluster, HPCC} (native-inputs (list python-photutils python-pytest-astropy - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -8049,7 +8049,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") python-pytest-xdist python-scipy python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-asdf @@ -8089,7 +8089,7 @@ implemented in the @acronym{JWST, James Webb Space Telescope} and (list python-pytest python-pytest-doctestplus python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-asdf @@ -8346,7 +8346,7 @@ pipelines.") (native-inputs (list python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-numpy @@ -8405,7 +8405,7 @@ task}.") (list #:tests? #f)) ; no tests in PyPI or git (native-inputs (list python-setuptools - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-astropy python-numpy @@ -8480,7 +8480,7 @@ processing functions: @code{xyxymatch}, @code{geomap}.") python-pytest-astropy-header python-pytest-doctestplus python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -8588,7 +8588,7 @@ packages for HST.") (list nss-certs-for-test python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -8636,7 +8636,7 @@ Telescope, HST}).") python-pytest-mpl python-pytest-xdist python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -8681,7 +8681,7 @@ Telescope, HST}).") python-pytest-xdist python-reproject python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-streamtracer python-sympy)) (propagated-inputs @@ -8737,7 +8737,7 @@ and @code{astropy}.") (delete 'sanity-check)))) (native-inputs (list python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-corner @@ -8817,7 +8817,7 @@ SunPy.") python-pytest-mpl python-pytest-xdist python-setuptools - python-setuptools-scm-next)) + python-setuptools-scm)) (propagated-inputs (list python-asdf python-asdf-astropy @@ -8863,7 +8863,7 @@ to the SolarSoft data analysis environment.") ((#:tests? _ #t) #f))) (native-inputs (list python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy-minimal @@ -8927,7 +8927,7 @@ to the SolarSoft data analysis environment.") python-pytest-doctestplus python-responses python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy @@ -8972,7 +8972,7 @@ to the SolarSoft data analysis environment.") python-pytest-doctestplus python-pytest-xdist python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-sunpy-minimal)) (propagated-inputs (list python-astropy @@ -9079,7 +9079,7 @@ of the old packages.") (list python-pytest python-scipy python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-astropy diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 69c4d2ac3c2..bf275c6ae7d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -249,7 +249,7 @@ data units.") python-packaging python-pytest python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-sphinx python-sphinxcontrib-newsfeed python-wheel)) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index f6ef6f0e337..0243b87cb68 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -707,36 +707,7 @@ system, then @code{flit_core} to build the package.") them as the version argument or in a SCM managed file.") (license license:expat))) -(define-public python-setuptools-scm-next - (package - (inherit python-setuptools-scm) - (name "python-setuptools-scm") - (version "8.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools_scm" version)) - (sha256 - (base32 "19y84rzqwb2rd88bjrlafrhfail2bnk6apaig8xskjviayva3pj2")))) - (build-system pyproject-build-system) - (arguments (list - ;; pyproject-build-system will error handle forms such as - ;; "module:object", so we set it. - #:build-backend "setuptools.build_meta" - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'setenv - (lambda _ - ;; pyproject-build-system ignore backend-path, - ;; and __import__ ignore GUIX_PYTHONPATH, so set - ;; PYTHONPATH. - (setenv "PYTHONPATH" - (string-append - (getcwd) - ":" - (getcwd) "/src:" - (getenv "GUIX_PYTHONPATH")))))) - #:tests? #f)) ;avoid extra dependencies such as pytest - (native-inputs (list python-setuptools python-wheel)))) +(define-public python-setuptools-scm-next python-setuptools-scm) (define-public python-editables (package diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 7762c05e3f4..7bd33bb2c47 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -3371,7 +3371,7 @@ Snakemake and its storage plugins.") python-pytest python-pytest-cov python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (home-page "https://github.com/pydata/sparse/") (synopsis "Library for multi-dimensional sparse arrays") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f66e88c7110..b9259c22d57 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2675,7 +2675,7 @@ HTTP servers, RESTful APIs, and web services.") python-pytest-localserver python-pytest-socket python-setuptools - python-setuptools-scm-next + python-setuptools-scm python-wheel)) (propagated-inputs (list python-aiofiles diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 183298f1f47..bfdbd830439 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -40206,7 +40206,7 @@ with one function call. IceCream makes print debugging a little sweeter.") "test/test_ngrams.py"))) (propagated-inputs (list python-cffi)) (native-inputs (list python-pytest python-setuptools - python-setuptools-scm-next python-wheel)) + python-setuptools-scm python-wheel)) (home-page "https://github.com/mideind/Icegrams") (synopsis "Trigram statistics for Icelandic") (description diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8aa8419b297..86cc099f705 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2833,7 +2833,7 @@ execution of any hook written in any language before every commit.") (native-inputs (list python-docutils ;; The following inputs are only needed to run the tests. - python-setuptools python-setuptools-scm-next python-wheel unzip which)) + python-setuptools python-setuptools-scm python-wheel unzip which)) (inputs (list python-wrapper)) ;; Find third-party extensions. From ad98ad89d4a64f3eb7aa148cd1ea2c27496b0d64 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Sep 2025 20:30:28 +0100 Subject: [PATCH 037/133] gnu: python-typing-extensions-next: Set to python-typing-extensions. Replace all python-typing-extensions-next occurrences with python-setuptools-scm. * gnu/packages/python-build.scm (python-typing-extensions-next): Set to python-typing-extensions. Change-Id: Ib6a6e0af11c0e3f0da49dcbfe02d1da45cb4fbf7 --- gnu/packages/python-build.scm | 14 +------------- gnu/packages/python-xyz.scm | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 0243b87cb68..d05f6a25237 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -237,19 +237,7 @@ Included are implementations of: @end enumerate\n") (license license:psfl))) -(define-public python-typing-extensions-next - (package - (inherit python-typing-extensions) - (version "4.15.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "typing_extensions" version)) - (sha256 - (base32 "0rhlhs28jndgp9fghdhidn6g7xiwx8vvihxbxhlgl4ncfg8lishc")))) - (native-inputs - (modify-inputs (package-native-inputs python-typing-extensions) - (replace "python-flit-core" python-flit-core-next))))) +(define-public python-typing-extensions-next python-typing-extensions) ;;; diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bfdbd830439..60c0d450093 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9152,7 +9152,7 @@ ecosystem, but can naturally be used also by other projects.") python-jsonschema python-pygments python-rellu - python-typing-extensions-next + python-typing-extensions python-setuptools `(,python "tk") ;used when building the HTML doc python-wheel)) From fdceca21917f4162d6955abf9f6ae42e63cac8e5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 08:56:15 +0100 Subject: [PATCH 038/133] gnu: python-urllib3-next: Set to python-urllib3. Replace all python-urllib3-next occurrences with python-urllib3. * gnu/packages/python-web.scm (python-urllib3-next): Set to python-urllib3. Change-Id: Iaf07baf285f4687d896c5fe19865beb9221f3beb --- gnu/packages/python-web.scm | 18 ++---------------- gnu/packages/tor.scm | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b9259c22d57..704d0387916 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5331,7 +5331,7 @@ python-requests.") python-waitress)) (propagated-inputs (list python-requests - python-urllib3-next)) + python-urllib3)) (home-page "https://gitlab.com/thelabnyc/requests-unixsocket2") (synopsis "Talk HTTP via a UNIX domain socket") (description @@ -5708,21 +5708,7 @@ can reuse the same socket connection for multiple requests, it can POST files, supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) -(define-public python-urllib3-next - (package - (inherit python-urllib3) - (version "2.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "urllib3" version)) - (sha256 - (base32 - "0q17z6zlpyjv9ax5c3d30qwp9fwhz2sc4gbb7yyd86g4qwrpgi1z")))) - (native-inputs - (list python-hatch-vcs - python-hatchling - python-setuptools-scm)))) +(define-public python-urllib3-next python-urllib3) (define-public python-urllib3-1.25 (package diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index ab72e3c09ab..f41cd8d3d7c 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -301,7 +301,7 @@ networks.") python-setuptools python-stem python-unidecode - python-urllib3-next + python-urllib3 python-waitress python-werkzeug tor)) From e3fc6c83149a6bfe82b70eeffc766f00cf8f34b5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 00:56:28 +0100 Subject: [PATCH 039/133] gnu: python-terminado: Move to jupyter. * gnu/packages/python-web.scm (python-terminado): Move from here ... * gnu/packages/jupyter.scm: ... to here. Change-Id: I54c385f4b4bb9fe58a0c0784e6994dc76fa6c8d5 --- gnu/packages/jupyter.scm | 35 ++++++++++++++++++++++++++++++++--- gnu/packages/python-web.scm | 28 ---------------------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index e694fa6761a..e211911aa94 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -1,16 +1,17 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Danny Milosavljevic +;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2019, 2021-2025 Ricardo Wurmus +;;; Copyright © 2016, 2021 Efraim Flashner ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019, 2021-2023 Ludovic Courtès ;;; Copyright © 2019, 2022 Andreas Enge -;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021 Nicolas Goaziou -;;; Copyright © 2022 Marius Bakke -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022 Marius Bakke +;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2024-2025 Sharlatan Hellseher ;;; @@ -500,6 +501,34 @@ Messaging Protocol}.") extensions.") (license license:bsd-4))) +(define-public python-terminado + (package + (name "python-terminado") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "terminado" version)) + (sha256 + (base32 + "0bpxag3n0148vsgmi6wh3ynmprykazzqys0lfxgpdr2xp32g42fy")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags #~(list "-W" "default"))) ;taken from pyproject.toml + (native-inputs + (list python-hatchling + python-pytest + python-pytest-timeout)) + (propagated-inputs + (list python-ptyprocess + python-tornado-6)) + (home-page "https://github.com/jupyter/terminado") + (synopsis "Terminals served to term.js using Tornado websockets") + (description "This package provides a Tornado websocket backend for the +term.js Javascript terminal emulator library.") + (license license:bsd-2))) + (define-public xeus (package (name "xeus") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 704d0387916..b3552dc9dc5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4287,34 +4287,6 @@ connection to each user.") web framework, either via the basic or digest authentication schemes.") (license license:asl2.0))) -(define-public python-terminado - (package - (name "python-terminado") - (version "0.18.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "terminado" version)) - (sha256 - (base32 - "0bpxag3n0148vsgmi6wh3ynmprykazzqys0lfxgpdr2xp32g42fy")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags #~(list "-W" "default"))) ;taken from pyproject.toml - (native-inputs - (list python-hatchling - python-pytest - python-pytest-timeout)) - (propagated-inputs - (list python-ptyprocess - python-tornado-6)) - (home-page "https://github.com/jupyter/terminado") - (synopsis "Terminals served to term.js using Tornado websockets") - (description "This package provides a Tornado websocket backend for the -term.js Javascript terminal emulator library.") - (license license:bsd-2))) - (define-public python-wsgi-intercept (package (name "python-wsgi-intercept") From 63f1a0fb486a9d86ff3cc4c2572bf700c9109632 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:01:01 +0100 Subject: [PATCH 040/133] gnu: python-halo: Move to python-xyz. * gnu/packages/terminals.scm (python-halo): Move from here ... * gnu/packages/python-xyz.scm: ... to here. Change-Id: Ie3bf1a898c949162a6f54d37ff44f362cda5d335 --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/terminals.scm | 27 --------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 60c0d450093..c92c99a10b1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -137,6 +137,7 @@ ;;; Copyright © 2023 Amade Nemes ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Lu Hui +;;; Copyright © 2023 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023 dan ;;; Copyright © 2023 Dominik Delgado Steuter @@ -927,6 +928,34 @@ part of @url{https://github.com/hgrecco/pint, Pint}, the Python units package. ") (license license:bsd-3))) +(define-public python-halo + (package + (name "python-halo") + (version "0.0.31") + (source + (origin + (method url-fetch) + (uri (pypi-uri "halo" version)) + (sha256 + (base32 "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI archive, no tags in Git + (native-inputs + (list python-setuptools)) + (propagated-inputs + (list python-colorama + python-log-symbols + python-six + python-spinners + python-termcolor)) + (home-page "https://github.com/manrajgrover/halo") + (synopsis "Python library to display graphical spinners in the terminal") + (description + "Halo is a Python library to display graphical spinners in the terminal. +It also supports IPython/Jupyter.") + (license license:expat))) + (define-public python-huey (package (name "python-huey") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index bd882bcd4ce..605b22da3cf 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1147,33 +1147,6 @@ features string-like objects which carry formatting information, per-line fullscreen terminal rendering, and keyboard input event reporting.") (license license:expat))) -(define-public python-halo - (package - (name "python-halo") - (version "0.0.31") - (source - (origin - (method url-fetch) - (uri (pypi-uri "halo" version)) - (sha256 - (base32 "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ;no tests in PyPI archive, no tags in Git - (native-inputs - (list python-setuptools)) - (propagated-inputs - (list python-colorama - python-log-symbols - python-six - python-spinners - python-termcolor)) - (home-page "https://github.com/manrajgrover/halo") - (synopsis "Python library to display graphical spinners in the terminal") - (description "Halo is a Python library to display graphical spinners in -the terminal. It also supports IPython/Jupyter.") - (license license:expat))) - (define-public python-log-symbols (package (name "python-log-symbols") From a6a89840adefd4c70a41b473e97e61a96399a29a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:03:43 +0100 Subject: [PATCH 041/133] gnu: python-log-symbols: Move to python-xyz. * gnu/packages/terminals.scm (python-log-symbols): Move from here ... * gnu/packages/python-xyz.scm: ... to here. Change-Id: I40b1647eaf6c69f4cbca699bd0d1f4833e2ad438 --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ gnu/packages/terminals.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c92c99a10b1..87fa18f5879 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1052,6 +1052,30 @@ comparison operators, as defined in the original @url{http://goessner.net/articles/JsonPath/, JSONPath} proposal.") (license license:asl2.0))) +(define-public python-log-symbols + (package + (name "python-log-symbols") + (version "0.0.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "log_symbols" version)) + (sha256 + (base32 "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI archive, tests depend on Nose + (native-inputs + (list python-setuptools)) + (propagated-inputs + (list python-colorama)) + (home-page "https://github.com/manrajgrover/py-log-symbols") + (synopsis "Python library with graphical symbols for logging on the terminal") + (description + "This package provides a Python library with graphical symbols that can +be displayed on the terminal, with color if possible, for logging purposes.") + (license license:expat))) + (define-public python-multiplex (package (name "python-multiplex") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 605b22da3cf..42d459d4242 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1147,30 +1147,6 @@ features string-like objects which carry formatting information, per-line fullscreen terminal rendering, and keyboard input event reporting.") (license license:expat))) -(define-public python-log-symbols - (package - (name "python-log-symbols") - (version "0.0.14") - (source (origin - (method url-fetch) - (uri (pypi-uri "log_symbols" version)) - (sha256 - (base32 - "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ;no tests in PyPI archive, tests depend on Nose - (native-inputs - (list python-setuptools)) - (propagated-inputs - (list python-colorama)) - (home-page "https://github.com/manrajgrover/py-log-symbols") - (synopsis "Python library with graphical symbols for logging on the terminal") - (description "This package provides a Python library with graphical symbols -that can be displayed on the terminal, with color if possible, for logging -purposes.") - (license license:expat))) - (define-public python-spinners (package (name "python-spinners") From 8c1c158872d82cea0b424dffde4a2b5543446755 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:06:00 +0100 Subject: [PATCH 042/133] gnu: python-spinners: Move to python-xyz. * gnu/packages/terminals.scm (python-spinners): Move from here ... * gnu/packages/python-xyz.scm: ... to here. Change-Id: I382935461c52766a98ae3b103e5309ee43651a09 --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ gnu/packages/terminals.scm | 21 --------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87fa18f5879..33e6bd50328 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1343,6 +1343,28 @@ three consecutive points in a polyline or polygon @end itemize") (license license:expat))) +(define-public python-spinners + (package + (name "python-spinners") + (version "0.0.24") + (source + (origin + (method url-fetch) + (uri (pypi-uri "spinners" version)) + (sha256 + (base32 "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI archive, tests depend on Nose + (native-inputs + (list python-setuptools)) + (home-page "https://github.com/manrajgrover/py-spinners") + (synopsis "Python library with graphical spinners for the terminal") + (description + "Spinners is a Python library that contains graphical spinners that can +be displayed terminal.") + (license license:expat))) + (define-public python-streamtracer (package (name "python-streamtracer") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 42d459d4242..3238dc72dc9 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1147,27 +1147,6 @@ features string-like objects which carry formatting information, per-line fullscreen terminal rendering, and keyboard input event reporting.") (license license:expat))) -(define-public python-spinners - (package - (name "python-spinners") - (version "0.0.24") - (source (origin - (method url-fetch) - (uri (pypi-uri "spinners" version)) - (sha256 - (base32 - "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ;no tests in PyPI archive, tests depend on Nose - (native-inputs - (list python-setuptools)) - (home-page "https://github.com/manrajgrover/py-spinners") - (synopsis "Python library with graphical spinners for the terminal") - (description "Spinners is a Python library that contains graphical spinners -that can be displayed terminal.") - (license license:expat))) - (define-public tmate (package (name "tmate") From e8855fe4a8ca84a5b60f572d2bce055247ae1dc0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:22:15 +0100 Subject: [PATCH 043/133] gnu: python-curtsies: Move to python-xyz. * gnu/packages/terminals.scm (python-curtsies): Move from here ... * gnu/packages/python-xyz.scm: ... to here. Change-Id: I1aaf93a0d0e75e9baa5904dc794d3da978f57443 --- gnu/packages/python-xyz.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/terminals.scm | 27 --------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 33e6bd50328..9c1eaaf8c19 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -98,6 +98,7 @@ ;;; Copyright © 2021-2025 Sharlatan Hellseher ;;; Copyright © 2021 Ellis Kenyő ;;; Copyright © 2021 LibreMiami +;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021, 2023-2025 jgart @@ -123,7 +124,7 @@ ;;; Copyright © 2022, 2023 Wamm K. D. ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022-2025 Artyom V. Poptsov -;;; Copyright © 2022 Paul A. Patience +;;; Copyright © 2022, 2023 Paul A. Patience ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2022 Marek Felšöci @@ -740,6 +741,33 @@ Configurations: @end table") (license license:bsd-2))) +(define-public python-curtsies + (package + (name "python-curtsies") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "curtsies" version)) + (sha256 + (base32 "09c8c4vssm2zkq017xj99vhcrisfva4nkz92w8dly4jjz7xhyahh")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pyte + python-pytest + python-setuptools + python-wheel)) + (propagated-inputs + (list python-blessed + python-cwcwidth)) + (home-page "https://github.com/bpython/curtsies") + (synopsis "Library for curses-like terminal interaction with colored strings") + (description + "Curtsies is a Python library for interacting with the terminal. It +features string-like objects which carry formatting information, per-line +fullscreen terminal rendering, and keyboard input event reporting.") + (license license:expat))) + (define-public python-distance (package (name "python-distance") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3238dc72dc9..f07123041a6 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1120,33 +1120,6 @@ avoids styling altogether when the output is redirected to something other than a terminal.") (license license:expat))) -(define-public python-curtsies - (package - (name "python-curtsies") - (version "0.4.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "curtsies" version)) - (sha256 - (base32 "09c8c4vssm2zkq017xj99vhcrisfva4nkz92w8dly4jjz7xhyahh")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pyte - python-pytest - python-setuptools - python-wheel)) - (propagated-inputs - (list python-blessed - python-cwcwidth)) - (home-page "https://github.com/bpython/curtsies") - (synopsis "Library for curses-like terminal interaction with colored strings") - (description - "Curtsies is a Python library for interacting with the terminal. It -features string-like objects which carry formatting information, per-line -fullscreen terminal rendering, and keyboard input event reporting.") - (license license:expat))) - (define-public tmate (package (name "tmate") From 27d6f7cc709fce5eaac8c66e541f8cf98fcbd5d4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:28:08 +0100 Subject: [PATCH 044/133] gnu: python-pyte: Move to python-xyz. * gnu/packages/terminals.scm (python-pyte): Move from here ... * gnu/packages/python-xyz.scm: ... to here. Change-Id: I749cca61abe2825e511db6dd7b7d47e2aba9d25d --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/terminals.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9c1eaaf8c19..e098586ef3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -108,6 +108,7 @@ ;;; Copyright © 2021 Franck Pérignon ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Simon Streit +;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021, 2022, 2023 Daniel Meißner ;;; Copyright © 2021, 2022 Pradana Aumars ;;; Copyright © 2021–2024 Felix Gruber @@ -1205,6 +1206,34 @@ cache directory, to avoid modifying the host's environment, and further activated using a set of environment variables.") (license (list license:expat license:asl2.0)))) +(define-public python-pyte + (package + (name "python-pyte") + (version "0.8.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/selectel/pyte") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cdhnl6rp4kcbs3s766519k80pf5ma18mgv6cyidf4nbgysjavmv")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-wcwidth)) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (home-page "https://pyte.readthedocs.io/") + (synopsis "Simple VTXXX-compatible terminal emulator") + (description "@code{pyte} is an in-memory VTxxx-compatible terminal +emulator. @var{VTxxx} stands for a series of video terminals, developed by +DEC between 1970 and 1995. The first and probably most famous one was the +VT100 terminal, which is now a de-facto standard for all virtual terminal +emulators. + +pyte is a fork of vt102, which was an incomplete pure Python implementation +of VT100 terminal.") + (license license:lgpl3+))) + (define-public python-pyxdameraulevenshtein (package (name "python-pyxdameraulevenshtein") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f07123041a6..f54ec30070e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -30,7 +30,6 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Petr Hodina -;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2022 Felipe Balbi ;;; Copyright © 2022 ( ;;; Copyright © 2022, 2023 jgart @@ -1064,34 +1063,6 @@ minimalistic.") usable with any list--including files, command history, processes and more.") (license license:expat))) -(define-public python-pyte - (package - (name "python-pyte") - (version "0.8.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/selectel/pyte") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1cdhnl6rp4kcbs3s766519k80pf5ma18mgv6cyidf4nbgysjavmv")))) - (build-system pyproject-build-system) - (propagated-inputs (list python-wcwidth)) - (native-inputs (list python-pytest python-setuptools python-wheel)) - (home-page "https://pyte.readthedocs.io/") - (synopsis "Simple VTXXX-compatible terminal emulator") - (description "@code{pyte} is an in-memory VTxxx-compatible terminal -emulator. @var{VTxxx} stands for a series of video terminals, developed by -DEC between 1970 and 1995. The first and probably most famous one was the -VT100 terminal, which is now a de-facto standard for all virtual terminal -emulators. - -pyte is a fork of vt102, which was an incomplete pure Python implementation -of VT100 terminal.") - (license license:lgpl3+))) - (define-public python-blessings (package (name "python-blessings") From 99e815efeda5b4ffc4d5304dce895ed2146cb921 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 17 Aug 2025 00:06:20 +0100 Subject: [PATCH 045/133] gnu: python-freetype-py: Move to fontutils. * gnu/packages/python-xyz.scm (python-freetype-py): Move from here ... * gnu/packages/fontutils.scm: ... to here. * gnu/packages/gnome-xyz.scm: Add fontutils module. Change-Id: Ic5c3d9a360bfb5e1214c73144619863f83a2db97 --- gnu/packages/fontutils.scm | 42 +++++++++++++++++++++++++++++++++++++ gnu/packages/gnome-xyz.scm | 1 + gnu/packages/python-xyz.scm | 41 ------------------------------------ 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8603f7224f3..df6dc142d3d 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou ;;; Copyright © 2021-2024 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Eric Bavier ;;; Copyright © 2022 Felipe Balbi ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 John Kehayias @@ -692,6 +693,47 @@ process. FontParts is the successor of RoboFab.") (alist-delete 'hidden? (package-properties python-fontparts-bootstrap))))) +(define-public python-freetype-py + (package + (name "python-freetype-py") + (version "2.5.1") + (source + (origin + (method git-fetch) ;no tests in PyPI archive + (uri (git-reference + (url "https://github.com/rougier/freetype-py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cls0469zfqzwpq6k4pxa9vrczsqabqk4qh7444xybcyq9qgs1lp")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags #~(list "tests") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-lib-paths + (lambda _ + (substitute* "freetype/raw.py" + (("ctypes.util.find_library\\('freetype'\\)") + (format #f "'~a/~a'" #$(this-package-input "freetype") + "lib/libfreetype.so"))))) + (add-before 'build 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) + (native-inputs + (list python-pytest + python-setuptools + python-setuptools-scm)) + (inputs + (list freetype)) + (home-page "https://github.com/rougier/freetype-py") + (synopsis "Freetype python bindings") + (description + "Freetype Python provides bindings for the FreeType library. Only the +high-level API is bound.") + (license license:bsd-3))) + (define-public python-glyphslib (package (name "python-glyphslib") diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 720195c2614..5e3408d8c39 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e098586ef3c..87f9f9bd867 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33281,47 +33281,6 @@ dumping of JSON5 data structures.") Foundation maintained libraries.") (license license:expat))) -(define-public python-freetype-py - (package - (name "python-freetype-py") - (version "2.5.1") - (source - (origin - (method git-fetch) ;no tests in PyPI archive - (uri (git-reference - (url "https://github.com/rougier/freetype-py") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0cls0469zfqzwpq6k4pxa9vrczsqabqk4qh7444xybcyq9qgs1lp")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags #~(list "tests") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-lib-paths - (lambda _ - (substitute* "freetype/raw.py" - (("ctypes.util.find_library\\('freetype'\\)") - (format #f "'~a/~a'" #$(this-package-input "freetype") - "lib/libfreetype.so"))))) - (add-before 'build 'set-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) - (native-inputs - (list python-pytest - python-setuptools - python-setuptools-scm)) - (inputs - (list freetype)) - (home-page "https://github.com/rougier/freetype-py") - (synopsis "Freetype python bindings") - (description - "Freetype Python provides bindings for the FreeType library. Only the -high-level API is bound.") - (license license:bsd-3))) - (define-public python-frozendict (package (name "python-frozendict") From 212a214514f82ca0c05a3cafc0226051f15898f4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:32:13 +0100 Subject: [PATCH 046/133] gnu packages/python-xyz: Remove unused modules. * gnu/packages/python-xyz.scm: Do not import terminals module. Change-Id: I013a309797087b7587140f4b11db27022a397791 --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87f9f9bd867..9145c90bb2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -285,7 +285,6 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages statistics) #:use-module (gnu packages tcl) - #:use-module (gnu packages terminals) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) From e2454e724f7f87947493214125468271fb4d9f39 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 26 Jun 2025 00:11:48 +0100 Subject: [PATCH 047/133] gnu: Remove bmaptools. This project was archived by the owner on Oct 16, 2024 and will no longer be maintained by Intel. Failed to build. * gnu/packages/disk.scm (bmaptools): Delete variable. Change-Id: I7f34fd71891763c3c126a7e8ea907758a648c389 --- gnu/packages/disk.scm | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 4248a8bf80c..712dae6282e 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1698,41 +1698,6 @@ and a partitioning of the heap between kinds of memory (for NUMA).") inspecting MMC storage devices from userspace.") (license license:gpl2)))) -(define-public bmaptools - (package - (name "bmaptools") - (version "3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/intel/bmap-tools") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; XXX: Remove failing test. - (invoke "nosetests" "-v" - "--exclude" "test_bmap_helpers")))))) - (native-inputs - (list python-mock python-nose)) - (propagated-inputs - (list python-six)) - (home-page "https://github.com/intel/bmap-tools") - (synopsis "Create block map for a file or copy a file using block map") - (description "Bmaptool is a tool for creating the block map (bmap) for a -file and copying files using the block map. The idea is that large files, -like raw system image files, can be copied or flashed a lot faster and more -reliably with @code{bmaptool} than with traditional tools, like @code{dd} or -@code{cp}.") - (license license:gpl2))) - (define-public duc (package (name "duc") From 5a91f6e3d2de8cde067b5afde6332348dc3f2fe8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 28 Jul 2025 15:15:25 +0100 Subject: [PATCH 048/133] gnu: Remove cmdtest. Not maintained, no users in Guix. * gnu/packages/check.scm (cmdtest): Delete variable. Change-Id: I254ff98633cf33f2c088ed8d82c7cb9dafc105f3 --- gnu/packages/check.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d98319e6246..ab0da134816 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -777,7 +777,6 @@ pattern.") a multi-paradigm automated test framework for C++ and Objective-C.") (license license:boost1.0))) - (define-public catch2-3 (package (inherit catch2-3.8) @@ -793,35 +792,6 @@ a multi-paradigm automated test framework for C++ and Objective-C.") (base32 "11yla93vm2896fzhm3fz8lk3y3iz5iy7vd6wa7wnwvhsfd2dbfq3")))))) -(define-public cmdtest - (package - (name "cmdtest") - ;; Use the latest commit (from 2019) in order to get Python 3 support. - (version "0.32-14-gcdfe14e") - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.liw.fi/cmdtest/") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yhcwsqcpckkq5kw3h07k0xg6infyiyzq9ni3nqphrzxis7hxjf1")))) - (build-system python-build-system) - (arguments `(#:tests? #f)) ;requires Python 2! - (native-inputs - (list python-coverage-test-runner python)) - (inputs - (list python-cliapp python-markdown python-ttystatus)) - (home-page "https://liw.fi/cmdtest/") - (synopsis "Black box Unix program tester") - (description - "@code{cmdtest} black box tests Unix command line tools. Roughly, it is -given a command line and input files, and the expected output, and it verifies -that the command line produces the expected output. If not, it reports a -problem, and shows the differences.") - (license license:gpl3+))) - (define-public cmocka (package (name "cmocka") From 21d88aac01a036f807ae27c839d51f7c61f322c4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:56:08 +0100 Subject: [PATCH 049/133] gnu: Remove python-aiorpcx-0.18. * gnu/packages/python-web.scm (python-aiorpcx-0.18): Delete variable. Change-Id: I1308611724e435e0f8deff1067993fb7d641acc2 --- gnu/packages/python-web.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b3552dc9dc5..3f14994f846 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1689,18 +1689,6 @@ The package includes a module with full coverage of JSON RPC versions 1.0 and comes with a SOCKS proxy client.") (license (list license:expat license:bsd-2)))) -(define-public python-aiorpcx-0.18 - (package - (inherit python-aiorpcx) - (version "0.18.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "aiorpcX" version)) - (sha256 - (base32 - "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0")))))) - (define-public python-aiostream (package (name "python-aiostream") From ab342338a0c302c8314722102dad2970986b0fba Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 18:14:42 +0100 Subject: [PATCH 050/133] gnu: Remove python-blessings. Abandoned since 2020, leaf package and fails to build. See: . * gnu/packages/terminals.scm (python-blessings): Delete variable. Change-Id: Ic36ae4f997f012ce1e579ab8c1c8ce7dd76c0b86 --- gnu/packages/terminals.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f54ec30070e..7d9b2db9406 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1063,34 +1063,6 @@ minimalistic.") usable with any list--including files, command history, processes and more.") (license license:expat))) -(define-public python-blessings - (package - (name "python-blessings") - (version "1.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "blessings" version)) - (sha256 - (base32 - "0z8mgkbmisxs10rz88qg46l1c9a8n08k8cy2iassal2zh16qbrcq")))) - (build-system python-build-system) - (arguments - ;; FIXME: Test suite is unable to detect TTY conditions. - `(#:tests? #f)) - (native-inputs - (list python-nose python-six)) - (home-page "https://github.com/erikrose/blessings") - (synopsis "Python module to manage terminal color, styling, and -positioning") - (description "Blessings is a pythonic API to manipulate terminal color, -styling, and positioning. It provides similar features to curses but avoids -some of curses’s limitations: it does not require clearing the whole screen -for little changes, provides a scroll-back buffer after the program exits, and -avoids styling altogether when the output is redirected to something other -than a terminal.") - (license license:expat))) - (define-public tmate (package (name "tmate") From 538203d0abe065334f5c5e92ceb5c215b02e63b6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 5 Aug 2025 16:17:23 +0100 Subject: [PATCH 051/133] gnu: Remove python-cachecontrol-0.11. * gnu/packages/python-web.scm (python-cachecontrol-0.11): Delete variable. Change-Id: I081cf03298b4059a9ae5b4de94e2ea7fd3c75b9c --- gnu/packages/python-web.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3f14994f846..4c4437cf7c0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6413,20 +6413,6 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." @code{httplib2} for use with @code{requests} session objects.") (license license:asl2.0))) -(define-public python-cachecontrol-0.11 - (package - (inherit python-cachecontrol) - (name "python-cachecontrol") - (version "0.11.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "CacheControl" version)) - (sha256 - (base32 - "07jsfhlbcwgqg6ayz8nznzaqg5rmxqblbzxz1qvg5wc44pcjjy4g")))) - (native-inputs (list python-setuptools python-wheel)))) - (define-public python-betamax (package (name "python-betamax") From 55c1285b834a4f5363a12ed309ceb36d4f398493 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Sep 2025 22:07:37 +0100 Subject: [PATCH 052/133] gnu: Remove python-contexttimer. The latest release was in 2016, no actively developed, depends on outdated inputs, has no users in Guix. * gnu/packages/python-xyz.scm (python-contexttimer): Delete variable. Change-Id: I35ceb328a511854cb10c6a126aacf88f06a5d4b8 --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9145c90bb2a..a22a69ef887 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20181,29 +20181,6 @@ and dataclasses.") @code{ArgumentParser} object.") (license license:asl2.0))) -(define-public python-contexttimer - (package - (name "python-contexttimer") - (version "0.3.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brouberol/contexttimer") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "00a9h06a1wj66935n863qlk4jpl9gvdvzkkhl8xmgqwdkwv0js54")))) - (build-system pyproject-build-system) - (propagated-inputs (list python-decorator python-unittest2)) - (native-inputs (list python-mock python-setuptools python-wheel)) - (home-page "https://github.com/brouberol/contexttimer") - (synopsis "Timer as a context manager") - (description - "This package offers utilities to measure code block or function -execution time.") - (license license:gpl3))) - (define-public python-texttable (package (name "python-texttable") From 738a581ad782c861522bf2a2487784541fb150a8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 31 Jul 2025 15:16:12 +0100 Subject: [PATCH 053/133] gnu: Remove python-contextvars. Note: This package implements a backport of Python 3.7 contextvars module (see PEP 567) for Python 3.6. Not maintained sicne 2019 has no users in Guix. * gnu/packages/python-xyz.scm (python-contextvars): Delete variable. Change-Id: I955c902d3afaa8044226438f2303b95e94ad1764 --- gnu/packages/python-xyz.scm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a22a69ef887..c0f3d0bd44c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -35124,27 +35124,6 @@ process.") (home-page "https://gamera.informatik.hsnr.de/") (license license:gpl2+))) -(define-public python-contextvars - (package - (name "python-contextvars") - (version "2.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "contextvars" version)) - (sha256 - (base32 - "17n3w8c20kgkgc6khaafdhhlcdj4bzman4paxqsl7harma59137k")))) - (build-system python-build-system) - (propagated-inputs - (list python-immutables)) - (home-page - "https://github.com/MagicStack/contextvars") - (synopsis "PEP 567 Backport") - (description "This package implements a backport of Python 3.7 -@code{contextvars} module (see PEP 567) for Python 3.6.") - (license license:asl2.0))) - (define-public python-aiofiles (package (name "python-aiofiles") From 8c43b7af0b94d95c84494c33a146cc6eeb01593e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 20 Jul 2025 16:35:26 +0100 Subject: [PATCH 054/133] gnu: Remove python-cython-0.29.35. * gnu/packages/python-xyz.scm (python-cython-0.29.35): Delete variable. Change-Id: Iaed062e153e295e1ec3ef7e8c91709081792fc21 --- gnu/packages/python-xyz.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c0f3d0bd44c..1608809e8c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10497,20 +10497,6 @@ writing C extensions for Python as easy as Python itself.") ;; time of the test suite. (setenv "CFLAGS" "-O0")))))))) -;; Needed for scipy and numpy -(define-public python-cython-0.29.35 - (package - (inherit python-cython-0) - (name "python-cython") - (version "0.29.35") - (source (origin - (method url-fetch) - (uri (pypi-uri "Cython" version)) - (sha256 - (base32 - "09y5r22nyswqpwc02agla1bnzh2jx2db25pnq9pc5cq8pyh1yf3f")))) - (properties '()))) - (define-public python-cython-3 python-cython) ;; NOTE: when upgrading numpy please make sure that python-numba, From db88d00e40e69bde7f7259f75da9aae38deb08c1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 22:25:55 +0100 Subject: [PATCH 055/133] gnu: Remove python-gixy-ng. * gnu/packages/check.scm (python-gixy-ng): Delete variable. Change-Id: Ic90fe0cdb037cdef9f79ae399b2d179e84db4abd --- gnu/packages/check.scm | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ab0da134816..b8ba839c111 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1059,44 +1059,6 @@ definition language, a safe runtime engine for test suites and a powerful report generation engine.") (license license:bsd-3))) -(define-public python-gixy-ng - (package - (name "python-gixy-ng") - (version "0.2.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dvershinin/gixy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0dipvy8y1nlhpka0cdk6hyv1j2388y7isbajpwskjrgqc5vayqx8")))) - (build-system pyproject-build-system) - ;; This package currently doesn't test properly, but we can't add - ;; pytest because it propagates another version of python-pyparsing - ;; that takes precedence over the right one. - (propagated-inputs (list python-configargparse - python-jinja2 - python-pyparsing-2.4.7 - python-six)) - (native-inputs (list python-cached-property - python-setuptools - python-wheel)) - (home-page "https://github.com/dvershinin/gixy") - (synopsis "Static NGINX configuration analyzer") - (description "Gixy is a static analyzer whose main goal is to help -prevent common NGINX misconfigurations. It provides the @command{gixy} -command. - -Note: This is an actively maintained fork of the original @code{python-gixy} -package.") - (license license:mpl2.0))) - -(define-deprecated/public python-gixy python-gixy-ng - (package/inherit python-gixy-ng - (name "python-gixy"))) - (define-public googletest (package (name "googletest") From e415a151124f67155b0404497112dc78642fb7e0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 4 Aug 2025 22:10:26 +0100 Subject: [PATCH 056/133] gnu: Remove python-jsonpatch-0.4. * gnu/packages/python-xyz.scm (python-jsonpatch-0.4): Delete variable. Change-Id: If95317c8ad49c66e63907a437fca54d8df7bedfc --- gnu/packages/python-xyz.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1608809e8c7..c4bae936f92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27100,21 +27100,6 @@ conversion: Gamut A, B, and C.") applying JSON Patches according to RFC 6902.") (license license:bsd-3))) -(define-public python-jsonpatch-0.4 - (package (inherit python-jsonpatch) - (name "python-jsonpatch") - (version "0.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stefankoegl/python-json-patch") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fq02y57kinyknxjcav0slcb0k9mwdffqw2hnlhdkpj7palh2mwk")))))) - (define-public python-rfc3986 (package (name "python-rfc3986") From 5b436966970463d342cc8adc6a203c46ec7e135c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Sep 2025 20:40:47 +0100 Subject: [PATCH 057/133] gnu: Remove python-importlib-resources-6. * gnu/packages/python-xyz.scm (python-importlib-resources-6): Delete variable. Change-Id: I1ddd5b4c38f5d50f60c6ebb58279c15f7a7c5304 --- gnu/packages/python-xyz.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c4bae936f92..5bf90c71335 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14030,34 +14030,6 @@ storage.") @code{importlib.resources} module for Python 2.7, and Python 3.") (license license:asl2.0))) -(define-public python-importlib-resources-6 - (package/inherit python-importlib-resources - (version "6.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "importlib_resources" version)) - (sha256 - (base32 - "0ic177y1j3v0zd7fzdg7x2h4c56f7i7xiccfg7is8v04p19v9cnd")))) - (native-inputs - (list python-jaraco-collections - python-jaraco-test - python-pytest - python-setuptools - python-setuptools-scm - python-wheel)) - (arguments - (cons* - #:test-flags - ;; AttributeError: module 'zipp' has no attribute 'CompleteDirs' - #~(list "--ignore=importlib_resources/tests/test_contents.py" - "--ignore=importlib_resources/tests/test_files.py" - "--ignore=importlib_resources/tests/test_open.py" - "--ignore=importlib_resources/tests/test_path.py" - "--ignore=importlib_resources/tests/test_read.py" - "--ignore=importlib_resources/tests/test_resource.py") - (package-arguments python-importlib-resources))))) - (define-public python-importlib-metadata (package (name "python-importlib-metadata") From 27bdb96244bb4d61b9149688f385d09bc8affe4b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 31 Jul 2025 14:59:42 +0100 Subject: [PATCH 058/133] gnu: Remove python-ipaddress. It was a back port of Python 3.3+ "ipaddress" module, not maintained since 2019 and has no users in Guix. * gnu/packages/python-xyz.scm (python-ipaddress): Delete variable. Change-Id: I8a7f1c49d0d3b409dde8191472e24e49abf45bb6 --- gnu/packages/python-xyz.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5bf90c71335..ca9142d26f1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18457,25 +18457,6 @@ suitable for a wide range of protocols based on the ASN.1 specification.") implementations of ASN.1-based codecs and protocols.") (license license:bsd-3))) -(define-public python-ipaddress - (package - (name "python-ipaddress") - (version "1.0.23") - (source (origin - (method url-fetch) - (uri (pypi-uri "ipaddress" version)) - (sha256 - (base32 - "1qp743h30s04m3cg3yk3fycad930jv17q7dsslj4mfw0jlvf1y5p")))) - (build-system python-build-system) - (home-page "https://github.com/phihag/ipaddress") - (synopsis "IP address manipulation library") - (description - "This package provides a fast, lightweight IPv4/IPv6 manipulation library - in Python. This library is used to create, poke at, and manipulate IPv4 and - IPv6 addresses and networks.") - (license license:psfl))) - (define-public python-asn1tools (package (name "python-asn1tools") From f4dee1290ad31dbe0fd85bdb69f72d744ac3b22f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 01:57:36 +0100 Subject: [PATCH 059/133] gnu: Remove python-msgpack-transitional. * gnu/packages/python-xyz.scm (python-msgpack-transitional): Delete variable. Change-Id: I5bd01468837d9ee353d85134ebd316a9cc7f192c --- gnu/packages/python-xyz.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca9142d26f1..82362266ded 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17723,37 +17723,6 @@ reading and writing MessagePack data.") (home-page "https://pypi.org/project/msgpack/") (license license:asl2.0))) -;; This msgpack library's name changed from "python-msgpack" to "msgpack" with -;; release 0.5. Some packages like poetry still call it by the old name for now. -;; -(define-public python-msgpack-transitional - (package - (inherit python-msgpack) - (name "python-msgpack-transitional") - (version "0.5.6") - (source (origin - (method url-fetch) - (uri (pypi-uri "msgpack" version)) - (sha256 - (base32 - "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) - (arguments - (substitute-keyword-arguments (package-arguments python-msgpack) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'configure-transitional - (lambda _ - ;; Keep using the old name. - (substitute* "setup.py" - (("TRANSITIONAL = False") - "TRANSITIONAL = 1")) - ;; This old version is not compatible with Python 3.9 - (substitute* '("test/test_buffer.py" "test/test_extension.py") - ((".tostring\\(") ".tobytes(")) - (substitute* '("test/test_buffer.py" "test/test_extension.py") - ((".fromstring\\(") ".frombytes(")) - #t)))))))) - (define-public python-openstep-plist (package (name "python-openstep-plist") From 11c4a94a359b722e131307696bb1f4436de1e621 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 31 Jul 2025 14:10:26 +0100 Subject: [PATCH 060/133] gnu: Remove python-nose-exclude. * gnu/packages/check.scm (python-nose-exclude): Delete variable. Change-Id: I9dc5bfff16ba1014b9364e0e27c0b51096b2c774 --- gnu/packages/check.scm | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b8ba839c111..cdc5ab93ead 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3243,40 +3243,6 @@ tests written in a natural language style, backed up by Python code.") JSON APIs with Behave.") (license license:expat))) -(define-public python-nose-exclude - (package - (name "python-nose-exclude") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nose-exclude" version)) - (sha256 - (base32 "0123x1lyv5b2p9civcfg8vilj2ga3q7p2ks1hq25z0gb3ssai3zp")))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'disable-test - (lambda _ - ;; Disable failing test: AssertionError. - (substitute* '("test_dirs/build/test.py" - "test_dirs/test_not_me/test.py") - (("def test_i_should_never_run") - "def off_i_should_never_run"))))))) - (native-inputs - (list python-setuptools - python-wheel)) - (propagated-inputs - (list python-nose)) - (home-page "https://github.com/kgrandis/nose-exclude") - (synopsis "Exclude specific directories from nosetests runs") - (description - "@code{nose-exclude} is a Nose plugin that allows you to easily specify -directories to be excluded from testing.") - (license license:lgpl2.1+))) - (define-public python-nose-timer (package (name "python-nose-timer") From da69810d72d38d85cd3688786f3ca045c7a1c751 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 18 Jul 2025 07:50:58 +0100 Subject: [PATCH 061/133] gnu: Remove python-nosexcover. It was a fork of "nose.plugins.cover" which is not maintained since 2018 and not in use by any packages in Guix. * gnu/packages/check.scm (python-nosexcover): Delete variable. Change-Id: I2e08f1d02df5e34cd0ab85d59cf4ce9fa365f901 --- gnu/packages/check.scm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cdc5ab93ead..4f5a6734b50 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3127,29 +3127,6 @@ pragmas to control it from within your code. Additionally, it is possible to write plugins to add your own checks.") (license license:gpl2+))) -(define-public python-nosexcover - (package - (name "python-nosexcover") - (version "1.0.11") - (source (origin - (method url-fetch) - (uri (pypi-uri "nosexcover" version)) - (sha256 - (base32 - "10xqr12qv62k2flxwqhh8cr00cjhn7sfjrm6p35gd1x5bmjkr319")))) - (build-system python-build-system) - (propagated-inputs - (list python-coverage python-nose)) - (home-page "https://github.com/cmheisel/nose-xcover") - (synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports") - (description "Nose-xcover is a companion to the built-in -@code{nose.plugins.cover}. This plugin will write out an XML coverage report -to a file named coverage.xml. - -It will honor all the options you pass to the Nose coverage plugin, -especially -cover-package.") - (license license:expat))) - (define-public python-discover (package (name "python-discover") From d7f906d3d9091d53b6e5d0572b32a870f10b4aeb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 18:36:07 +0100 Subject: [PATCH 062/133] gnu: Remove python-pandas-1. * gnu/packages/python-science.scm (python-pandas-1): Delete variable. Change-Id: Ib55e03b5a65978ddc6e38fbe73a35e37b993c460 --- gnu/packages/python-science.scm | 102 -------------------------------- 1 file changed, 102 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 7bd33bb2c47..e7c32481e9b 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -3582,108 +3582,6 @@ library.") tissue-specificity metrics for gene expression.") (license license:gpl3+))) -(define-public python-pandas-1 - (package - (name "python-pandas") - (version "1.5.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pandas" version)) - (sha256 - (base32 "1cdhngylzh352wx5s3sjyznn7a6kmjqcfg97hgqm5h3yb9zgv8vl")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "--pyargs" "pandas" - "-n" (number->string (parallel-job-count)) - "-m" "not slow and not network and not db" - "-k" - (string-append - ;; TODO: Missing input - "not TestS3" - " and not s3" - ;; No module named 'pandas.io.sas._sas' - " and not test_read_expands_user_home_dir" - " and not test_read_non_existent" - ;; Unknown failures - " and not test_switch_options" - ;; These fail with: td64 doesn't return NotImplemented, see numpy#17017 - " and not test_nat_comparisons" - ;; Crashes - " and not test_bytes_exceed_2gb" - ;; get_subplotspec() returns None; possibly related to - ;; https://github.com/pandas-dev/pandas/issues/54577 - " and not test_plain_axes" - ;; This test fails when run with pytest-xdist - ;; (see https://github.com/pandas-dev/pandas/issues/39096). - " and not test_memory_usage")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-build-system - (lambda _ - (substitute* "pyproject.toml" - ;; Not all data files are distributed with the tarball. - (("--strict-data-files ") "") - ;; Unknown property "asyncio_mode" - (("asyncio_mode = \"strict\"") "")))) - (add-after 'unpack 'patch-which - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "pandas/io/clipboard/__init__.py" - (("^WHICH_CMD = .*") - (string-append "WHICH_CMD = \"" - (search-input-file inputs "/bin/which") - "\"\n"))))) - (add-before 'check 'prepare-x - (lambda _ - (system "Xvfb &") - (setenv "DISPLAY" ":0") - ;; xsel needs to write a log file. - (setenv "HOME" "/tmp"))) - ;; The compiled libraries are only in the output at this point, - ;; but they are needed to run tests. - ;; FIXME: This should be handled by the pyargs pytest argument, - ;; but is not for some reason. - (add-before 'check 'pre-check - (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively - (string-append (site-packages inputs outputs) - "/pandas/_libs") - "pandas/_libs")))))) - (propagated-inputs - (list python-jinja2 - python-matplotlib - python-numpy - python-openpyxl - python-pytz - python-dateutil - python-xlrd - python-xlsxwriter)) - (inputs - (list which xclip xsel)) - (native-inputs - (list python-cython-0.29.35 - python-beautifulsoup4 - python-lxml - python-html5lib - python-pytest - python-pytest-mock - python-pytest-xdist - python-setuptools - python-wheel - ;; Needed to test clipboard support. - xorg-server-for-tests)) - (home-page "https://pandas.pydata.org") - (synopsis "Data structures for data analysis, time series, and statistics") - (description - "Pandas is a Python package providing fast, flexible, and expressive data -structures designed to make working with structured (tabular, -multidimensional, potentially heterogeneous) and time series data both easy -and intuitive. It aims to be the fundamental high-level building block for -doing practical, real world data analysis in Python.") - (license license:bsd-3))) - (define-public python-pandas-2 (package (name "python-pandas") From 200e3b8e61279fffabbd0fb43ac0f719b4428a46 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 29 Jul 2025 17:51:01 +0100 Subject: [PATCH 063/133] gnu: Remove python-pathtools. The same functionality is a part of standard Python library, this project is not maintained since 2014, see: . * gnu/packages/python-xyz.scm (python-pathtools): Delete variable. Change-Id: Ia08ee219243c8f96a15992d5d556679b550bf457 --- gnu/packages/python-xyz.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 82362266ded..7db6f7c154f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32321,25 +32321,6 @@ the import name as the name on PyPI. All subpackages and data files within a package are included automatically.") (license license:bsd-3))) -(define-public python-pathtools - (package - (name "python-pathtools") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pathtools" version)) - (sha256 - (base32 - "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw")))) - (build-system python-build-system) - (home-page - "https://github.com/gorakhargosh/pathtools") - (synopsis "Path utilities for Python") - (description "Pattern matching and various utilities for file systems -paths.") - (license license:expat))) - (define-public python-fastentrypoints (package (name "python-fastentrypoints") From 14c94eeaff29b072fa8f14453811bc9eb63d0825 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 12 Jul 2025 22:13:24 +0100 Subject: [PATCH 064/133] gnu: Remove python-psutil-7. * gnu/packages/python-xyz.scm (python-psutil-7): Delete variable. Change-Id: I9d386d78e16daf4db8232d9268da86c249401334 --- gnu/packages/python-xyz.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7db6f7c154f..bb0205692d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3934,18 +3934,6 @@ top, lsof, netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, iotop, uptime, pidof, tty, taskset, pmap.") (license license:bsd-3))) -(define-public python-psutil-7 - (package - (inherit python-psutil) - (name "python-psutil") - (version "7.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "psutil" version)) - (sha256 - (base32 "0mn42p9pzh0wynhk9i18iyvp8h54hbcsyczajmjcpv4blgmw7sbv")))))) - (define-public python-scapy (package (name "python-scapy") From 625a87d6b0f9874fb380f643a23dab29099f8f4a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 22:28:09 +0100 Subject: [PATCH 065/133] gnu: Remove python-pyparsing-2.4.7. * gnu/packages/python-build.scm (python-pyparsing-2.4.7): Delete variable. Change-Id: Ib6bd245d629dae72e56fd6b07f04aec9366bb6ac --- gnu/packages/python-build.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index d05f6a25237..3d6dbb383bd 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -460,19 +460,6 @@ of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code.") (license license:expat))) -;;; This is the last release compatible with Python 2. -(define-public python-pyparsing-2.4.7 - (package - (inherit python-pyparsing) - (version "2.4.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyparsing" version)) - (sha256 - (base32 "1hgc8qrbq1ymxbwfbjghv01fm3fbpjwpjwi0bcailxxzhf3yq0y2")))) - (native-inputs (list python-setuptools python-wheel)))) - (define-public python-packaging-bootstrap (package (name "python-packaging-bootstrap") From 1efe536eb652fb9b3e84c5ccf693a48c78db367d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 9 Aug 2025 16:54:20 +0100 Subject: [PATCH 066/133] gnu: Remove python-pytest-cache. * gnu/packages/check.scm (python-pytest-cache): Delete variable. Change-Id: I37a4cc3a58ac32b9f9c83706be7632bc6e64f58d --- gnu/packages/check.scm | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4f5a6734b50..c320ba13baa 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2637,26 +2637,6 @@ and commands. It contains functions to check things on the file system, and tools for mocking system commands and recording calls to those.") (license license:expat))) -;;; The software provided by this package was integrated into pytest 2.8. -(define-public python-pytest-cache - (package - (name "python-pytest-cache") - (version "1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-cache" version)) - (sha256 - (base32 - "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y")))) - (build-system python-build-system) - (propagated-inputs - (list python-apipkg python-execnet python-py python-pytest)) - (synopsis "Py.test plugin with mechanisms for caching across test runs") - (description "The pytest-cache plugin provides tools to rerun failures from -the last py.test invocation.") - (home-page "https://bitbucket.org/hpk42/pytest-cache/") - (license license:expat))) - (define-public python-pytest-localserver (package (name "python-pytest-localserver") From c55bdc4812190dd8dba3b9ef711939ca0ea67b34 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 11 Aug 2025 19:39:21 +0100 Subject: [PATCH 067/133] gnu: Remove python-pytest-rerunfailures-13. * gnu/packages/python-check.scm (python-pytest-rerunfailures-13): Delete variable. Change-Id: Ifd9cefe994ba6a884bede0c61529a7f1ab053fd2 --- gnu/packages/python-check.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 0d488b5059d..32cddb2f2b7 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2935,17 +2935,6 @@ times.") eliminate flaky failures.") (license license:mpl2.0))) -(define-public python-pytest-rerunfailures-13 - (package - (inherit python-pytest-rerunfailures) - (version "13.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-rerunfailures" version)) - (sha256 - (base32 "16cin0chv59w4rvnd6r0fisp0s8avmp07rwn9da6yixw43jdncp1")))))) - ;; This is only used by python-sanic (define-public python-pytest-sanic (package From fabece727a3bf2ef45d6a8510c47035e7c815b70 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 29 Jul 2025 14:51:54 +0100 Subject: [PATCH 068/133] gnu: Remove python-random2. * gnu/packages/python-xyz.scm (python-random2): Delete variable. Change-Id: I71146f1202332bd9912f7beaa1897fa74e442e1c --- gnu/packages/python-xyz.scm | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bb0205692d2..ff0405bf5e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25169,33 +25169,6 @@ GraphQL schema describes your data model, and provides a GraphQL server with an associated set of resolve methods that know how to fetch data.") (license license:expat))) -(define-public python-random2 - (package - (name "python-random2") - (version "1.0.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "random2" version ".zip")) - (sha256 - (base32 - "01y0s4747plsx8fdnxy0nz83dp69naddz58m81r9h0s1qfm31b9l")) - (patches - (search-patches "python-random2-getrandbits-test.patch")))) - (build-system python-build-system) - (native-inputs (list unzip)) - (home-page "https://pypi.python.org/pypi/random2") - (synopsis "Python 3 version of the Python 2 @code{random} module") - (description - "This package provides a Python 3 ported version of Python 2.7’s - @code{random} module. It has also been back-ported to work in Python 2.6. - - In Python 3, the implementation of @code{randrange()} was changed, so that - even with the same seed you get different sequences in Python 2 and 3. - - This package closes that gap, allowing stable random number generation - between the different Python versions.") - (license license:psfl))) - ;; XXX: The last time updated in 2015, consider to remove it when nothing is ;; depend on it. (define-public python-snowballstemmer From 5ada9e95bb05dc436c65d9ee54745df4392b629f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 10 Aug 2025 01:30:57 +0100 Subject: [PATCH 069/133] gnu: Remove python-rich-click-next. * gnu/packages/python-xyz.scm (python-rich-click-next): Delete variable. Change-Id: I170249bec31880883d2a090839e70357ab872ccb --- gnu/packages/python-xyz.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ff0405bf5e6..86a5ce72fba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22126,37 +22126,6 @@ representation.") syntax highlighting, markdown and more to the terminal.") (license license:expat))) -;; TODO: Merge with python-rich-click on next python-team iteration. -(define-public python-rich-click-next - ;; Hidden from the CLI, so that we don't have warnings or surprises on - ;; installation, but other packages can still refer to it. - (hidden-package - (package - (name "python-rich-click") - (version "1.8.9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ewels/rich-click") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0kc2wcb5dpgxhdcz8fy6gfhl7vra03xwgwfg7h0qxxibr8yzhmmq")))) - (build-system pyproject-build-system) - (propagated-inputs - (list python-click python-importlib-metadata python-rich - python-typing-extensions)) - (native-inputs (list python-pytest python-setuptools python-wheel)) - (home-page "https://github.com/ewels/rich-click") - (synopsis "Format click help output nicely with rich") - (description "Click is a \"Python package for creating beautiful command -line interfaces\". Rich is a \"Python library for rich text and beautiful -formatting in the terminal\". The intention of rich-click is to provide -attractive help output from click, formatted with rich, with minimal -customization required.") - (license license:expat)))) - (define-public python-rich-click (package (name "python-rich-click") From 3ba0945cebe98e741717818a67661fb690d4c6bb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 17 Jul 2025 17:16:35 +0100 Subject: [PATCH 070/133] gnu: Remove python-setuptools-scm-git-archive. Message from upstram: This repository was archived by the owner on May 5, 2024. It is now read-only. There are no users in Guix, fails to build. * gnu/packages/python-xyz.scm (python-setuptools-scm-git-archive): Delete variable. Change-Id: If31c394997a0dce2b47fc2a0e9cda1215c4b3e96 --- gnu/packages/python-xyz.scm | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86a5ce72fba..cec7a5b6143 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27939,40 +27939,6 @@ version is a fork of jsonrpclib by Josh Marshall, usable with Pelix remote services.") (license license:asl2.0))) -(define-public python-setuptools-scm-git-archive - (package - (name "python-setuptools-scm-git-archive") - (version "1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setuptools_scm_git_archive" version)) - (sha256 - (base32 - "1nii1sz5jq75ilf18bjnr11l9rz1lvdmyk66bxl7q90qan85yhjj")))) - (build-system python-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'dont-install-defunct-egginfo - (lambda _ - ;; When a ".git" directory is missing, the setup.py - ;; script invokes setuptools.setup twice, once with - ;; "0" as the version. Prevent that. - (substitute* "setup.py" - (("if not isdir\\('\\.git'\\):") - "if False:"))))))) - (native-inputs - (list python-pytest)) - (propagated-inputs - (list python-setuptools-scm)) - (home-page "https://github.com/Changaco/setuptools_scm_git_archive/") - (synopsis "Setuptools_scm plugin for git archives") - (description - "The setuptools_scm_git_archive package is a plugin to -setuptools_scm, which supports obtaining versions from git archives that -belong to tagged versions.") - (license license:expat))) - (define-public python-setuptools-git (package (name "python-setuptools-git") From cc26296f6141e960cd7dcadb77b5a7e27f2c0c50 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 10:55:57 +0100 Subject: [PATCH 071/133] gnu: Remove python-sphinx-5. Sphinx@5 is no longer required, fails to build. * gnu/packages/sphinx.scm (python-sphinx-5): Delete variable. Change-Id: I76ac2ced2c652ca1b313d246610919ccee5588f2 --- gnu/packages/sphinx.scm | 105 ---------------------------------------- 1 file changed, 105 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 7893ecf3aa2..e8e5ea83469 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -273,111 +273,6 @@ sources.") (texlive-local-tree (list texlive-anyfontsize texlive-cm-super texlive-tex-gyre)))))) -(define-public python-sphinx-5 - (package - (inherit python-sphinx) - (version "5.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "1dclwwz5rsvlw5rzyad1ar7i0zh4csni6jfp0lyc37zzm7h6s0ji")))) - (arguments - (list - #:test-flags - ;; These require Internet access. - '(list "--ignore=tests/test_build_linkcheck.py" - "-k" - (string-append - "not test_latex_images" - ;; XXX: Not clear why this fails with a version comparison - ;; failure. - " and not test_needs_sphinx" - ;; This fails on some machines with the failed assertion - ;; '5:11:17\u202fAM' == '5:11:17 AM'. - " and not test_format_date" - ;; This is a harmless failure. The expected output looks for a - ;; long string that happens to contain a literal space - ;; character, but in the actual output the space character is - ;; wrapped in . - " and not test_viewcode" - ;; These fail with pygments 2.10+. They are harmless. - " and not test_additional_targets_should_not_be_translated" - " and not test_additional_targets_should_be_translated" - ;; As in Sphinx@6: - ;; AssertionError: assert...list of weak references to the object... - " and not test_autodoc_default_options")) - #:phases - '(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; for test_cython - (setenv "HOME" "/tmp")))))) - (propagated-inputs - (list python-babel - python-colorama - python-docutils - python-filelock - python-html5lib - python-imagesize - python-importlib-metadata - python-jinja2 - python-packaging - python-pygments - python-requests - python-snowballstemmer - python-sphinx-alabaster-theme - python-sphinxcontrib-applehelp - python-sphinxcontrib-devhelp - python-sphinxcontrib-htmlhelp - python-sphinxcontrib-jsmath - python-sphinxcontrib-qthelp - python-sphinxcontrib-serializinghtml - python-sphinxcontrib-websupport - python-types-requests - - ;; The Sphinx LaTeX library '\RequirePackage' or \\usepackage - ;; these: - texlive-scheme-basic ;for a valid TeX Live tree - texlive-anyfontsize - texlive-capt-of - texlive-cm-super - texlive-cmap - texlive-etoolbox - texlive-fancyvrb - texlive-float - texlive-fncychap - texlive-fontspec - texlive-framed - texlive-luatex85 - texlive-luatexbase - texlive-needspace - texlive-parskip - texlive-polyglossia - texlive-preview - texlive-tabulary - texlive-tex-gyre - texlive-titlesec - texlive-upquote - texlive-varwidth - texlive-wrapfig - texlive-xcolor)) - (native-inputs - (list fontconfig - font-gnu-freefont - ;; imagemagick is added for "convert". The store item does not - ;; retain a reference to imagemagick, so it should be safe to use - ;; 'imagemagick/stable' instead of 'imagemagick'. This is enforced - ;; by the '#:disallowed-references' above. - imagemagick/stable - python-cython - python-flit-core - python-pytest - (texlive-local-tree - (list texlive-anyfontsize texlive-cm-super texlive-tex-gyre)))))) - (define-public python-sphinxcontrib-apidoc (package (name "python-sphinxcontrib-apidoc") From baab6db46ab426148e4a98f93b60c766f5f335b7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 10:55:55 +0100 Subject: [PATCH 072/133] gnu: Remove python-sphinx-panels. It's no longer required, fails to build, not mainted. Message from upstream: > This repository is not actively maintained. Use sphinx-design instead! > See the migration guide and this github issue for more information. * gnu/packages/sphinx.scm (python-sphinx-panels): Delete variable. Change-Id: Ib51b05819238a912e30f36fbeb0f24316275e441 --- gnu/packages/sphinx.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index e8e5ea83469..ec699823936 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -644,43 +644,6 @@ user profiles. Support for GitHub is built-in, but other services can also be supported with @code{sphinx-issues}.") (license license:expat))) -(define-public python-sphinx-panels - (package - (name "python-sphinx-panels") - (version "0.6.0") - (source - (origin - ;; Tests not included in the pypi release. - (method git-fetch) - (uri (git-reference - (url "https://github.com/executablebooks/sphinx-panels") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ivqz6yv96a2jp59kylg1gbkrmzq6zwilppz3ij0zrkjn25zb97k")))) - (build-system pyproject-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'loosen-requirements - (lambda _ - (substitute* "setup.py" - (("sphinx>=2,<5") - "sphinx>=2,<6"))))))) - (propagated-inputs (list python-docutils-0.16 python-sphinx-5)) - (native-inputs - (list python-pytest - python-pytest-regressions - python-setuptools - python-wheel)) - (home-page "https://github.com/executablebooks/sphinx-panels") - (synopsis "Sphinx extension for creating panels in a grid layout") - (description - "This package provides a sphinx extension for creating panels in a -grid layout. It is no longer maintained and users are encouraged to use -@code{sphinx-design} instead.") - (license license:expat))) - (define-public python-sphinx-tabs (package (name "python-sphinx-tabs") From 97bf029c02a9995544f5d668ccce945b5a2d30b3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Sep 2025 22:19:58 +0100 Subject: [PATCH 073/133] gnu: Remove python-unittest2. This package is no longer needed as per: "unittest2 is a backport of the new features added to the unittest testing framework in Python 2.7 and onwards.", it has no users in Guix. * gnu/packages/check.scm (python-unittest2): Delete variable. * gnu/local.mk (dist_patch_DATA): Deregister 2 patches. * gnu/packages/patches/python-unittest2-python3-compat.patch: Delete file. * gnu/packages/patches/python-unittest2-remove-argparse.patch: Likewise. Change-Id: I7d67223cdd5a0e656a299d83ac28248d7db7c321 --- gnu/local.mk | 2 - gnu/packages/check.scm | 30 ------------ .../python-unittest2-python3-compat.patch | 46 ------------------- .../python-unittest2-remove-argparse.patch | 11 ----- 4 files changed, 89 deletions(-) delete mode 100644 gnu/packages/patches/python-unittest2-python3-compat.patch delete mode 100644 gnu/packages/patches/python-unittest2-remove-argparse.patch diff --git a/gnu/local.mk b/gnu/local.mk index 580b457604c..661198f36a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2174,8 +2174,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-without-kineto.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ - %D%/packages/patches/python-unittest2-python3-compat.patch \ - %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-vaex-core-fix-tsl-use.patch \ %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c320ba13baa..085119a6603 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1557,36 +1557,6 @@ better plugin api, being easier for users to configure, and simplifying internal interfaces and processes.") (license license:bsd-2))) -(define-public python-unittest2 - (package - (name "python-unittest2") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "unittest2" version)) - (patches - (search-patches "python-unittest2-python3-compat.patch" - "python-unittest2-remove-argparse.patch")) - (sha256 - (base32 - "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "python" "-m" "unittest2" "discover" "--verbose"))))))) - (propagated-inputs - (list python-six python-traceback2)) - (home-page "https://pypi.org/project/unittest2/") - (synopsis "Python unit testing library") - (description - "Unittest2 is a replacement for the unittest module in the Python -standard library.") - (license license:psfl))) - (define-public python-pytest (package (name "python-pytest") diff --git a/gnu/packages/patches/python-unittest2-python3-compat.patch b/gnu/packages/patches/python-unittest2-python3-compat.patch deleted file mode 100644 index 68fbccacd06..00000000000 --- a/gnu/packages/patches/python-unittest2-python3-compat.patch +++ /dev/null @@ -1,46 +0,0 @@ -Skip tests that fail with newer versions of Python. - -Patch copied from Gentoo: - -https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch - -diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py -index 683f662..347eea5 100644 ---- a/unittest2/test/test_loader.py -+++ b/unittest2/test/test_loader.py -@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase): - # - # What happens when an impossible name is given, relative to the provided - # `module`? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromName__relative_malformed_name(self): - loader = unittest.TestLoader() - -@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase): - # TestCase or TestSuite instance." - # - # What happens when presented with an impossible module name? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromNames__malformed_name(self): - loader = unittest2.TestLoader() - -@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase): - # "The method optionally resolves name relative to the given module" - # - # What happens when presented with an impossible attribute name? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromNames__relative_malformed_name(self): - loader = unittest.TestLoader() - -diff --git a/unittest2/compatibility.py b/unittest2/compatibility.py -index 9e5f1a5..2d20c19 100644 ---- a/unittest2/compatibility.py -+++ b/unittest2/compatibility.py -@@ -140,6 +140,6 @@ except ImportError: - ### ChainMap (helper for configparser and string.Template) - ######################################################################## - --class ChainMap(collections.MutableMapping): -+class ChainMap(collections.abc.MutableMapping): - ''' A ChainMap groups multiple dicts (or other mappings) together - to create a single, updateable view. diff --git a/gnu/packages/patches/python-unittest2-remove-argparse.patch b/gnu/packages/patches/python-unittest2-remove-argparse.patch deleted file mode 100644 index c96738757ef..00000000000 --- a/gnu/packages/patches/python-unittest2-remove-argparse.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py 2017-09-12 01:22:06.273997788 +0200 -+++ b/setup.py 2017-09-12 01:22:14.297918757 +0200 -@@ -57,7 +57,7 @@ - # Both install and setup requires - because we read VERSION from within the - # package, and the package also exports all the APIs. - # six for compat helpers --REQUIRES = ['argparse', 'six>=1.4', 'traceback2'], -+REQUIRES = ['six>=1.4', 'traceback2'], - - params = dict( - name=NAME, From ac5f6fbe7c273203c26c2c2eb96861ececb17023 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Sep 2025 22:31:14 +0100 Subject: [PATCH 074/133] gnu: Remove python-ttystatus. * gnu/packages/python-xyz.scm (python-ttystatus): Delete variable. Change-Id: I6b4d7f75950f24bd19dcefd4cc80e385680214c9 --- gnu/packages/python-xyz.scm | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cec7a5b6143..18861d2404d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26152,41 +26152,6 @@ instead of servers and network commands.") as parsing the command line for options, and iterating over input files.") (license license:gpl2+))) -(define-public python-ttystatus - (package - (name "python-ttystatus") - (version "0.38") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "http://git.liw.fi/ttystatus") - ;; There are no tags after ttystatus-0.36. - (commit "e9fc573326c5d1348f5fe56263b4f7a8c32f58c9"))) - (sha256 - (base32 "0v49q839nrwdm19c83wfmj6n2kw80xslwq9k0n5509r2h7wzjiqj")) - (file-name (git-file-name name version)))) - (build-system python-build-system) - (native-inputs - (list python-coverage-test-runner)) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; check phase needs to be run before the build phase. If not, - ;; coverage-test-runner looks for tests for the built source files, - ;; and fails. - (delete 'check) - (add-before 'build 'check - (lambda _ (invoke "make" "check")))))) - (home-page "https://liw.fi/ttystatus/") - (synopsis "Python library for progress reporting and - status updates on terminals") - (description "@code{ttystatus} is a Python library for showing progress - reporting and status updates on terminals, for command line programs. - Output is automatically adapted to the width of the terminal: truncated - if it does not fit, and resized if the terminal size changes.") - (license license:gpl3+))) - (define-public python-astroid (package (name "python-astroid") From 7e81af1d8cbf5cfd60adf0e44ee846c216a8d696 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Sep 2025 22:45:35 +0100 Subject: [PATCH 075/133] gnu: Remove python-editdistance. This project was archived by the owner on Jun 30, 2025. It has no users in Guix. * gnu/packages/textutils.scm (python-editdistance): Delete variable. Change-Id: Ic8930d36449499874837f106ec1e6404ef349218 --- gnu/packages/textutils.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index cb983fef43e..fdfd8ea6050 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1058,43 +1058,6 @@ Eclipse and NetBeans. Completion information is typically specified in an XML file, but can even be dynamic.") (license license:bsd-3))) -;; We use the sources from git instead of the tarball from pypi, because the -;; latter does not include the Cython source file from which bycython.cpp is -;; generated. -(define-public python-editdistance - (let ((commit "3ea84a7dd3258c76aa3be851ef3d50e59c886846") - (revision "1")) - (package - (name "python-editdistance") - (version (string-append "0.3.1-" revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aflc/editdistance") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1l43svsv12crvzphrgi6x435z6xg8m086c64armp8wzb4l8ccm7g")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-cython-code - (lambda _ - (with-directory-excursion "editdistance" - (delete-file "bycython.cpp") - (invoke "cython" "--cplus" "bycython.pyx"))))))) - (native-inputs - (list python-cython)) - (home-page "https://www.github.com/aflc/editdistance") - (synopsis "Fast implementation of the edit distance (Levenshtein distance)") - (description - "This library simply implements Levenshtein distance algorithm with C++ -and Cython.") - (license license:expat)))) - (define-public txt2tags (package (name "txt2tags") From 40a64801bd8271a8509bfaf2aed269bb7e6af5b0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 18 Sep 2025 23:09:12 +0100 Subject: [PATCH 076/133] gnu: python-beartype: Update to 0.21.0. * gnu/packages/python-check.scm (python-beartype): Update to 0.21.0. [native-inputs]: Remove python-numpy and python-pygments. Change-Id: I16a2dc877b20f9f52de8b6e596cf7abb6d7677eb --- gnu/packages/python-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 32cddb2f2b7..7b6cff865d4 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -343,16 +343,16 @@ all the files it generates a report.") (define-public python-beartype (package (name "python-beartype") - (version "0.19.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (pypi-uri "beartype" version)) (sha256 - (base32 "0wv598iv9c2s6ivfiara9pnkdlnas8xjw063wvyi0dswpb0xyhny")))) + (base32 "0i1j1mkcw0fgms9qg7j30nlgcr0b0ndx2l98sb162wp8bj7hg9gr")))) (build-system pyproject-build-system) (native-inputs - (list python-hatchling python-numpy python-pygments python-pytest)) + (list python-hatchling python-pytest)) (home-page "https://github.com/beartype/beartype") (synopsis "Fast runtime type checking for Python") (description "Beartype aims to be a very fast runtime type checking tool From c2bb71dbbed4fcb8710cc505a30ce7c488501c5a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 07:35:58 +0100 Subject: [PATCH 077/133] gnu: python-numexpr: Update to 2.12.1. * gnu/packages/python-xyz.scm (python-numexpr): Update to 2.12.1. [propagated-inputs]: Remove python-numpy; add python-numpy-2. [native-inputs]: Remove python-wheel. Change-Id: I3eedd2eca2917db09432cd034855d5ba100c135e --- gnu/packages/python-xyz.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18861d2404d..8b3f439bf66 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11393,27 +11393,28 @@ parse and apply unified diffs. It has features such as: (define-public python-numexpr (package (name "python-numexpr") - (version "2.9.0") ; starting from 2.10.0, NumPy 2+ is required + (version "2.12.1") (source (origin (method url-fetch) (uri (pypi-uri "numexpr" version)) (sha256 - (base32 "1w5ampdamlwj8ix1ipzxngmrlqpnmcmk95gbi6839kijqkv147gj")))) + (base32 "1aslzx2mzgk1xxxpm3mrvl8ngfxj7dxlz4q2xbqx20gh1bnzlfg2")))) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (add-before 'check 'build-extensions - (lambda _ - (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (with-directory-excursion #$output + (apply invoke "pytest" "-vv" test-flags)))))))) (native-inputs (list python-pytest - python-setuptools - python-wheel)) + python-setuptools)) (propagated-inputs - (list python-numpy)) + (list python-numpy-2)) (home-page "https://github.com/pydata/numexpr") (synopsis "Fast numerical expression evaluator for NumPy") (description From 55146ee06a955c0549594a30ecfbc4a579f80228 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 18 Sep 2025 14:26:32 +0100 Subject: [PATCH 078/133] gnu: python-jplephem: Update to 2.23. * gnu/packages/astronomy.scm (python-jplephem): Update to 2.23. [source]: Switch to git-fetch providing test data. [phases]{check}: Rework test steps. [native-inputs]: Remove python-setuptools and python-wheel; add python-setuptools-next. (python-jplephem-2.22): New variable. (python-astropy-6)[propagated-inputs]: Remove python-jplephem; add python-jplephem-2.22 Change-Id: I9a53357a3c06c219a5620b5d23ce640b2a5d70db --- gnu/packages/astronomy.scm | 46 +++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 04726d39724..b4f0e0e12a9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2795,7 +2795,10 @@ astronomy and astrophysics.") (with-directory-excursion "astropy/extern" (for-each delete-file-recursively '("ply" "configobj"))) (with-directory-excursion "cextern" - (for-each delete-file-recursively '("expat" "wcslib"))))))))) + (for-each delete-file-recursively '("expat" "wcslib"))))))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-astropy) + (replace "python-jplephem" python-jplephem-2.22))))) (define-public python-astropy-healpix (package @@ -4843,13 +4846,16 @@ satellite.") (define-public python-jplephem (package (name "python-jplephem") - (version "2.22") + (version "2.23") (source (origin - (method url-fetch) - (uri (pypi-uri "jplephem" version)) + (method git-fetch) ;no tests data in the PyPI tarball + (uri (git-reference + (url "https://github.com/brandon-rhodes/python-jplephem") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0b2rgb7pvwnl72pqjryf9c812mmdxr69fwiym7mnz05l2xrcr6hd")))) + (base32 "0mmd30cymb9f259c657d7jd65plirdsngnk14fbyjxd9vbryn2qa")))) (build-system pyproject-build-system) (arguments (list @@ -4858,10 +4864,10 @@ satellite.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "python" "-m" "unittest" "discover" "-s" "test"))))))) + (with-directory-excursion "ci" + (invoke "python" "-m" "unittest" "test")))))))) (native-inputs - (list python-setuptools - python-wheel)) + (list python-setuptools-next)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/brandon-rhodes/python-jplephem") @@ -4874,6 +4880,30 @@ Astronomical Almanac to within 0.0005 arcseconds (half a @emph{mas} or milliarcsecond).") (license license:expat))) +;; The last compatible version for python-astropy-6. +(define-public python-jplephem-2.22 + (hidden-package + (package + (inherit python-jplephem) + (version "2.22") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jplephem" version)) + (sha256 + (base32 "0b2rgb7pvwnl72pqjryf9c812mmdxr69fwiym7mnz05l2xrcr6hd")))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover" "-s" "test"))))))) + (native-inputs + (list python-setuptools + python-wheel))))) + (define-public python-jwst (package (name "python-jwst") From 5d251ea9dc4acccbb5dd0e2f1ae4bc692cdb5201 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 08:02:32 +0100 Subject: [PATCH 079/133] gnu: python-jupyterlab-widgets: Update to 3.0.11. * gnu/packages/jupyter.scm (python-jupyterlab-widgets): Update to 3.0.11. Change-Id: Ic401e3e56e8fe100d6b8be4eb6a5afecfd33c0ae --- gnu/packages/jupyter.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index e211911aa94..dbbd3199403 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -864,15 +864,17 @@ endpoints—to Jupyter web applications.") (define-public python-jupyterlab-widgets (package (name "python-jupyterlab-widgets") - (version "3.0.10") + ;; XXX: Newer version requires python-jupyterlab, see guix/guix#2073. + (version "3.0.11") (source (origin (method url-fetch) (uri (pypi-uri "jupyterlab_widgets" version)) (sha256 - (base32 - "1h04kln8hp56svdjjk2hbsb0z1mby71cv4gss3wy89v7jw2arwh4")))) + (base32 "09zfvqsw0svm6r3i2lhklnx44s7j4i60bvcvkkr9m5iwb5wwcnnx")))) (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI (native-inputs (list python-jupyter-packaging)) (home-page "https://github.com/jupyter-widgets/ipywidgets") From f550d0e12c544a7dc72c397a12396efae8042abc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 08:08:21 +0100 Subject: [PATCH 080/133] gnu: python-bleach: Update to 6.2.0. * gnu/packages/python-xyz.scm (python-bleach): Update to 6.2.0. [propagated-inputs]: Remove python-tinycss2; add python-webencodings. [native-inputs]: Remove python-wheel. Change-Id: I246a5b8ffcafc5c83ff9bb3e24fcc87043170f61 --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b3f439bf66..29ecb619579 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19287,13 +19287,13 @@ systems, as a command line tool, and as a Python library.") (define-public python-bleach (package (name "python-bleach") - (version "6.0.0") + (version "6.2.0") (source (origin (method url-fetch) (uri (pypi-uri "bleach" version)) (sha256 - (base32 "054lp46iymchq3np0nar3k2h4da3wq4rzw652kdxh1syb70qa6hs")) + (base32 "07wrbzlmd6x63dz7lcdih9c4xkn79inimv6kh3yrk9dq310qjghj")) (snippet #~(begin (use-modules (guix build utils)) @@ -19301,8 +19301,12 @@ systems, as a command line tool, and as a Python library.") (("bleach\\._vendor\\.html5lib") "html5lib")) (delete-file-recursively "bleach/_vendor/html5lib"))))) (build-system pyproject-build-system) - (propagated-inputs (list python-html5lib python-tinycss2)) - (native-inputs (list python-pytest python-setuptools python-wheel)) + (native-inputs + (list python-pytest + python-setuptools)) + (propagated-inputs + (list python-html5lib + python-webencodings)) (home-page "https://github.com/mozilla/bleach") (synopsis "Whitelist-based HTML-sanitizing tool") (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") From 591e4b64d63cd2438103fe3e8e0b381779102196 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 12:00:32 +0100 Subject: [PATCH 081/133] gnu: python-fixtures: Update to 4.2.6. * gnu/packages/check.scm (python-fixtures): Update to 4.2.6. Don't inherit from python-fixtures-bootstrap as it's no longer required and migrate missing fields from it. [build-system]: Switch to pyproject-build-system. [arguments] : Use default 'check. [propagated-inputs]: Remove python-pbr, python-six, and python-extras. [native-inputs]: Remove python-mock; add python-hatch-vcs and python-hatchling. Change-Id: I46eb61748ee345cd5e51056070d2210f2d787bb8 --- gnu/packages/check.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 085119a6603..ca5b75b0961 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2341,25 +2341,25 @@ python-fixtures package instead.") (define-public python-fixtures (package - (inherit python-fixtures-bootstrap) (name "python-fixtures") - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "testtools.run" - "fixtures.test_suite"))))))) - (propagated-inputs - ;; Fixtures uses pbr at runtime to check versions, etc. - (list python-pbr python-six python-extras)) + (version "4.2.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fixtures" version)) + (sha256 + (base32 "02y92rnl2vyjcbc31mcpxkxjky6g9hjb2cxy5xkkl1j5n4ajniwm")))) + (build-system pyproject-build-system) (native-inputs - `(("python-mock" ,python-mock) - ("python-testtools" ,python-testtools-bootstrap))) + (list python-hatch-vcs + python-hatchling + python-testtools-bootstrap)) + (home-page "https://github.com/testing-cabal/fixtures") + (synopsis "Python test fixture library") (description "Fixtures provides a way to create reusable state, useful when writing -Python tests."))) +Python tests.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option (define-public python-testrepository-bootstrap (package From ab2af5dd7d077fb62440c4341ab8537ef2749288 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 12:26:25 +0100 Subject: [PATCH 082/133] gnu: python-testresources: Update to 2.0.2. * gnu/packages/check.scm (python-testresources): Update to 2.0.2. Don't inherit from python-testresources-bootstrap as it's no longer required and migrate missing fields from it. [build-system]: Switch to pyproject-build-system. [arguments] : Use custom. : Provide options to run tests with testtools. [native-inputs]: Add python-setuptools. [home-page]: Fix it, taken from PyPI Change-Id: I0e5dabcf2803c375f493d736c4b78f5c038023e8 --- gnu/packages/check.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ca5b75b0961..f330faee439 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2262,16 +2262,31 @@ testresources package instead.") (define-public python-testresources (package - (inherit python-testresources-bootstrap) (name "python-testresources") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testresources" version)) + (sha256 + (base32 "1v7a3mzi461v4cw4qil094j39wzn8hk10jkm9gi9ybmb01z3vgrc")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "-m" "testtools.run" "discover"))) + (native-inputs + (list python-fixtures + python-setuptools + python-testtools)) (propagated-inputs (list python-pbr)) - (arguments '()) - (native-inputs - (list python-fixtures python-testtools)) + (home-page "https://github.com/testing-cabal/testresources") + (synopsis "Pyunit extension for managing test resources") (description "Testresources is an extension to Python's unittest to allow declarative -use of resources by test cases."))) +use of resources by test cases.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option (define-public python-subunit-bootstrap (package From 8bb00217ac756b2fe69dd1a659d8ceeaac44f4b9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 12:32:41 +0100 Subject: [PATCH 083/133] gnu: Remove python-testresources-bootstrap. * gnu/packages/check.scm (python-testresources-bootstrap): Delete variable. Change-Id: I987d4700b057fdcea164fd3873254d4f2cf21f41 --- gnu/packages/check.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f330faee439..1a840f58da0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2236,30 +2236,6 @@ compatibility."))) "Testscenarios provides clean dependency injection for Python unittest style tests."))) -;; Testresources requires python-pbr at runtime, but pbr needs it for its -;; own tests. Hence this bootstrap variant. -(define-public python-testresources-bootstrap - (package - (name "python-testresources-bootstrap") - (version "2.0.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "testresources" version)) - (sha256 - (base32 - "05s4dsli9g17m1r3b1gvwicbbgq011hnpb2b9qnj27ja2n11k7gf")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) - (propagated-inputs - `(("python-pbr" ,python-pbr-minimal))) - (home-page "https://launchpad.net/testresources") - (synopsis - "Pyunit extension for managing test resources") - (description - "This package is only here for bootstrapping purposes. Use the regular -testresources package instead.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - (define-public python-testresources (package (name "python-testresources") From a5b7601d0666c9c716fff0383e51c34e4f581d0e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 12:38:07 +0100 Subject: [PATCH 084/133] gnu: python-testscenarios: Switch to pyproject. * gnu/packages/check.scm (python-testscenarios): Don't inherit from python-testscenarios-bootstrap as it's no longer required and migrate missing fields from it. [build-system]: Switch to pyproject-build-system. [native-inputs]: Add python-setuptools. Change-Id: I7bb79f69b806d45896f29c86210096c4fb5bffb7 --- gnu/packages/check.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1a840f58da0..d9e11982e81 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2226,15 +2226,34 @@ compatibility."))) "This package is only for bootstrapping. Don't use this.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +;; XXX: The project is not maintained since 2015, consider to remove when +;; nothing depends on it. (define-public python-testscenarios (package - (inherit python-testscenarios-bootstrap) (name "python-testscenarios") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testscenarios" version)) + (sha256 + (base32 "1dm2aydqpv76vnsk1pw7k8n42hq58cfi4n1ixy7nyzpaj1mwnmy2")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "-m" "testtools.run" "testscenarios.test_suite"))) + (native-inputs + (list python-setuptools)) (propagated-inputs - (list python-pbr python-testtools)) + (list python-pbr + python-testtools)) + (home-page "https://launchpad.net/testscenarios") + (synopsis "Pyunit extension for dependency injection") (description "Testscenarios provides clean dependency injection for Python unittest -style tests."))) +style tests.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option (define-public python-testresources (package From 7ada6962a5f0421e1778f62cc20bf9e42a85ad46 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 12:57:17 +0100 Subject: [PATCH 085/133] gnu: python-testscenarios-bootstrap: Simplify. * gnu/packages/check.scm (python-testscenarios-bootstrap): Inherit from python-testscenarios and make it hidden. Change-Id: Ic15bf00f629a3c45dd1aee1e5ea704c2f0bcb03d --- gnu/packages/check.scm | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d9e11982e81..8965a9e5c24 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2199,33 +2199,6 @@ see the output as well as any file modifications.") provide matchers, more debugging information, and cross-Python compatibility."))) -(define-public python-testscenarios-bootstrap - (package - (name "python-testscenarios-bootstrap") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "testscenarios" version)) - (sha256 - (base32 - "1dm2aydqpv76vnsk1pw7k8n42hq58cfi4n1ixy7nyzpaj1mwnmy2")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "python" "-m" "testtools.run" - "testscenarios.test_suite")))))) - (propagated-inputs - `(("python-pbr" ,python-pbr-minimal) - ("python-testtools" ,python-testtools-bootstrap))) - (home-page "https://launchpad.net/testscenarios") - (synopsis "Pyunit extension for dependency injection") - (description - "This package is only for bootstrapping. Don't use this.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - ;; XXX: The project is not maintained since 2015, consider to remove when ;; nothing depends on it. (define-public python-testscenarios @@ -2255,6 +2228,18 @@ compatibility."))) style tests.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python-testscenarios-bootstrap + (hidden-package + (package/inherit python-testscenarios + (arguments + ;; To break cycle with python-testtols and python-subunit. + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (propagated-inputs + (list python-pbr))))) + (define-public python-testresources (package (name "python-testresources") From 3dae45f8ccfc46ba41c228559717469f23d025f3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 14:11:19 +0100 Subject: [PATCH 086/133] gnu: python-testtools: Switch to pyproject. * gnu/packages/check.scm (python-testtools): Don't inherit from python-testtools-bootstrap as it's no longer required and migrate missing fields from it. [build-system]: Switch to pyproject-build-system. [arguments] : Use custom. : Provide options to run testtols. : Use default 'check; add 'pre-check. [propagated-inputs]: Remove python-pbr. [native-inputs]: Remove python-setuptools. [licenses]: Fix it according to pyproject.toml and PyPI. Change-Id: I7c9f5618d90b882141f1880ef7c29996d6a0364b --- gnu/packages/check.scm | 55 ++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8965a9e5c24..32f19f4f600 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2166,38 +2166,47 @@ see the output as well as any file modifications.") (define-public python-testtools (package - (inherit python-testtools-bootstrap) (name "python-testtools") + (version "2.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testtools" version)) + (sha256 + (base32 "18vy77n4ab2dvgx5ni6gfp2d0haxhh3yrkm6mih8n3zsy30vprav")))) + (build-system pyproject-build-system) (arguments (list + #:test-backend #~'custom + #:test-flags #~(list "-m" "testtools.run" "testtools.tests.test_suite") #:phases - '(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; There are six failing tests: - ;; "test_fast_keyboard_interrupt_stops_test_run" - ;; "test_keyboard_interrupt_stops_test_run" - ;; "test_fast_sigint_raises_no_result_error" - ;; "test_fast_sigint_raises_no_result_error_second_time" - ;; "test_sigint_raises_no_result_error" - ;; "test_sigint_raises_no_result_error_second_time" - (substitute* "testtools/tests/twistedsupport/__init__.py" - (("test_spinner,") "") - (("test_runtest,") "")) - (invoke "python" "-m" "testtools.run" - "testtools.tests.test_suite"))))))) - (propagated-inputs - (list python-fixtures python-pbr)) + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; There are six failing tests: + ;; "test_fast_keyboard_interrupt_stops_test_run" + ;; "test_keyboard_interrupt_stops_test_run" + ;; "test_fast_sigint_raises_no_result_error" + ;; "test_fast_sigint_raises_no_result_error_second_time" + ;; "test_sigint_raises_no_result_error" + ;; "test_sigint_raises_no_result_error_second_time" + (substitute* "testtools/tests/twistedsupport/__init__.py" + (("test_spinner,") "") + (("test_runtest,") ""))))))) (native-inputs - (list python-hatchling python-hatch-vcs - python-testscenarios-bootstrap + (list python-hatch-vcs + python-hatchling python-twisted - python-setuptools)) ;due to python-pbr + python-testscenarios-bootstrap)) + (propagated-inputs + (list python-fixtures)) + (home-page "https://github.com/testing-cabal/testtools") + (synopsis "Extensions to the Python standard library unit testing framework") (description "Testtools extends the Python standard library unit testing framework to provide matchers, more debugging information, and cross-Python -compatibility."))) +compatibility.") + (license license:expat))) ;; XXX: The project is not maintained since 2015, consider to remove when ;; nothing depends on it. From e41b527ac01432d4c2182c833eabd27d427f03f6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 14:23:06 +0100 Subject: [PATCH 087/133] gnu: python-testtools-bootstrap: Simplify. * gnu/packages/check.scm (python-testtools-bootstrap): Inherit from python-testtools and make it hidden. Change-Id: I2575ade5cd4292aff4a6028c9c092437c8a8b396 --- gnu/packages/check.scm | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 32f19f4f600..b0a44b2cbfc 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2139,31 +2139,6 @@ command-line applications. With it you can run a script in a subprocess and see the output as well as any file modifications.") (license license:expat))) -(define-public python-testtools-bootstrap - (package - (name "python-testtools-bootstrap") - (version "2.7.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "testtools" version)) - (sha256 - (base32 - "18vy77n4ab2dvgx5ni6gfp2d0haxhh3yrkm6mih8n3zsy30vprav")))) - (build-system pyproject-build-system) - (arguments (list #:tests? #f)) - (propagated-inputs - (list python-fixtures-bootstrap python-pbr-minimal)) - (native-inputs - (list python-hatchling python-hatch-vcs - python-setuptools)) ;due to python-pbr-minimal - (home-page "https://github.com/testing-cabal/testtools") - (synopsis - "Extensions to the Python standard library unit testing framework") - (description - "This package is only for bootstrapping. Do not use this.") - (license license:psfl))) - (define-public python-testtools (package (name "python-testtools") @@ -2208,6 +2183,14 @@ provide matchers, more debugging information, and cross-Python compatibility.") (license license:expat))) +(define-public python-testtools-bootstrap + (hidden-package + (package/inherit python-testtools + (arguments + ;; To break cycle with python-fixtures. + (list #:tests? #f)) + (propagated-inputs '())))) + ;; XXX: The project is not maintained since 2015, consider to remove when ;; nothing depends on it. (define-public python-testscenarios From 93de5d36ffa90675b939fbf1a131907ed0d86bc6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 14:37:45 +0100 Subject: [PATCH 088/133] gnu: python-testrepository: Update to 0.0.21. * gnu/packages/check.scm (python-testrepository): Update to 0.0.21. Don't inherit from python-testrepository as it's no longer required and migrate missing fields from it. [build-system]: Switch to pyproejct-build-system. [arguments] : All good now. : Use custom 'check. [propagated-inputs]: Remove python-testtools; add python-iso8601. [native-inputs]: Remove python-mimeparse; add python-hatch-vcs, python-hatchling, python-pytz, python-setuptools, python-testresources, and python-testscenarios. Change-Id: I460e73ceae61d61d0392621d0f5bd89b50238be8 --- gnu/packages/check.scm | 43 +++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b0a44b2cbfc..857817a8ae2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2375,18 +2375,43 @@ Python tests.") (define-public python-testrepository (package - (inherit python-testrepository-bootstrap) (name "python-testrepository") + (version "0.0.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testrepository" version)) + (sha256 + (base32 "1nd36zf1gz7rp5qqqvw15d8lwcdwcigs4m6ppn4cdcwhw3vzr2in")))) + (build-system pyproject-build-system) (arguments - ;; FIXME: Many tests are failing. - '(#:tests? #f)) - (propagated-inputs - (list python-fixtures python-subunit python-testtools)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (invoke "./testr" "init") + (invoke "./testr" "run"))))))) (native-inputs - (list python-mimeparse)) - (description "Testrepository provides a database of test results which can -be used as part of a developer's workflow to check things such as what tests -have failed since the last commit or what tests are currently failing."))) + (list python-hatch-vcs + python-hatchling + python-pytz + python-setuptools + python-testresources + python-testscenarios)) + (propagated-inputs + (list python-fixtures + python-iso8601 + python-subunit)) + (home-page "https://github.com/testing-cabal/testrepository") + (synopsis "Database for Python test results") + (description + "Testrepository provides a database of test results which can be used as +part of a developer's workflow to check things such as what tests have failed +since the last commit or what tests are currently failing.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option (define-public python-coverage (package From 00836376f57e6a0b4c2feb7ea33194ffe80d9821 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 14:40:12 +0100 Subject: [PATCH 089/133] gnu: Remove python-testrepository-bootstrap. * gnu/packages/check.scm (python-testrepository-bootstrap): Delete variable. Change-Id: I06cbc9c9bed43956c75f9fabfcdf979198f285b7 --- gnu/packages/check.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 857817a8ae2..cd088092917 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2348,31 +2348,6 @@ python-fixtures package instead.") Python tests.") (license (list license:bsd-3 license:asl2.0)))) ; at user's option -(define-public python-testrepository-bootstrap - (package - (name "python-testrepository-bootstrap") - (version "0.0.20") - (source - (origin - (method url-fetch) - (uri (pypi-uri "testrepository" version)) - (sha256 - (base32 - "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) - (propagated-inputs - `(("python-fixtures" ,python-fixtures-bootstrap) - ("python-subunit" ,python-subunit-bootstrap) - ("python-testtools" ,python-testtools-bootstrap))) - (native-inputs - (list python-mimeparse)) - (home-page "https://launchpad.net/testrepository") - (synopsis "Database for Python test results") - (description - "Bootstrap package for python-testrepository. Don't use this.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option - (define-public python-testrepository (package (name "python-testrepository") From 7d0647fb62924666c74339b95474d5c8e63486dd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:15:50 +0100 Subject: [PATCH 090/133] gnu: python-subunit: Update to 1.4.4. * gnu/packages/check.scm (python-subunit): Update to 1.4.4. Don't inherit from python-subunit as it's no longer required and migrate missing fields from it. [build-system]: Switch to pygobject-build-system. [arguments] : Use custom. : Provide options to run testtols. : Add 'disable-failing-tests, and 'disable-failing-console-scripts. [propagated-inputs]: Remove python-extras; add python-iso8601 and python-pygobject. [native-inputs]: Remove python-hypothesis; add python-setuptools. Change-Id: I394f8e3c3caf500cc875e8ba480bef108ad558aa --- gnu/packages/check.scm | 50 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cd088092917..e34b443b5cc 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2286,15 +2286,55 @@ python-subunit package instead.") (define-public python-subunit (package - (inherit python-subunit-bootstrap) (name "python-subunit") - (propagated-inputs - (list python-extras python-testtools)) + (version "1.4.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-subunit" version)) + (sha256 + (base32 "0d7arni5h98x7mpgpv90bzipf6p6q9djcdwj4m2ky7da64qkcy8h")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "-m" "testtools.run" "subunit.test_suite") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; There are two failing tests: + ;; subunit.tests.test_test_protocol.TestExecTestCase.test_args + ;; AssertionError: 1 != 0 + ;; + ;; subunit.tests.test_test_protocol.TestExecTestCase.test_run + ;; AssertionError: Lists differ: [('startTest', + ;; )] != [] + (substitute* "python/subunit/tests/test_test_protocol.py" + (("test_args") "_off_test_args") + (("test_run") "_off_test_run")))) + (add-after 'disable-failing-tests 'disable-failing-console-scripts + (lambda _ + (substitute* "setup.py" + ;; Requries not maintained python-junitxml. + (("'subunit2junitxml=.*subunit2junitxml:main',") "") + ;; To avoid Gtk in inputs. + (("'subunit-notify=.*subunit_notify:main',") "") + (("'subunit2gtk=.*subunit2gtk:main',") ""))))))) (native-inputs - (list python-fixtures python-hypothesis python-testscenarios)) + (list python-fixtures + python-setuptools + python-testscenarios)) + (propagated-inputs + (list python-iso8601 + python-pygobject + python-testtools)) + (home-page "https://github.com/testing-cabal/subunit") + (synopsis "Python implementation of the subunit protocol") (description "Python-subunit is a Python implementation of the subunit test streaming -protocol."))) +protocol.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option ;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its ;; own tests. Hence this bootstrap variant. From b98e90050b9ce98c94ddb5b883ba64841df2369b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 14:37:43 +0100 Subject: [PATCH 091/133] gnu: Remove python-subunit-bootstrap. * gnu/packages/check.scm (python-subunit-bootstrap): Delete variable. Change-Id: If88a19cc0360c8b8c51d2d2cf8a43d2612cacb6b --- gnu/packages/check.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e34b443b5cc..d3ce58ccffe 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2260,30 +2260,6 @@ style tests.") use of resources by test cases.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option -(define-public python-subunit-bootstrap - (package - (name "python-subunit-bootstrap") - (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "python-subunit" version)) - (sha256 - (base32 - "0j0ymmnc5nfxi1qzvy59j27viqca7l7xd0y9x29g7yr0h693j804")))) - (build-system python-build-system) - (propagated-inputs - (list python-extras python-testtools-bootstrap)) - (native-inputs - (list python-fixtures-bootstrap python-hypothesis - python-testscenarios-bootstrap)) - (home-page "https://launchpad.net/subunit") - (synopsis "Python implementation of the subunit protocol") - (description - "This package is here for bootstrapping purposes only. Use the regular -python-subunit package instead.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - (define-public python-subunit (package (name "python-subunit") From 63ce69afbfa21b4ceb639e96d64f5b7b63082c38 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:21:35 +0100 Subject: [PATCH 092/133] gnu: Remove python-fixtures-bootstrap. * gnu/packages/check.scm (python-fixtures-bootstrap): Delete variable. Change-Id: I3a3777206aabcac54f78b1e2565632abb19a6f62 --- gnu/packages/check.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d3ce58ccffe..2ecb331b9d7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2312,36 +2312,6 @@ use of resources by test cases.") protocol.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option -;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its -;; own tests. Hence this bootstrap variant. -(define-public python-fixtures-bootstrap - (package - (name "python-fixtures-bootstrap") - (version "3.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "fixtures" version)) - (sha256 - (base32 - "1vxj29bzz3rd4pcy51d05wng9q9dh4jq6wx92yklsm7i6h1ddw7w")) - (patches (search-patches "python-fixtures-remove-monkeypatch-test.patch")))) - (build-system python-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; Package is not loadable on its own at this stage. - (delete 'sanity-check)))) - (propagated-inputs - (list python-pbr-minimal python-six python-extras)) - (home-page "https://launchpad.net/python-fixtures") - (synopsis "Python test fixture library") - (description - "This package is only used for bootstrapping. Use the regular -python-fixtures package instead.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option - (define-public python-fixtures (package (name "python-fixtures") From 0c69faace3e828b982ce16822973bb6a561dbafd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:33:43 +0100 Subject: [PATCH 093/133] gnu: python-fastbencode: Update to 0.3.2. * gnu/packages/python-xyz.scm (python-fastbencode): Update to 0.3.2. [arguments] : Use 'unittest. [native-inputs]: Remove python-cython-3 and python-wheel; add python-cython. Change-Id: Ie945290b90ef43bf228b780ca2413397da4211a1 --- gnu/packages/python-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 29ecb619579..acad29bd687 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19160,7 +19160,7 @@ JSON Reference and JSON Pointer.") (define-public python-fastbencode (package (name "python-fastbencode") - (version "0.3.1") + (version "0.3.2") ;the last non Rust version (source (origin (method url-fetch) @@ -19169,9 +19169,15 @@ JSON Reference and JSON Pointer.") ;; Delete pre-generated Cython C files. (snippet '(for-each delete-file (find-files "." "\\.c$"))) (sha256 - (base32 "15x1in22gwam7wwga5lbj1pd8hc9jk741pia3pv1m29n2xywpq2z")))) + (base32 "1daal7xgsl2sjxq8pcilcas9wd9j9796wd4rlkhrvv5h0k2k4k53")))) (build-system pyproject-build-system) - (native-inputs (list python-cython-3 python-setuptools python-wheel)) + (arguments + (list + #:test-backend #~'unittest + #:test-flags #~(list "fastbencode.tests.test_suite"))) + (native-inputs + (list python-cython + python-setuptools)) (home-page "https://github.com/breezy-team/fastbencode") (synopsis "Python Bencode (de)serializer with optional fast C extensions") (description From fef1c41d085d384eea6cfaf79a7fa094ace19099 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:46:51 +0100 Subject: [PATCH 094/133] gnu: python-bandit: Update to 1.8.6. * gnu/packages/python-check.scm (python-bandit): Update to 1.8.6. [arguments] : Disable for now. [propagated-inputs]: Remove python-gitpython, python-jschema-to-python, and python-sarif-om. [native-inputs]: Remove python-beautifulsoup4, python-fixtures, python-stestr, python-testscenarios, python-testtools, and python-wheel. Change-Id: Ib333f89b750e02bcaa22f599f8b3d4ba9164e6b9 --- gnu/packages/python-check.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 7b6cff865d4..98e13286ebc 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -303,33 +303,21 @@ Avocado machine readable outputs this one is streamlined (per test results). (define-public python-bandit (package (name "python-bandit") - (version "1.8.3") + (version "1.8.6") (source (origin (method url-fetch) (uri (pypi-uri "bandit" version)) (sha256 - (base32 "0fhr0rsvh44ix31dwxjw8aj0wklj95368djwk0i98c2dcpmpp17m")))) + (base32 "0sz5lkg9anqz6ir157xr8ng9ymgj37ymbplkhl3w4qb9zhjrrznv")))) (build-system pyproject-build-system) (arguments - (list - #:test-flags - ;; XXX: Two tests fail. - #~(list "--exclude-regex" "test_no_arguments|test_help_arg"))) + (list #:tests? #f)) ;tests require complex setup and networking (native-inputs - (list python-beautifulsoup4 - python-fixtures - python-setuptools - python-stestr - python-testscenarios - python-testtools - python-wheel)) + (list python-setuptools)) (propagated-inputs - (list python-gitpython - python-jschema-to-python - python-pyyaml + (list python-pyyaml python-rich - python-sarif-om python-stevedore)) (home-page "https://github.com/PyCQA/bandit") (synopsis "Security oriented static analyser for python code") From a0d614165feb5eceaea21fdadda7853dfc071627 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:46:50 +0100 Subject: [PATCH 095/133] gnu: python-oslotest: Fix build. * gnu/packages/openstack.scm (python-oslotest)[arguments] : Add 'remove-sub-package. [native-inputs]: Remove python-coverage and python-wheel. Change-Id: Ibefd7e2bd7d60477931e38ba790fa01dfcae9403 --- gnu/packages/openstack.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 85a5a5ab205..9a1c26feb1a 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -911,15 +911,24 @@ documentation from the OpenStack project.") (sha256 (base32 "1vp85v81p2vx66j973hc7fa65shp0ilhaypyyny01jwcip94152s")))) (build-system pyproject-build-system) - (propagated-inputs - (list python-fixtures python-subunit python-testtools)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-sub-package + ;; error: Multiple top-level packages discovered in a flat-layout: + ;; ['oslotest', 'releasenotes']. + (lambda _ + (delete-file-recursively "releasenotes")))))) (native-inputs - (list python-coverage - python-debtcollector + (list python-debtcollector python-oslo-config python-stestr - python-setuptools - python-wheel)) + python-setuptools)) + (propagated-inputs + (list python-fixtures + python-subunit + python-testtools)) (home-page "https://launchpad.net/oslo") (synopsis "Oslo test framework") (description "The Oslo Test framework provides common fixtures, support From 2687ad784749066e01a94b2c73359e9206b02309 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:59:51 +0100 Subject: [PATCH 096/133] gnu: Add python-requests-futures. * gnu/packages/python-web.scm (python-requests-futures): New variable. Change-Id: Ibaa9299001567bcfe65247fd192bb64076f80dda --- gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4c4437cf7c0..b1f419360c8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2311,6 +2311,33 @@ responses as planin JSON/YAML file or save responses as plain JSON/YAML files.") (license license:bsd-2))) +(define-public python-requests-futures + (package + (name "python-requests-futures") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "requests_futures" version)) + (sha256 + (base32 "1njqfjmd72l5f32jvcppg2afrvb0cd8angdwmq7q0vik81wvazkb")))) + (build-system pyproject-build-system) + (native-inputs + (list python-greenlet + python-pytest + python-pytest-httpbin + python-readme-renderer + python-setuptools + python-twine + python-werkzeug)) + (propagated-inputs (list python-requests)) + (home-page "https://github.com/ross/requests-futures") + (synopsis "Asynchronous Python HTTP for Humans") + (description + "This package provides and add-on the Python Requests HTTP library to run +code asynchronously.") + (license license:asl2.0))) + (define-public python-s3path (package (name "python-s3path") From b4d40e0ecaf9f7b58e8ad29909fab81fa3dd5342 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 15:59:53 +0100 Subject: [PATCH 097/133] gnu: python-requests-mock: Update to 1.12.1. * gnu/packages/python-web.scm (python-requests-mock): Update to 1.12.1. [build-system]: Switch to pyproject-build-system. [propagated-inputs]: Remove python-six. [native-inputs]: Remove python-pbr, python-discover, python-docutils, python-fixtures, python-mock, python-sphinx, and python-testrepository; add python-requests-futures, python-setuptools, python-setuptools-scm, and python-testtools. Change-Id: I24229600b9bc6a91b771f69de06322c0f82a6339 --- gnu/packages/python-web.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b1f419360c8..16bd275b82b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5354,27 +5354,23 @@ library.") (define-public python-requests-mock (package (name "python-requests-mock") - (version "1.8.0") + (version "1.12.1") (source (origin (method url-fetch) (uri (pypi-uri "requests-mock" version)) (sha256 - (base32 - "09nj8fmyj7xz2mgwyvbw0fl9zybmx2d3qd2hf529vvjc9s24d3z6")))) - (build-system python-build-system) - (propagated-inputs - (list python-requests python-six)) + (base32 "008l6xysgs6ax56lairg1li5i4bb04i2z19w5bl5claj7crjxqg9")))) + (build-system pyproject-build-system) (native-inputs - (list python-pbr - python-discover - python-docutils - python-fixtures - python-mock - python-purl + (list python-purl python-pytest - python-sphinx - python-testrepository)) + python-requests-futures + python-setuptools + python-setuptools-scm + python-testtools)) + (propagated-inputs + (list python-requests)) (home-page "https://requests-mock.readthedocs.org/") (synopsis "Mock out responses from the requests package") (description From b6ab59c0484c3dc08fb5f3a9d441b85ae7a29527 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:04:48 +0100 Subject: [PATCH 098/133] gnu: python-widgetsnbextension: Update to 4.0.14. * gnu/packages/python-xyz.scm (python-widgetsnbextension): Update to 4.0.14. [arguments] : No tests. [native-inputs]: Remove python-wheel. Change-Id: Ic061b06c53bea26f05a5871cf50a88bcd1e6921a --- gnu/packages/python-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index acad29bd687..8b205c69554 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19595,19 +19595,19 @@ convert an @code{.ipynb} notebook file into various static formats including: (define-public python-widgetsnbextension (package (name "python-widgetsnbextension") - (version "4.0.10") + (version "4.0.14") (source (origin (method url-fetch) (uri (pypi-uri "widgetsnbextension" version)) (sha256 - (base32 - "13v88h3cvlf4cs70j568abr04w0bzckl56k9iqx1iadrydgnq6b4")))) + (base32 "1bxm6ys3kmxfhi8dns9q6xrjkxijfa606qpq5lhr7f7dwc29nqm3")))) (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI or git (native-inputs (list python-jupyter-packaging - python-setuptools - python-wheel)) + python-setuptools)) (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "This package provides interactive HTML widgets for Jupyter From cf01a0fc15c10b549749e29317460fc07782fc55 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:14:48 +0100 Subject: [PATCH 099/133] gnu: python-cfn-lint: Reduce closure size. * gnu/packages/python-web.scm (python-cfn-lint)[arguments] : Skip optional test. [propagated-inputs]: Remove python-jschema-to-python and python-sarif-om. Change-Id: I0eb5d4d852602773f73234c13b58541d03afaae9 --- gnu/packages/python-web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 16bd275b82b..548ff576b13 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2195,7 +2195,9 @@ decode and default on encode. (list "not test_build_graph" "test_good_template" "test_success_run" - "test_update_docs") + "test_update_docs" + ;; ImportError: Missing optional dependencies sarif + "test_sarif_formatter") " and not ")) #:phases #~(modify-phases %standard-phases @@ -2218,9 +2220,7 @@ decode and default on encode. python-sympy python-typing-extensions ;; [optional] - python-jschema-to-python - python-junit-xml - python-sarif-om)) + python-junit-xml)) (home-page "https://github.com/aws-cloudformation/cfn-lint") (synopsis "Validate CloudFormation templates") (description From 0b32d341a3d169c95306035d553c9ff5f582c8e8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:16:21 +0100 Subject: [PATCH 100/133] gnu: Remove python-sarif-om. Not maintained since 2021, fails to build no users in Guix. * gnu/packages/python-web.scm (python-sarif-om): Delete variable. Change-Id: I7730b1c7b979bf4c58fe6db9cf56c101a08ef1ae --- gnu/packages/python-web.scm | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 548ff576b13..898b122fa3c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2366,26 +2366,6 @@ code asynchronously.") AWS S3 Service using boto3 S3 resource as a driver.") (license license:asl2.0))) -(define-public python-sarif-om - (package - (name "python-sarif-om") - (version "1.0.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "sarif_om" version)) - (sha256 - (base32 - "167gb8xjm0310km3w1s12bqldbv7zyklkr4j5900vq4361ml2pyd")))) - (build-system python-build-system) - (propagated-inputs (list python-attrs)) - (native-inputs (list python-pbr)) - (home-page "https://github.com/microsoft/sarif-python-om") - (synopsis "Python implementation of the SARIF 2.1.0 object model") - (description "This module contains classes for the object model defined -by the @url{https://sarifweb.azurewebsites.net,Static Analysis Results -Interchange Format (SARIF)} file format.") - (license license:expat))) - (define-public python-falcon (package (name "python-falcon") From cb91671ae830dab64a979870a464ac52637d3af9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:17:57 +0100 Subject: [PATCH 101/133] gnu: Remove python-jschema-to-python. Not maintained since 2019, fails to build no users in Guix. * gnu/packages/python-web.scm (python-jschema-to-python): Delete variable. Change-Id: I73b10bece77b029dfa4c5deb6f749145b942e98b --- gnu/packages/python-web.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 898b122fa3c..e6e8959e7af 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2229,25 +2229,6 @@ the CloudFormation spec and additional checks. Includes checking valid values for resource properties and best practices.") (license license:expat))) -(define-public python-jschema-to-python - (package - (name "python-jschema-to-python") - (version "1.2.3") - (source (origin - (method url-fetch) - (uri (pypi-uri "jschema_to_python" version)) - (sha256 - (base32 - "14cvaiwm56g0v6p7zviikaa5i9ln3yqy910jmp60hirhbpz19zvn")))) - (build-system python-build-system) - (propagated-inputs (list python-attrs python-jsonpickle python-pbr)) - (native-inputs (list python-pytest)) - (home-page "https://github.com/microsoft/jschema-to-python") - (synopsis "Generate Python classes from a JSON schema") - (description "This package generates source code for Python classes from a -@url{http://jschema.org,JSchema} JSON schema.") - (license license:expat))) - (define-public python-requests-cache (package (name "python-requests-cache") From a090c5260d80d4eef17490788f98b64412f2b38e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:35:42 +0100 Subject: [PATCH 102/133] gnu: Remove python-traceback2. Upstream note: This repository was archived by the owner on Nov 25, 2023. It is now read-only. No users in Guix. * gnu/packages/python-xyz.scm (python-traceback2): Delete variable. Change-Id: I67c4575841bf9fbc775b0105de0c6a281620c175 --- gnu/packages/python-xyz.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b205c69554..6154114c698 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27751,34 +27751,6 @@ attempting to optimize internally, using a cache, the common case where many lines are read from a single file.") (license license:psfl))) -(define-public python-traceback2 - (package - (name "python-traceback2") - (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "traceback2" version)) - (sha256 - (base32 - "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05")))) - (build-system python-build-system) - (arguments - `(;; python-traceback2 and python-unittest2 depend on one another. - #:tests? #f)) - (native-inputs - `(("python-pbr" ,python-pbr-minimal))) - (propagated-inputs - (list python-linecache2 python-six)) - (home-page - "https://github.com/testing-cabal/traceback2") - (synopsis "Backports of the traceback module") - (description - "This module provides a standard interface to extract, format and print -stack traces of Python programs. It exactly mimics the behavior of the Python -interpreter when it prints a stack trace.") - (license license:psfl))) - (define-public python-tracerite (package (name "python-tracerite") From 91b95ff2cdae42c6a6f0f5647a0f5178c43cd498 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:37:34 +0100 Subject: [PATCH 103/133] gnu: Remove python-linecache2. Upstream note: This repository was archived by the owner on Nov 25, 2023. It is now read-only. No users in Guix. * gnu/packages/python-xyz.scm (python-linecache2): Delete variable. Change-Id: I12deda7a2359ceec86daa60c86dce9d2bfc9764e --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6154114c698..3d78a131d55 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27725,32 +27725,6 @@ distributions. It authenticates the user over HTTPS, allows them to pre-sign their files and supports any packaging format (including wheels).") (license license:asl2.0))) -(define-public python-linecache2 - (package - (name "python-linecache2") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "linecache2" version)) - (sha256 - (base32 - "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb")))) - (build-system python-build-system) - (arguments - `(;; The tests depend on unittest2, and our version is a bit too old. - #:tests? #f)) - (native-inputs - `(("python-pbr" ,python-pbr-minimal))) - (home-page - "https://github.com/testing-cabal/linecache2") - (synopsis "Backports of the linecache module") - (description - "The linecache module allows one to get any line from any file, while -attempting to optimize internally, using a cache, the common case where many -lines are read from a single file.") - (license license:psfl))) - (define-public python-tracerite (package (name "python-tracerite") From 9e799d1f29f8ec2d4054b6b954375b1a119756f2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:51:18 +0100 Subject: [PATCH 104/133] gnu: python-url-normalize: Update to 2.2.1. * gnu/packages/python-web.scm (python-url-normalize): Update to 2.2.1. [propagated-inputs]: Add python-idna. [native-inputs]: Remove python-poetry-core and python-pytest-flakes; add python-setuptools. Change-Id: I444015c75241c6284ee190c19b8135191226abda --- gnu/packages/python-web.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e6e8959e7af..1aed9e587bf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3453,32 +3453,27 @@ high-speed transfers via libcurl and frequently outperforms alternatives.") (define-public python-url-normalize (package (name "python-url-normalize") - (version "1.4.3") + (version "2.2.1") (source (origin (method git-fetch) ; no tests in PyPI release (uri (git-reference - (url "https://github.com/niksite/url-normalize") - (commit version))) + (url "https://github.com/niksite/url-normalize") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq")))) + (base32 "1yhsf4sk6l6nznpnqigisbfz690a4g342dsk2n6dggh7q4l3amk4")))) (build-system pyproject-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'use-poetry-core - (lambda _ - ;; Patch to use the core poetry API. - (substitute* "pyproject.toml" - (("poetry.masonry.api") "poetry.core.masonry.api"))))))) + #:test-flags #~(list "--ignore=tests/test_cli.py"))) (native-inputs - (list python-poetry-core - python-pytest - python-pytest-flakes + (list python-pytest python-pytest-cov - python-pytest-socket)) + python-pytest-socket + python-setuptools)) + (propagated-inputs + (list python-idna)) (home-page "https://github.com/niksite/url-normalize") (synopsis "URL normalization for Python") (description From ffb37681c62caca2c06212c4efa33afc6c11ca24 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 13:29:17 +0100 Subject: [PATCH 105/133] gnu: python-blosc2: Switch to pyproejct, fix build. * gnu/packages/python-compression.scm (python-blosc2)[build-system]: Switch to pyproejct-build-system. [arguments] : Provide option to run tests agains installed libarary. : Use default 'build and 'check; add 'configure. [native-inputs]: Add python-setuptools. Change-Id: I62025cad68dd83a9b6f1dddea34840be38112f09 --- gnu/packages/python-compression.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index f78324df34f..1ae26432705 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -118,17 +118,16 @@ This Python package wraps the Blosc library.") (uri (pypi-uri "blosc2" version)) (sha256 (base32 "1s4gpdf1hfbw5w3hpx0g8bfwjrws1b8wgmh7snafh5ivai0lvnrl")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (invoke "python" "setup.py" "build" - "-DUSE_SYSTEM_BLOSC2=ON"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-vv"))))))) + (list + #:test-flags + #~(list "--pyargs" "blosc2") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure + (lambda _ + (setenv "USE_SYSTEM_BLOSC2" "ON")))))) (inputs (list c-blosc2)) (propagated-inputs (list python-msgpack @@ -141,7 +140,8 @@ This Python package wraps the Blosc library.") pkg-config python-cython-3 python-pytest - python-scikit-build)) + python-scikit-build + python-setuptools)) (home-page "https://github.com/blosc/python-blosc2") (synopsis "Python wrapper for the Blosc2 data compressor library") (description From 7905a6bc7e53441b4e9db45dcc4065b99f497209 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 13:35:07 +0100 Subject: [PATCH 106/133] gnu: Remove python-extras. 1.0.0 was released in 2016 as helper for python-testtols, python-fixtures and python-subunit. Now it's no longer required. There are no users in Guix. * gnu/packages/python-xyz.scm (python-extras): Delete variable. Change-Id: Id328d826052ac5a27cc4e7c0a6042f0a5df2bd14 --- gnu/packages/python-xyz.scm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3d78a131d55..6b76b4f39a8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6798,27 +6798,6 @@ developed by the Astropy project but is intended to be general and usable by any Python package.") (license license:bsd-3))) -(define-public python-extras - (package - (name "python-extras") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "extras" version)) - (sha256 - (base32 - "0khvm08rcwm62wc47j8niyl6h13f8w51c8669ifivjdr23g3cbhk")))) - (build-system python-build-system) - (arguments - ;; FIXME: Circular dependency on testtools. - '(#:tests? #f)) - (home-page "https://github.com/testing-cabal/extras") - (synopsis "Useful extensions to the Python standard library") - (description - "Extras is a set of extensions to the Python standard library.") - (license license:expat))) - (define-public python-types-colorama (package (name "python-types-colorama") From 9112d080c36cc12b3938fbc82e3ba0c8b69c4c10 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 14:06:07 +0100 Subject: [PATCH 107/133] gnu: python-readability-lxml: Update to 0.8.4.1. * gnu/packages/python-xyz.scm (python-readability-lxml): Update to 0.8.4.1. [source] : Remove as no longer required. : Version format has been changed. [native-inputs]: Remove python-timeout-decorator, python-setuptools, and python-wheel; add python-poetry-core. Change-Id: I7b29efede45bd8dfdd41ee0145ba30cba452f0ec --- gnu/packages/python-xyz.scm | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6b76b4f39a8..7e7789c628d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -35476,29 +35476,29 @@ number of words, syllables, and sentences.") (license license:asl2.0))) (define-public python-readability-lxml + ;; No releases since 2020, see: + ;; . (package (name "python-readability-lxml") - (version "0.8.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/buriy/python-readability") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13nfy2v0pbbf62jn9qwgi489gg97hbb22q6w3f78mnvjxd2m19rh")) - (snippet - #~(begin (delete-file "readability/compat/two.py"))))) + (version "0.8.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/buriy/python-readability") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dr567k03ljhwx9pacmynrv47w5vgq9fkgncpm0vlvmby2g0xgdl")))) (build-system pyproject-build-system) - (propagated-inputs (list python-chardet - python-cssselect - python-lxml - python-lxml-html-clean)) - (native-inputs (list python-timeout-decorator - python-setuptools - python-pytest - python-wheel)) + (native-inputs + (list python-poetry-core + python-pytest)) + (propagated-inputs + (list python-chardet + python-cssselect + python-lxml + python-lxml-html-clean)) ;XXX: it sould be part of python-lxml lib (home-page "http://github.com/buriy/python-readability") (synopsis "HTML to text parser") (description From 6bd5b41ac65a075f2f7c1827abd85256bfc279dd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 14:18:29 +0100 Subject: [PATCH 108/133] gnu: python-timeout-decorator: Disable tests. * gnu/packages/python-xyz.scm (python-timeout-decorator)[arguments] : Skip them for now. Change-Id: I93bbc79be6345a4a0408f58dfbd944b9a48dddce --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e7789c628d..73c64f398ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17336,6 +17336,8 @@ blocks or callables with two context managers and two decorators.") (license license:expat))) (define-public python-timeout-decorator + ;; TODO: Remove when python-requests-caches releses a fresh version dropping + ;; it, see, . (package (name "python-timeout-decorator") (version "0.5.0") @@ -17346,6 +17348,7 @@ blocks or callables with two context managers and two decorators.") (sha256 (base32 "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva")))) (build-system pyproject-build-system) + (arguments (list #:tests? #f)) (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/pnpnpn/timeout-decorator") (synopsis "Timeout decorator") From cbccba69f944ac9a4b2b684e4cdb77b2f72a8dc9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Sep 2025 16:51:19 +0100 Subject: [PATCH 109/133] gnu: python-pytest-check-links: Update to 0.10.1. * gnu/packages/python-xyz.scm (python-pytest-check-links): Update to 0.10.1. [build-system]: Switch to pyproject-build-system. [arguments] : The most tests fail. [propagated-inputs]: Remove python-pytest and python-six; add python-requests. [native-inputs]: Remove python-pbr-minimal; add python-hatchling. [home-page]: Fix redirection, it's maintained by Jupyter Lab project. Change-Id: Iebbe30534a4f1033fc59988056b745a7315963cc --- gnu/packages/python-xyz.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 73c64f398ea..a8166e6213c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32851,26 +32851,25 @@ evolved from its precursor @code{overtest}.") (define-public python-pytest-check-links (package (name "python-pytest-check-links") - (version "0.3.0") + (version "0.10.1") (source (origin (method url-fetch) - ;; URI uses underscores (uri (pypi-uri "pytest_check_links" version)) (sha256 - (base32 - "12x3wmrdzm6wgk0vz02hb769h68nr49q47w5q1pj95pc89hsa34v")))) - (build-system python-build-system) + (base32 "0vbp9nis2iwjz1rjc623bm2908y34xd7zj4yfk43giz6r29dsn3k")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;XXX: 12 failed, 4 passed, 2 skipped + (native-inputs + (list python-hatchling)) (propagated-inputs (list python-docutils python-html5lib python-nbconvert python-nbformat - python-pytest - python-six)) - (native-inputs - (list python-pbr-minimal)) - (home-page "https://github.com/minrk/pytest-check-links") + python-requests)) + (home-page "https://github.com/jupyterlab/pytest-check-links") (synopsis "Check links in files") (description "This package provides a pytest plugin that checks URLs for HTML-containing files.") From 30bc3c041fe4c864a78e226ca1551d592f752a86 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:12:28 +0100 Subject: [PATCH 110/133] gnu: r128gain: Disable tests. * gnu/packages/audio.scm (r128gain)[arguments] : Skip for now. [native-inputs]: Remove python-wheel. Change-Id: I4f637fe97247363cdf8f457312766e86f5239312 --- gnu/packages/audio.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0048409c0ac..0d07311d5de 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5732,6 +5732,8 @@ loudness of audio and video files to the same level.") (license license:gpl2+))) (define-public r128gain + ;; XXX: Upstream notice: This project was archived by the owner on Aug 17, + ;; 2023. It is now read-only. (package (name "r128gain") (version "1.0.7") @@ -5747,6 +5749,7 @@ loudness of audio and video files to the same level.") (build-system pyproject-build-system) (arguments (list + #:tests? #f ;require a complex set up, see <.github/workflows/ci.yml>. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'hardcode-ffmpeg @@ -5760,8 +5763,7 @@ loudness of audio and video files to the same level.") python-tqdm ffmpeg)) (native-inputs (list python-future python-requests - python-setuptools - python-wheel)) + python-setuptools)) (home-page "https://github.com/desbma/r128gain") (synopsis "Fast audio loudness scanner & tagger") (description From e319764cba5a99eeaed478702f1a1c200506abe9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:12:37 +0100 Subject: [PATCH 111/133] gnu: python-gseapy: Fix build. * gnu/packages/bioinformatics.scm (python-gseapy)[native-inputs]: Remove python-wheel; add python-setuptools. Change-Id: I2ff133cb081d06a6fbda88e50745bb9fc25ede0c --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7136271fa64..1757332cb94 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -25689,7 +25689,7 @@ exclude = (inputs (cons python-wrapper (cargo-inputs 'python-gseapy))) (native-inputs - (list python-pytest python-wheel)) + (list python-pytest python-setuptools)) (propagated-inputs (list python-numpy python-scipy From d4f3820ddb6c035832a234fde977be3ea31c11c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:12:37 +0100 Subject: [PATCH 112/133] gnu: python-moto: Update to 5.1.5. * gnu/packages/python-xyz.scm (python-moto): Update to 5.1.5. [arguments] : Run tests in parallel. Skip 10 more tests. [propagated-inputs]: Add python-pyparsing. [native-inputs]: Add python-pytest-xdist. Change-Id: I5054e141f870640f898a0722389e95f42d5a951d --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8166e6213c..c89aee7ff2e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20616,17 +20616,19 @@ text.") (define-public python-moto (package (name "python-moto") - (version "5.0.25") + (version "5.1.5") (source (origin (method url-fetch) (uri (pypi-uri "moto" version)) (sha256 - (base32 "1cp61k745dxyzck543lamh8mnwwxazsgzqascg4nanpcihaqpsny")))) + (base32 "0kpqdn96gw9h2bq05bp943q85f4lq89c4nk1gf71w60nkbm65cs2")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 10000 passed, 16 skipped, 2 xfailed, 42 warnings #:test-flags '(list "-m" "not network and not requires_docker" + "--numprocesses" (number->string (min 8 (parallel-job-count))) ;; This needs pycognito. "--ignore-glob=tests/test_cognitoidp/*" ;; This needs Internet access. @@ -20658,7 +20660,28 @@ text.") " and not test_with_custom_request_header" " and not test_dependencies" " and not test_cancel_running_job" - " and not test_container_overrides")) + " and not test_container_overrides" + + ;; TypeError: Got unexpected keyword argument + ;; 'account_id_endpoint_mode' + " and not test_dynamodb_with_account_id_routing" + + ;; botocore.exceptions.ParamValidationError: Parameter + ;; validation failed + " and not test_create_firewall" + " and not test_describe_logging_configuration" + " and not test_update_logging_configuration" + " and not test_list_firewalls" + ;; AttributeError: 'TimestreamInfluxDB' object has no attribute + ;; 'list_db_clusters' + + " and not test_create_db_cluster" + " and not test_get_db_cluster" + " and not test_list_db_clusters" + + ;; XXX: misc + " and not test_list_objects_v2_checksum_algo" + " and not test_upload_file_with_checksum_algorithm")) #:phases '(modify-phases %standard-phases (add-after 'unpack 'compatibility @@ -20680,6 +20703,7 @@ text.") python-flask-cors python-freezegun python-pytest + python-pytest-xdist python-setuptools python-wheel)) (inputs @@ -20699,6 +20723,7 @@ text.") python-multipart python-openapi-spec-validator python-py-partiql-parser + python-pyparsing python-requests python-responses python-werkzeug From d5d9b4d010e339a81434fcbb0e5109cc6905a58b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:51:46 +0100 Subject: [PATCH 113/133] gnu: Add python-pbs-installer. * gnu/packages/python-xyz.scm (python-pbs-installer): New variable. Change-Id: I38940d7f1a86c2afdf83c590a2b42624e31c88c1 --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c89aee7ff2e..6294a73d704 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1177,6 +1177,42 @@ of Ordered Set.") your terminal.") (license license:expat))) +(define-public python-pbs-installer + (package + (name "python-pbs-installer") + (version "2025.09.18") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frostming/pbs-installer") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f5gpr4xp71d46vk2ggbb31bhagj4drf1ijl1lg1jd1apimr0jkf")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ;no tests provided + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-version + (lambda _ + (setenv "PDM_BUILD_SCM_VERSION" #$version)))))) + (native-inputs + (list python-pdm-backend + python-pytest)) + (propagated-inputs + (list python-httpx + python-zstandard)) + (home-page "https://github.com/frostming/pbs-installer") + (synopsis "Installer for Python Build Standalone") + (description + "This package implements an installer for +@url{https://github.com/astral-sh/python-build-standalone, Python Build +Standalone}.") + (license license:expat))) + (define-public python-puccinialin (package (name "python-puccinialin") From 555595b9aa32b2ec22962b241143aa54cf753c56 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:51:54 +0100 Subject: [PATCH 114/133] gnu: Add python-findpython. * gnu/packages/python-xyz.scm (python-findpython): New variable. Change-Id: Ibec3d6e2307508e7cf6ed2f73db7e003e4f719e0 --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6294a73d704..480748d933d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -838,6 +838,30 @@ built-in @code{int} and @code{float} that are on par or faster with the Python equivalents.") (license license:expat))) +(define-public python-findpython + (package + (name "python-findpython") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "findpython" version)) + (sha256 + (base32 "1p3kqr00sym0yaddsbaw1gf7nslfnscnd050q6ipj9rmfry68ccb")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pdm-backend + python-pytest)) + (propagated-inputs + (list python-packaging + python-platformdirs)) + (home-page "https://github.com/frostming/findpython") + (synopsis "Find Python versions the system") + (description + "This package provides a utility to find Python versions on the current +system.") + (license license:expat))) + (define-public python-flake8-class-newline (package (name "python-flake8-class-newline") From ffa791a395c6056246b96b296479512e5b655129 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:51:56 +0100 Subject: [PATCH 115/133] gnu: poetry: Update to 2.1.3. * gnu/packages/python-xyz.scm (poetry): Update to 2.1.3. [arguments] : Ignore a few more test files. [propagated-inputs]: Add python-findpython and python-pbs-installer. Change-Id: I9c4b33ad7a9e7ea6a93358ecc5fde592581bec9d --- gnu/packages/python-xyz.scm | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 480748d933d..b66db1b2797 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23571,19 +23571,47 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "1.8.4") + (version "2.1.3") (source (origin (method url-fetch) (uri (pypi-uri "poetry" version)) (sha256 - (base32 "00ljr5r9h93wh68h4m242qw58mdai8gji4g0c3bfqznicvdgi42l")))) + (base32 "1505snny5sgz9zf0wx1zqw6kqly3pi9lbsl8dnbpb55ij1kvvjgj")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 1295 passed, 9 skipped #:test-flags - #~(list "--ignore=tests/installation/test_executor.py" + ;; Network access is required. + #~(list "--ignore=tests/console/commands/test_add.py" + "--ignore=tests/console/commands/test_search.py" + "--ignore=tests/console/commands/test_show.py" "--ignore=tests/installation/test_chef.py" + "--ignore=tests/installation/test_chooser.py" + "--ignore=tests/installation/test_executor.py" + "--ignore=tests/installation/test_installer.py" + "--ignore=tests/packages/test_direct_origin.py" + "--ignore=tests/publishing/test_uploader.py" + "--ignore=tests/puzzle/test_solver.py" + "--ignore=tests/repositories/test_legacy_repository.py" + "--ignore=tests/repositories/test_pypi_repository.py" + "--ignore=tests/repositories/test_repository_pool.py" + "--ignore=tests/utils/test_authenticator.py" + "--ignore=tests/utils/test_dependency_specification.py" + "--ignore=tests/utils/test_helpers.py" + ;; XXX: Various incompatibility faileurs. + "--ignore=tests/console/commands/env/test_activate.py" + "--ignore=tests/console/commands/python/test_python_list.py" + "--ignore=tests/console/commands/test_publish.py" + "--ignore=tests/console/test_application_command_not_found.py" + "--ignore=tests/inspection/test_info.py" + "--ignore=tests/inspection/test_lazy_wheel.py" + "--ignore=tests/puzzle/test_provider.py" + "--ignore=tests/utils/env/python/test_manager.py" + "--ignore=tests/utils/env/test_env.py" + "--ignore=tests/utils/test_isolated_build.py" + "--ignore=tests/vcs/git/test_backend.py" "-k" (string-join (list "not test_builder_setup_generation_runs_with_pip_editable" "test_check_invalid" @@ -23618,10 +23646,12 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") python-dulwich python-entrypoints python-fastjsonschema + python-findpython python-importlib-metadata python-installer python-keyring python-packaging + python-pbs-installer python-pexpect python-pip python-pkginfo From f9dd2ad0397b2da723ecc9d74cd946aa553470d3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 15:57:37 +0100 Subject: [PATCH 116/133] gnu: python-s3fs: Update to 2025.7.0. * gnu/packages/python-web.scm (python-s3fs): Update to 2025.7.0. [native-inputs]: Remove python-flask, python-flask-cors, python-moto, python-pytest, python-pytest-asyncio, and python-wheel. Change-Id: I8c7c74a952fb71259e8b20b8ef4153d4a276214c --- gnu/packages/python-web.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1aed9e587bf..d9f7c7e2087 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6480,26 +6480,23 @@ Betamax that may possibly end up in the main package.") (define-public python-s3fs (package (name "python-s3fs") - (version "2024.12.0") + (version "2025.7.0") (source (origin (method url-fetch) (uri (pypi-uri "s3fs" version)) (sha256 - (base32 "0mpxk4xvg0gwzapdh9r3fvnjhi8ymf96f7c756xabk26b67kl3qv")))) + (base32 "0b82wqf70q1srsjb7xbbjhlzm08lbghzm1pbwdam2x6prb09wzsy")))) (build-system pyproject-build-system) - ;; Many tests fail with "No such file or directory" raised by the HTTP - ;; client. + ;; TODO: Many tests fail with "No such file or directory" raised by the + ;; HTTP client. (arguments (list #:tests? #false)) - (propagated-inputs (list python-aiobotocore python-aiohttp python-fsspec)) (native-inputs - (list python-flask ;for moto - python-flask-cors - python-moto - python-pytest - python-pytest-asyncio - python-setuptools - python-wheel)) + (list python-setuptools)) + (propagated-inputs + (list python-aiobotocore + python-aiohttp + python-fsspec)) (home-page "https://github.com/fsspec/s3fs/") (synopsis "Convenient filesystem interface over S3") (description "This package provides a convenient filesystem interface over From afd99efce2e84f14be053d026a8c8e770e92dfa6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 18 Sep 2025 14:26:31 +0100 Subject: [PATCH 117/133] gnu: python-astropy: Skip one more test. * gnu/packages/astronomy.scm (python-astropy)[arguments] : Skip one more test. Change-Id: I45a6e22463883759f9113ce286f8264b53e37d60 --- gnu/packages/astronomy.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b4f0e0e12a9..fd6bf302305 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2685,8 +2685,12 @@ constraints (i.e., altitude, airmass, moon separation/illumination, etc.) #~(list "--pyargs" "astropy" ;; XXX: Tests are not thread save when they are more than 8. "--numprocesses" (number->string (min 8 (parallel-job-count))) - ;; Fails with assert 13 == 1. - "-k" "not test_skip_meta") + "-k" (string-append + ;; Fails with assert 13 == 1. + "not test_skip_meta" + ;; Failed: DID NOT WARN. No warnings of type (,) were emitted. + " and not test_ephemeris_local_file_not_ephemeris")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'preparations From 940141cf061bee27b65f7cb1c6728c1f5cba5f13 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 15:11:52 +0200 Subject: [PATCH 118/133] gnu: python-mercantile: Switch to pyproject. * gnu/packages/python-xyz.scm (python-mercantile): [source]: Switch to git-fetch. [build-system]: Switch to pyproject-build-system. [native-inputs]: Add python-setuptools. [description]: Improve style. Change-Id: Id6c1a3750489947935ac32c6826969a5a83f00d8 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b66db1b2797..add0ae44ead 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31534,19 +31534,23 @@ supports Image, Video, GeoJSON and TopoJSON overlays.") (version "1.2.1") (source (origin - (method url-fetch) - (uri (pypi-uri "mercantile" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/mercantile") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0sxmndhzzrvss5irsgzfrk51k6jihwcb7661992mizdgbnqnsg7s")))) - (build-system python-build-system) + (base32 "1b7kglzkjz1gmgjgk2y3n4gg70b8zdfg6kyqx2g7a3z7clxxf80f")))) + (build-system pyproject-build-system) (propagated-inputs (list python-click)) - (native-inputs - (list python-check-manifest python-hypothesis python-pytest)) + (native-inputs (list python-check-manifest python-hypothesis python-pytest + python-setuptools)) (home-page "https://github.com/mapbox/mercantile") (synopsis "Web mercator XYZ tile utilities") - (description "The mercantile module provides @code{ul(xtile, ytile, zoom)} -and @code{bounds(xtile, ytile, zoom)} functions that respectively return the -upper left corner and bounding longitudes and latitudes for XYZ tiles, a + (description + "The mercantile module provides @code{ul(xtile, ytile, zoom)} and +@code{bounds(xtile, ytile, zoom)} functions that respectively return the upper +left corner and bounding longitudes and latitudes for XYZ tiles, a @code{xy(lng, lat)} function that returns spherical mercator x and y coordinates, a @code{tile(lng, lat, zoom)} function that returns the tile containing a given point, and quadkey conversion functions From 585e9a1ce02046dc7a090fd93ba0966b33b3e0b8 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 16:16:16 +0200 Subject: [PATCH 119/133] gnu: python-ephem: Fix 'check phase. * gnu/packages/astronomy.scm (python-ephem)[arguments] <#:test-flags>: Ignore failing test. <#:phases>: Add phase 'remove-installed-tests. [native-inputs]: Add python-pytest, remove python-wheel. Change-Id: I128d996ac19b413cc0680c759a21493ed722d86e Signed-off-by: Sharlatan Hellseher --- gnu/packages/astronomy.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index fd6bf302305..88878d19160 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -4035,10 +4035,23 @@ older EsoReflex environment.") (sha256 (base32 "0rb0vc3kgmw5rzhfhxffg94bcwasm46sf814hv7l13ry8m7xckrw")))) (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "--deselect=ephem/tests/test_jpl.py::JPLTest::runTest") + #:phases + #~(modify-phases %standard-phases + ;; XXX: See https://codeberg.org/guix/guix/issues/2108 + (add-after 'install 'remove-installed-tests + (lambda* (#:key inputs outputs #:allow-other-keys) + (delete-file-recursively ".") + (mkdir-p "ephem") + (let* ((site (site-packages inputs outputs)) + (tests (string-append site "/ephem/tests"))) + (copy-recursively tests "ephem/tests") + (delete-file-recursively tests))))))) (native-inputs - (list python-setuptools - python-wheel - tzdata)) + (list python-pytest python-setuptools tzdata)) (home-page "https://rhodesmill.org/pyephem/") (synopsis "Compute positions of the planets and stars") (description From dcb1ac7e9e21a6250dfe03b94cd0f428a71f8356 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 16:56:53 +0200 Subject: [PATCH 120/133] gnu: python-pytest-forked: Add python-py propagated-input. * gnu/packages/check.scm (python-pytest-forked)[propagated-inputs]: Add python-py. Change-Id: I9ff007703c4099016eedc276af195e8612fb20fd Signed-off-by: Sharlatan Hellseher --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2ecb331b9d7..fd42cb9258c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2108,6 +2108,7 @@ timeout has been exceeded.") ;; to fail (see: https://github.com/pytest-dev/pytest-forked/issues/54). (list python-pytest-bootstrap python-setuptools python-setuptools-scm python-wheel)) + (propagated-inputs (list python-py)) (home-page "https://github.com/pytest-dev/pytest-forked") (synopsis "Pytest plugin to run tests in isolated forked subprocesses") (description "This package provides a Pytest plugin which enables running From 4ea99c8354fb9ab470e3bfd2e25ac70a0bfadd77 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 17:07:25 +0200 Subject: [PATCH 121/133] gnu: python-signedjson: Update to 1.1.4. * gnu/packages/python-xyz.scm (python-signedjson): Update to 1.1.4. [source]: Switch to git-fetch. [build-system]: Switch to pyproject-build-system. [arguments]<#:phases>: Add phase 'set-version. [native-inputs]: Add python-pytest, python-setuptools. Change-Id: I9e1c804a0f7a3634a4ce487d581799935b6e7f10 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index add0ae44ead..9551d9ed2ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33169,19 +33169,32 @@ information for your operating system.") (define-public python-signedjson (package (name "python-signedjson") - (version "1.1.1") + (version "1.1.4") (source (origin - (method url-fetch) - (uri (pypi-uri "signedjson" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/matrix-org/python-signedjson") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m")))) - (build-system python-build-system) + (base32 "1wkgbwr0hdvafbhbqjibca06rxqbp95gg6rfd3ba6rkgl4g85i5z")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (propagated-inputs - (list python-canonicaljson python-importlib-metadata python-pynacl - python-typing-extensions python-unpaddedbase64)) + (list python-canonicaljson + python-importlib-metadata + python-pynacl + python-typing-extensions + python-unpaddedbase64)) (native-inputs - (list python-setuptools-scm)) + (list python-pytest python-setuptools-scm python-setuptools)) (home-page "https://github.com/matrix-org/python-signedjson") (synopsis "Sign JSON objects with ED25519 signatures") (description From 2be32095a8e752dc39d6fc5b3c3e4c62beb34275 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 17:20:21 +0200 Subject: [PATCH 122/133] gnu: python-publicsuffixlist: Set unittest test backend. * gnu/packages/python-web.scm (python-publicsuffixlist)[arguments] <#:test-backend>: Set it. [native-inputs]: Remove python-wheel. Change-Id: I213887319fbae770dccf391327ac8a16bc01a1b4 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d9f7c7e2087..9ba97b3b21f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2048,9 +2048,8 @@ emit information from within their applications to the AWS X-Ray service.") (sha256 (base32 "0llam7g7sv08lcfgy18iph8br8ldjmy2qbjaykc9pd3z4iisb0yd")))) (build-system pyproject-build-system) - (native-inputs - (list python-setuptools - python-wheel)) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/ko-zu/psl") (synopsis "Public suffix list for Python") (description From 0f7eb28b67b729017081ef38c17e80c2d44b7a96 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 17:25:48 +0200 Subject: [PATCH 123/133] gnu: python-isal: Set unittest test-backend. * gnu/packages/python-compression.scm (python-isal) [source]: Improve style, use G-expressions. [arguments]<#:test-backend>: Set it. <#:phases>: Improve style. Change-Id: I8d05af8720f6fcd31aae0b83a70efc8dfd6e4e9f Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-compression.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 1ae26432705..b5db28d6eb2 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -467,13 +467,16 @@ compression algorithm.") ;; Remove bundled isa-l source code (modules '((guix build utils))) (snippet - '(delete-file-recursively "src/isal/isa-l")))) + #~(delete-file-recursively "src/isal/isa-l")))) (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-dynamic-linking - (lambda _ (setenv "PYTHON_ISAL_LINK_DYNAMIC" "1")))))) + (list + #:test-backend #~'unittest + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-dynamic-linking + (lambda _ + (setenv "PYTHON_ISAL_LINK_DYNAMIC" "1")))))) (inputs (list isa-l)) (native-inputs (list python-cython python-setuptools python-wheel)) (home-page "https://github.com/pycompression/python-isal") From 05fe5e2924d6394ea1e5cf7cbcd6399502f0c288 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 17:43:49 +0200 Subject: [PATCH 124/133] gnu: python-zeroconf: Ignore failing tests. * gnu/packages/python-xyz.scm (python-zeroconf) [arguments]<#:test-flags>: Ignore additional failing test. [native-inputs]: Add python-pytest-asyncio. Remove python-wheel. Change-Id: Iac76a731e91d1287c47f4af9b769d78bca22c9ab Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9551d9ed2ce..e78687d01b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31350,7 +31350,7 @@ library in Python.") (version "0.38.1") (source (origin - (method git-fetch) ; no tests in PyPI release + (method git-fetch) (uri (git-reference (url "https://github.com/jstasiak/python-zeroconf") (commit version))) @@ -31361,14 +31361,20 @@ library in Python.") (arguments (list #:test-flags - #~(list "-k" (string-append - ;; Networking isn't available for these tests. - "not test_integration_with_listener_ipv6" - " and not test_launch_and_close_v4_v6" - " and not test_launch_and_close_context_manager" - " and not test_launch_and_close" - " and not test_close_multiple_times")))) - (native-inputs (list python-pytest python-setuptools python-wheel)) + #~(list + "-k" (string-append + ;; XXX: Despite asyncio, this test fails. + "not test_run_coro_with_timeout and not " + ;; XXX: Networking isn't available. + (string-join + (list "test_integration_with_listener_ipv6" + "test_launch_and_close_v4_v6" + "test_launch_and_close_context_manager" + "test_launch_and_close" + "test_close_multiple_times") + " and not "))))) + (native-inputs + (list python-pytest python-pytest-asyncio python-setuptools)) (propagated-inputs (list python-ifaddr)) (home-page "https://github.com/jstasiak/python-zeroconf") From 8ac80a83e2d713c47ce8a6fe3a9b0b0ea52e5517 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 17:52:46 +0200 Subject: [PATCH 125/133] gnu: python-pyannotate: Fix tests. * gnu/packages/python-check.scm (python-pyannotate) [source]: Switch to git-fetch. [arguments]<#:test-backend>: Set it. [native-inputs]: Remove python-wheel. [propagated-inputs, description]: Improve style. Change-Id: I4f310eba2117b062aedc2fad4a96537604dd8bd6 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-check.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 98e13286ebc..1fe0697e63e 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1570,19 +1570,21 @@ flake8 to check PEP-8 naming conventions.") (version "1.2.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pyannotate" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dropbox/pyannotate") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "16bm0mf7wxvy0lgmcs1p8n1ji8pnvj1jvj8zk3am70dkp825iv84")))) + (base32 "0gmhl4ldan0p774dhrs9a7bmjjphlsy3hhfqq84gak15rdjs59ga")))) (build-system pyproject-build-system) - (native-inputs - (list python-setuptools python-wheel)) - (propagated-inputs - (list python-mypy-extensions python-six)) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) + (propagated-inputs (list python-mypy-extensions python-six)) (home-page "https://github.com/dropbox/pyannotate") (synopsis "Auto-generate PEP-484 annotations") - (description "This package, PyAnnotate, is used to auto-generate PEP-484 -annotations.") + (description + "This package, PyAnnotate, is used to auto-generate PEP-484 annotations.") (license license:asl2.0))) (define-public python-pycotap From 0d703d3822da852df08e22df6507059bcb7ead45 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 18:11:40 +0200 Subject: [PATCH 126/133] gnu: python-pygithub: Update to 2.8.1. * gnu/packages/python-xyz.scm (python-pygithub): Update to 2.8.1. [arguments]<#:phases>: Remove 'check phase replacement, add phase 'set-version. [propagated-inputs]: Add python-typing-extensions, python-urllib3. Remove python-cryptography. [native-inputs]: Add python-responses, python-setuptools, python-setuptools-scm. Change-Id: I047f053d24b46d4697904101697de0a52a4ba5c9 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e78687d01b7..e77a9657461 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9203,10 +9203,8 @@ to deprecate classes, functions or methods.") (define-public python-pygithub (package (name "python-pygithub") - (version "1.55") + (version "2.8.1") (source - ;; We fetch from the Git repo because there are no tests in the PyPI - ;; archive. (origin (method git-fetch) (uri (git-reference @@ -9214,21 +9212,26 @@ to deprecate classes, functions or methods.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "082bxffpy4h97dsay3l75cpgfjj10kywkvicnm6xscwvah285q9y")))) - (build-system python-build-system) + (base32 "0c5qp69qfkfcp8lfmfh0a2rcb1azsrlrc525qd8blnkrmz2mmayz")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest")) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (propagated-inputs - (list python-cryptography python-deprecated python-pyjwt - python-pynacl python-requests)) + (list python-pyjwt + python-pynacl + python-requests + python-typing-extensions + python-urllib3)) (native-inputs - (list nss-certs-for-test python-httpretty python-pytest)) + (list python-responses + python-pytest + python-setuptools + python-setuptools-scm)) (home-page "https://pygithub.readthedocs.io/en/latest/") (synopsis "Python library for the GitHub API") (description "This library allows managing GitHub resources such as From 17e29589b4ae0916f31f6ca55c99c1265a287b3b Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 18:17:26 +0200 Subject: [PATCH 127/133] gnu: python-merge3: Run tests and fix them. * gnu/packages/python-xyz.scm (python-merge3) [source]: Switch to git-fetch. [arguments]<#:test-backend>: Set it. [native-inputs]: Remove python-wheel. Change-Id: I57dc757b036cee4baba12c0021a5ddb5aab65a26 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e77a9657461..263d78171b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11161,16 +11161,19 @@ humans, and implementation simplicity.") (version "0.0.15") (source (origin - (method url-fetch) - (uri (pypi-uri "merge3" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/breezy-team/merge3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1brb97v24i5ym3cfxsv416a0m1n78s1aqllmwg4xymjdv09w5snk")))) + (base32 "0p52fdzra86d03p5gwz7wmb2pgzkv0frgdhhg9wfld8qr0611wp4")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools python-wheel)) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/breezy-team/merge3") (synopsis "Python implementation of 3-way merge") - (description - "This Python library implements 3-way merge for text.") + (description "This Python library implements 3-way merge for text.") (license license:gpl2+))) (define-public python-wmctrl From f5be9b99f75ac57de9dea900b2e66622e6e59a62 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 20 Sep 2025 18:22:00 +0200 Subject: [PATCH 128/133] gnu: python-setuptools-gettext: Run tests and fix them. * gnu/packages/python-xyz.scm (python-setuptools-gettext) [source]: Switch to git-fetch. [native-inputs]: Add python-pytest, remove python-wheel. Change-Id: I969a8d6f6e41df7e1f6729a9b4e9a9d5ec782303 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 263d78171b7..52791802386 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28023,14 +28023,15 @@ Rust Python extensions implemented with @code{PyO3} or @code{rust-cpython}.") (version "0.1.14") (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools_gettext" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/breezy-team/setuptools-gettext") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0b0d74cwa9lk32cajzpxxg9nwm5hch17xc6bzg6i4iqsygprkw23")))) + (base32 "1m6a3qjwvqbvlzwqap7050rqsxb7nwibl38iklnqz8363iclm76k")))) (build-system pyproject-build-system) - (native-inputs (list python-tomli - python-setuptools - python-wheel)) + (native-inputs (list python-pytest python-tomli python-setuptools)) (home-page "https://github.com/breezy-team/setuptools-gettext") (synopsis "Setuptools plugin for gettext") (description "This package provides a plugin for Setuptools for gettext.") From 7456dd305be4e585440623e8f24eb7ad104479d7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 20:52:35 +0100 Subject: [PATCH 129/133] gnu: python-xxhash: Update to 3.5.0. * gnu/packages/digest.scm (python-xxhash): Update to 3.5.0. [arguments] : Use 'unittest. : Add 'build-extensions. [native-inputs]: Remove python-setuptools-scm and python-wheel. Change-Id: I7f4f5e3f06886318ec11ad3064aba381b7b1245f --- gnu/packages/digest.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 8e91a9532ae..d1cdb058aae 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -106,20 +106,24 @@ platforms (both big and little endian).") (define-public python-xxhash (package (name "python-xxhash") - (version "3.1.0") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "xxhash" version)) (sha256 - (base32 - "1hdxcscry59gh0znlm71ya23mm9rfmvz8lvvlplzxzf63pib28dc")))) + (base32 "0pxlc37x0rrw3vl8yhf638wqcpfg9jfsh8ifvkwcpjaiz7fwmwl4")))) (build-system pyproject-build-system) - ;; Needed to embed the correct version string + (arguments + (list + #:test-backend #~'unittest + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs - (list python-setuptools-scm - python-setuptools - python-wheel)) + (list python-setuptools)) (home-page "https://github.com/ifduyue/python-xxhash") (synopsis "Python binding for xxHash") (description "This package provides Python bindings for the xxHash hash From d9df39b0e1e5304a1c879603cec8e536080d8d55 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 21:02:09 +0100 Subject: [PATCH 130/133] gnu: Add python-marshmallow-3. * gnu/packages/python-xyz.scm (python-marshmallow-3): New variable. Change-Id: I60c15b286a75f3255403da6603e2965290d5d68a --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 52791802386..3e415de515b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27412,6 +27412,26 @@ input.") to and from native Python datatypes.") (license license:expat))) +(define-public python-marshmallow-3 + (package + (inherit python-marshmallow) + (version "3.22.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "marshmallow" version)) + (sha256 + (base32 "0gl2qmq5sqf1b3f84zd7yzkznaknr6j5lnbxcfw0n8ja20lzawj9")))) + (arguments '()) + (native-inputs + (list python-pytest + python-pytz + python-simplejson + python-flit-core)) + (propagated-inputs + (list python-packaging)))) + + ;; XXX: Deprecated upstream: This repository has been archived by the owner on ;; Jun 6, 2024. It is now read-only. ;; Consider to remove when nothing is depend on it. From 7ced7ebdf8bc28355c33b55111487ab77e3e001c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 21:02:10 +0100 Subject: [PATCH 131/133] gnu: python-platypush: Use python-marshmallow-3. * gnu/packages/engineering.scm (python-platypush)[propagated-inputs]: Remove python-marshmallow; add python-marshmallow-3. Change-Id: I1f0aae882c222abcac05f28c3efefab36d3217c8 --- gnu/packages/engineering.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6b44955b94b..98974799832 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2081,7 +2081,9 @@ bindings for Python, Java, OCaml and more.") python-croniter python-docutils python-flask - python-marshmallow + ;; v4 is supported in upcomming release, see + ;; . + python-marshmallow-3 python-pillow python-pygments python-pyotp From 98d27e7c4ef30cf4bdcaae5d69e6441b171bd4cb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 21:06:58 +0100 Subject: [PATCH 132/133] gnu: python-dateutils: Skip tests. * gnu/packages/time.scm (python-dateutils)[arguments] : They require twine. [native-inputs]: Remove python-wheel. Change-Id: I136b5cbfb1cf8ea74b2bd217810781c75c514300 --- gnu/packages/time.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 2258cf13afc..c1ad2ba86fb 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -387,6 +387,8 @@ datetime module, available in Python 2.3+.") (license (list bsd-3 asl2.0)))) (define-public python-dateutils + ;; XXX: The last release was in 2021, no development on the master + ;; branch. consider to remove when nothing depends on it. (package (name "python-dateutils") (version "0.6.12") @@ -397,8 +399,9 @@ datetime module, available in Python 2.3+.") (base32 "1wg3f3imjq3snvjccv64h5498pqv9xz664xhni7bsh8mnay91p83")))) (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;requires twine (propagated-inputs (list python-dateutil python-pytz)) - (native-inputs (list python-setuptools python-wheel)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/jmcantrell/python-dateutils") (synopsis "Various utilities for working with date and datetime objects") (description From f3b5a5ead71d3a8eda89e52973867977fd8ec9b5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 20 Sep 2025 21:13:22 +0100 Subject: [PATCH 133/133] gnu: python-mdx-gh-links: Update to 0.4. * gnu/packages/python-xyz.scm (python-mdx-gh-links): Update to 0.4. [build-system]: Switch to pyproject-build-system. [native-inputs]: Add python-setuptools. Change-Id: I98370aabb14c2465f0fed4399d57e87b3f7b0f69 --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3e415de515b..a6ea862239f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3187,15 +3187,16 @@ ports.") (define-public python-mdx-gh-links (package (name "python-mdx-gh-links") - (version "0.2") + (version "0.4") (source (origin (method url-fetch) (uri (pypi-uri "mdx_gh_links" version)) (sha256 - (base32 "167k1jbp3jifxbnlpi6wy0z1skam7gqv2sixb5bhggb2vypqvysr")))) - (build-system python-build-system) + (base32 "11inr9azx6c174yfikysbw0mx7mpjm03qdqr1am2a510mg1amma1")))) + (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;tests connect github + (native-inputs (list python-setuptools)) (propagated-inputs (list python-markdown)) (home-page "https://github.com/Python-Markdown/github-links/") (synopsis "Python-Markdown extension adding support for shorthand links")