diff options
| -rw-r--r-- | gnu/packages/astronomy.scm | 32 | ||||
| -rw-r--r-- | gnu/packages/calendar.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/machine-learning.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-build.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/statistics.scm | 2 |
6 files changed, 23 insertions, 39 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c6db5607da..de73ce0288 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 @@ -3095,7 +3095,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 @@ -3403,7 +3403,7 @@ Spectrograph}.") python-pytest python-pytest-astropy python-pytest-doctestplus - python-setuptools-next + python-setuptools python-setuptools-scm python-stsynphot python-wheel)) @@ -7181,7 +7181,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 @@ -7221,7 +7221,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 @@ -7289,7 +7289,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 @@ -7663,7 +7663,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/") @@ -7697,7 +7697,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 @@ -7770,7 +7770,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 @@ -7937,7 +7937,7 @@ and the use of a modern programming language, techniques, and libraries (list python-pytest python-pytest-doctestplus python-semantic-version - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8059,7 +8059,7 @@ channels python-pytest-doctestplus python-pytest-env python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -8106,7 +8106,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 @@ -8730,7 +8730,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)) @@ -8838,7 +8838,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 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/machine-learning.scm b/gnu/packages/machine-learning.scm index 9c2cd75be2..660815cc41 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2522,7 +2522,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 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 8c9d9be6bf..7992823d8f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5335,7 +5335,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") @@ -12970,7 +12970,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)) @@ -40087,7 +40087,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 1ad4593400..e3b95337b2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1286,7 +1286,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") |