guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit 2a3df3a410a69ae7b5bb781af35b075312923674
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Fri Jul 11 22:11:32 2025 +0100
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 | 54 +++++++++++++++++++--------------------
gnu/packages/audio.scm | 2 +-
gnu/packages/calendar.scm | 2 +-
gnu/packages/code.scm | 2 +-
gnu/packages/django.scm | 4 +--
gnu/packages/game-development.scm | 2 +-
gnu/packages/machine-learning.scm | 6 ++---
gnu/packages/messaging.scm | 4 +--
gnu/packages/parallel.scm | 4 +--
gnu/packages/python-build.scm | 18 +------------
gnu/packages/python-xyz.scm | 18 ++++++-------
gnu/packages/shells.scm | 2 +-
gnu/packages/statistics.scm | 6 ++---
gnu/packages/video.scm | 2 +-
gnu/packages/xdisorg.scm | 2 +-
15 files changed, 56 insertions(+), 72 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 4b12526faf..6026901484 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1830,7 +1830,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
@@ -1888,7 +1888,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
@@ -1914,7 +1914,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
@@ -1949,7 +1949,7 @@ Astropy objects.")
(native-inputs
(list python-numpy
python-pytest
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -1986,7 +1986,7 @@ support for reading and writing various compression
algorithms including:
(native-inputs
(list python-asdf-bootstrap
python-pytest
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -2007,7 +2007,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 '()))))
@@ -2030,7 +2030,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
@@ -2898,7 +2898,7 @@ Origins Spectrograph}.")
(native-inputs
(list gfortran
python-packaging
- python-setuptools-next
+ python-setuptools
python-wheel
which)) ; for fortran/Makefile
(propagated-inputs
@@ -3129,7 +3129,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
@@ -3437,7 +3437,7 @@ Spectrograph}.")
python-pytest
python-pytest-astropy
python-pytest-doctestplus
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-stsynphot
python-wheel))
@@ -3592,7 +3592,7 @@ 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
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -4262,7 +4262,7 @@ specifically pulsar timing array signals.")
(list python-pytest
python-pytest-astropy
python-pyyaml
- python-setuptools-next
+ python-setuptools
python-setuptools-scm-next
python-wheel))
(propagated-inputs
@@ -4694,7 +4694,7 @@ milliarcsecond).")
python-pytest-cov
python-pytest-doctestplus
python-requests-mock
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -6191,7 +6191,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
python-wheel))
@@ -6731,7 +6731,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
@@ -7435,7 +7435,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
@@ -7486,7 +7486,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
@@ -7526,7 +7526,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
@@ -7557,7 +7557,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
@@ -7594,7 +7594,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
@@ -7818,7 +7818,7 @@ spectra, and data.")
python-pypa-build
python-pytest
python-packaging
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(home-page "https://asdf-standard.readthedocs.io/";)
@@ -7852,7 +7852,7 @@ up-front for extensibility.")
(native-inputs
(list python-pytest
python-pytest-xdist
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -7933,7 +7933,7 @@ implementation package such as asdf-astropy.")
(list python-pytest
python-pytest-doctestplus
python-semantic-version
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -8055,7 +8055,7 @@ channels
python-pytest-doctestplus
python-pytest-env
python-pytest-xdist
- python-setuptools-next
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs
@@ -8102,7 +8102,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
@@ -8726,7 +8726,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))
@@ -8834,7 +8834,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 44b640d61f..77aa57209e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3732,7 +3732,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 da8b558c6f..98d999718a 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -247,7 +247,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 7d081e3e3f..f591debbc4 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -1200,7 +1200,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 305b3b6348..a7fd9a820d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -326,7 +326,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";)
@@ -1025,7 +1025,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/game-development.scm
b/gnu/packages/game-development.scm
index 45b2504bcf..3771b6d267 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1606,7 +1606,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 ce247ae7f0..4a5208f4f8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -244,7 +244,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
@@ -1922,7 +1922,7 @@ with a single function call.")
python-pytest
python-pytorch
python-sentencepiece
- python-setuptools-next))
+ python-setuptools))
(propagated-inputs
(list python-coloredlogs
python-flatbuffers
@@ -2619,7 +2619,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/messaging.scm b/gnu/packages/messaging.scm
index 299ee0d55c..fcb7c7b18b 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 73b1065449..d8ccc20c3a 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -521,7 +521,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
@@ -560,7 +560,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 b6743ba5f9..f9a96644cd 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -347,23 +347,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-xyz.scm b/gnu/packages/python-xyz.scm
index c6d84a4115..87a91cac77 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5384,7 +5384,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")
@@ -12999,7 +12999,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))
@@ -30357,7 +30357,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
@@ -32197,7 +32197,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")
@@ -36622,7 +36622,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
@@ -36744,7 +36744,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
@@ -36774,7 +36774,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
@@ -36818,7 +36818,7 @@ cons cells in Python.")
" and not "))))
(native-inputs
(list python-pytest
- python-setuptools-next))
+ python-setuptools))
(propagated-inputs
(list python-cons
python-etuples
@@ -40152,7 +40152,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 267b573642..64e53fc6e5 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 2f5736c76e..60e6a8d321 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
@@ -1348,7 +1348,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";)
@@ -1403,7 +1403,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/video.scm b/gnu/packages/video.scm
index 0a45bd4bca..04e56b54bf 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6590,7 +6590,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 15844683fc..5699882ae3 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2878,7 +2878,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";)
