guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit c0192d89842c861ac3930a3d1be67727d377241e
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Fri Jul 11 22:19:45 2025 +0100
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 bcd14b764e..17832accfd 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
@@ -2659,7 +2659,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))
@@ -2813,7 +2813,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
@@ -3029,7 +3029,7 @@ Herschel.")
python-pytest
python-pytest-cov
python-setuptools
- python-setuptools-scm-next
+ python-setuptools-scm
python-wheel))
(propagated-inputs
(list python-astropy
@@ -3300,7 +3300,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
@@ -3712,7 +3712,7 @@ Cesium.")
python-pytest-remotedata
python-pytest-xdist
python-setuptools
- python-setuptools-scm-next))
+ python-setuptools-scm))
(propagated-inputs
(list python-aiohttp
python-asdf
@@ -3813,7 +3813,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
@@ -3867,7 +3867,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
@@ -4242,7 +4242,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
@@ -4300,7 +4300,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
@@ -4426,7 +4426,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
@@ -5388,7 +5388,7 @@ on:
python-pytest-doctestplus
python-pytest-mpl
python-setuptools
- python-setuptools-scm-next
+ python-setuptools-scm
python-wheel))
(propagated-inputs
(list python-astropy
@@ -5486,7 +5486,7 @@ Carlo.")
python-pytest-xdist
python-scipy
python-setuptools
- python-setuptools-scm-next
+ python-setuptools-scm
python-sunpy-minimal
python-wheel))
(propagated-inputs
@@ -6553,7 +6553,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))
@@ -6577,7 +6577,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
@@ -7043,7 +7043,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
@@ -7730,7 +7730,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
@@ -7770,7 +7770,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
@@ -8347,7 +8347,7 @@ pipelines.")
(native-inputs
(list python-pytest
python-setuptools
- python-setuptools-scm-next
+ python-setuptools-scm
python-wheel))
(propagated-inputs
(list python-numpy
@@ -8406,7 +8406,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
@@ -8481,7 +8481,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
@@ -8589,7 +8589,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
@@ -8637,7 +8637,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
@@ -8682,7 +8682,7 @@ Telescope, HST}).")
python-pytest-xdist
python-reproject
python-setuptools
- python-setuptools-scm-next
+ python-setuptools-scm
python-streamtracer
python-sympy))
(propagated-inputs
@@ -8738,7 +8738,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
@@ -8818,7 +8818,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
@@ -8864,7 +8864,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
@@ -8928,7 +8928,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
@@ -8973,7 +8973,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
@@ -9080,7 +9080,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 b8dd4579a5..1a781d360e 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 f6ef6f0e33..0243b87cb6 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 7762c05e3f..7bd33bb2c4 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 549c4e7f5c..b8b5832d05 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2659,7 +2659,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 2c0dd96a0a..35be236ec2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -40216,7 +40216,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 0a6120d6c0..a767a7949c 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.
