From b69d11de9bbf04025c1ed2981de004a99e4d788f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 11 Jul 2025 22:11:32 +0100 Subject: [PATCH] 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 1f62644a971..c6084514e03 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/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")