guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit b541a9e00119f30228c02dbf8d4e6585b56452b8
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Fri Jul 11 22:11:32 2025 +0100
gnu: python-setuptools-next: Set to python-setuptools.
* gnu/packages/python-build.scm (python-setuptools-next): Set to
python-setuptools.
* gnu/packages/astronomy.scm: (python-asdf, python-asdf-astropy,
python-asdf-bootstrap, python-asdf-coordinates-schemas,
python-asdf-standard, python-asdf-transform-schemas,
python-asdf-transform-schemas-bootstrap, python-asdf-wcs-schemas,
python-ci-watson, python-crds, python-rad, python-roman-datamodels,
python-stdatamodels, python-stpipe, python-stpsf, python-stsci-image,
python-sunraster, python-tweakwcs): Replace PYTHON-SETUPTOOLS-NEXT with
PYTHON-SETUPTOOLS variable.
* gnu/packages/calendar.scm (khal): Likewise.
* gnu/packages/machine-learning.scm (python-cma): Likewise.
* gnu/packages/python-xyz.scm (python-bitstruct, python-av,
python-icegrams): Likewise.
* gnu/packages/statistics.scm (python-mapie): Likewise.
Change-Id: I9e5e0881310d160ec56be785f2dd2140364fa8e5
---
gnu/packages/astronomy.scm | 36 ++++++++++++++++++------------------
gnu/packages/calendar.scm | 2 +-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/python-build.scm | 18 +-----------------
gnu/packages/python-xyz.scm | 6 +++---
gnu/packages/statistics.scm | 2 +-
6 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 2fd2c248bf..20b6b1101c 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1764,7 +1764,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
@@ -1822,7 +1822,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
@@ -1848,7 +1848,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
@@ -2985,7 +2985,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
@@ -3233,7 +3233,7 @@ Spectrograph}.")
python-pytest
python-pytest-astropy
python-pytest-doctestplus
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-stsynphot
python-wheel))
@@ -6548,7 +6548,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
@@ -6588,7 +6588,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
@@ -6626,7 +6626,7 @@ implementing calibration pipeline software.")
;; <https://github.com/spacetelescope/stpsf/issues/76>.
#:tests? #f))
(native-inputs
- (list python-setuptools-next
+ (list python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -7050,7 +7050,7 @@ library with bug fixtures.")
python-pypa-build
python-pytest
python-packaging
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(home-page "https://asdf-standard.readthedocs.io/";)
@@ -7084,7 +7084,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
@@ -7105,7 +7105,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 '()))))
@@ -7128,7 +7128,7 @@ implementation package such as asdf-astropy.")
(native-inputs
(list python-pytest
python-pytest-xdist
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -7201,7 +7201,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
@@ -7368,7 +7368,7 @@ and the use of a modern programming language, techniques,
and libraries
python-pytest
python-pytest-doctestplus
python-semantic-version
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -7490,7 +7490,7 @@ channels
python-pytest-doctestplus
python-pytest-env
python-pytest-xdist
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -7537,7 +7537,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
@@ -8161,7 +8161,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
python-wheel))
@@ -8248,7 +8248,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/calendar.scm b/gnu/packages/calendar.scm
index faf7779ce7..5f42cd4271 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -240,7 +240,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/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 2131ea28f7..d56a5cf931 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -2493,7 +2493,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")
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index ee714c3aee..992cac0c1b 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -355,23 +355,7 @@ facilitate packaging Python projects, where packaging
includes:
license:asl2.0 ;packaging is dual ASL2/BSD-2
license:bsd-2))))
-(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-xyz.scm b/gnu/packages/python-xyz.scm
index fc74300790..50aa8b59dd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5037,7 +5037,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")
@@ -12712,7 +12712,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))
@@ -40155,7 +40155,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/statistics.scm b/gnu/packages/statistics.scm
index 3a13f71530..d5d6acc132 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1181,7 +1181,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";)
