[PATCH 00/32] python-team: Remove native inputs

  • Open
  • quality assurance status badge
Details
One participant
  • Nicolas Graves
Owner
unassigned
Submitted by
Nicolas Graves
Severity
normal
Blocked by
N
N
Nicolas Graves wrote on 10 May 09:26 +0200
(address . guix-patches@gnu.org)(address . ngraves@ngraves.fr)
20240510074844.2703-1-ngraves@ngraves.fr
This is a full rewrite of patch series 70735 which I couldn't fully
submit because debbugs doesn't seem to like when more than 100 patches
are sent in 2h. It is therefore much more concise.
Here's an adapted copy of the original cover-letter message:

How did I proceed ?

1) Identify packages we often don't need as native-inputs.
2) Systematically remove these packages when they are in native-inputs.
3) Iterate : try to rebuild needed packages, and fixes along the way (these can be updates, packages
rewrites, inputs additions...). Said fixes have been sent in patch series 70855. Back up from the native-input removal when it's not trivial, except for some specific cases (these are present as their own patches).
4) Stop when everything rebuilds properly, except for some specific cases.

The packages that need rebuilding are identified from :
guix graph --type=reverse-package -M 1 python-codecov python-coverage python-black python-isort
python-pycodestyle python-pep8 python-pyflakes python-flake8 python-pylint python-mypy
python-coveralls python-twine python-pytest-isort python-pytest-flake8 python-pytest-cov
python-pytest-black python-pytest-pep8 python-pytest-mypy pre-commit | grep label | cut -d\" -f4 |
cut -d@ -f1 | sort | uniq

Some are removed from this list where the package was propagated rather than native, or when the
package is left unchanged (e.g. open-adventure), or for those specific cases :
- "chirp" ; needs to rebuild webkitgtk, no thanks
- "cpplint" ; has been updated on master + requires pytest-runner==5.6
- "python-modin" ; this is broken by pandas upgrade, will fix this independently
- "python-libcst" ; broken upstream but unchanged
- "python-schema-salad" ; broken upstream but unchanged
- "python-dolfin-adjoint" ; timeout, but probably works.
- "reprotest" ; needs to rebuild the whole openjdk, no thanks.

This patch series is built upon python-team's branch, with Vinicius' patch series 69980 and my patch
series 70855 on top.

Now, what about results in package node graph reduction?

Here's a summary of number of packages under guix refresh -l :

| package | master | python-team+patch series |
|----------------------+--------+--------------------------|
| python-codecov | 6 | 1 |
| python-coverage | 2359 | 497 |
| python-black | 332 | 37 |
| python-isort | 275 | 153 |
| python-pycodestyle | 392 | 184 |
| python-pep8 | 219 | 215 |
| python-pyflakes | 392 | 190 |
| python-flake8 | 377 | 158 |
| python-pylint | 235 | 8 |
| python-mypy | 347 | 310 |
| python-coveralls | 23 | 1 |
| python-twine | 28 | 137 |
| python-pytest-isort | 180 | 145 |
| python-pytest-flake8 | 303 | 8 |
| python-pytest-cov | 2309 | 286 |
| python-pytest-black | 278 | 7 |
| python-pytest-pep8 | 31 | 31 |
| python-pytest-mypy | 280 | 307 |
| pre-commit | 128 | 1 |
| python-tox | 166 | 5 |

This means e.g. that an update of python-pylint will trigger 8 packages rebuilds rather than 235.


Nicolas Graves (32):
guix: import: pypi: Ignore pypi-ignored-inputs.
build-system/pyproject: Ignore unwanted pytest flags.
build-system/pyproject: Remove python-black input.
build-system/pyproject: Remove python-pylint native-input.
build-system/pyproject: Remove python-flake8 inputs.
build-system/pyproject: Remove python-coverage input.
gnu: python-cram: Remove python-coverage native-input.
gnu: u-boot-tools: Remove python-coverage native-input.
gnu: python-aiosqlite: Remove python-coverage native-input.
gnu: python-openid: Remove python-coverage native-input.
build-system/pyproject: Remove python-coveralls native-input.
build-system/pyproject: Remove python-pycodestyle native-input.
gnu: python-versioneer: Remove python-pycodestyle native-input.
gnu: python-versioneer: Remove python-pyflakes native-input.
gnu: python-re-assert: Remove python-covdefaults native-input.
build-system/pyproject: Remove python-codecov native-input.
build-system/pyproject: Remove python-tox native-input.
build-system/pyproject: Remove python-mypy native-input.
gnu: python-immutables: Remove python-mypy native-input.
build-system/pyproject: Remove python-isort native-input.
build-system/pyproject: Remove python-twine native-input.
build-system/pyproject: Remove python-pytest-cov native-input.
gnu: python-tinycss2: Remove python-pytest-cov native-input.
gnu: python-django-contact-form: Remove python-pytest-cov
native-input.
gnu: python-dateutil: Remove python-pytest-cov native-input.
build-system/pyproject: Remove python-pytest-isort native-input.
build-system/pyproject: Remove python-pytest-black native-input.
build-system/pyproject: Remove python-pytest-flake8 native-input.
build-system/pyproject: Remove python-pytest-mypy inputs.
build-system/pyproject: Stop hiding options.
gnu: python-linear-operator: Remove python-flake8-print native-input
gnu: abjad-ext-ipython: Remove uneeded inputs.

gnu/packages/android.scm | 6 +-
gnu/packages/astronomy.scm | 33 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 31 +-
gnu/packages/bootloaders.scm | 17 +-
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 21 +-
gnu/packages/cpp.scm | 4 +-
gnu/packages/databases.scm | 17 +-
gnu/packages/dav.scm | 4 -
gnu/packages/diffoscope.scm | 2 -
gnu/packages/django.scm | 12 +-
gnu/packages/ebook.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 7 +-
gnu/packages/finance.scm | 6 +-
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 9 +-
gnu/packages/gettext.scm | 4 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 6 +-
gnu/packages/graphviz.scm | 5 -
gnu/packages/jupyter.scm | 8 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/machine-learning.scm | 65 +---
gnu/packages/mail.scm | 3 +-
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 6 +-
gnu/packages/music.scm | 24 +-
gnu/packages/package-management.scm | 7 +-
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 6 +-
gnu/packages/potassco.scm | 3 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-check.scm | 33 +-
gnu/packages/python-compression.scm | 21 +-
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-science.scm | 21 +-
gnu/packages/python-web.scm | 173 +++--------
gnu/packages/python-xyz.scm | 415 +++++++-------------------
gnu/packages/radio.scm | 3 +-
gnu/packages/serialization.scm | 1 -
gnu/packages/simulation.scm | 2 -
gnu/packages/sphinx.scm | 7 -
gnu/packages/statistics.scm | 14 +-
gnu/packages/syndication.scm | 8 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/telegram.scm | 3 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/textutils.scm | 3 -
gnu/packages/time.scm | 22 +-
gnu/packages/version-control.scm | 1 -
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vpn.scm | 2 -
gnu/packages/web.scm | 6 +-
gnu/packages/wm.scm | 2 -
gnu/packages/xml.scm | 2 +-
guix/build/pyproject-build-system.scm | 99 +++++-
guix/import/pypi.scm | 21 +-
guix/lint.scm | 12 +-
tests/pypi.scm | 3 +-
62 files changed, 413 insertions(+), 805 deletions(-)

--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 01/32] guix: import: pypi: Ignore pypi-ignored-inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-1-ngraves@ngraves.fr
* guix/import/pypi.scm (pypi-ignored-inputs): New variable.
(compute-inputs): Use it.

* tests/pypi.scm (parse-requires.txt): Add ignored input to test the
feature.

* guix/lint.scm (check-inputs-should-be-native): Adapt list.
(check-inputs-should-not-be-an-input-at-all): Use pypi-ignored-list.

Change-Id: I774e526c5a090026e778ee44049637174a1dca95
---
guix/import/pypi.scm | 21 ++++++++++++++++++---
guix/lint.scm | 12 +++++++-----
tests/pypi.scm | 3 ++-
3 files changed, 27 insertions(+), 9 deletions(-)

Toggle diff (119 lines)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6719fde330a..d4b70061e86 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2022 Vivien Kraus <vivien@planete-kraus.eu>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -61,6 +62,7 @@ (define-module (guix import pypi)
#:use-module (guix upstream)
#:use-module ((guix licenses) #:prefix license:)
#:export (%pypi-base-url
+ pypi-ignored-inputs
parse-requires.txt
parse-wheel-metadata
specification->requirement-name
@@ -77,6 +79,18 @@ (define %pypi-base-url
;; Base URL of the PyPI API.
(make-parameter "https://pypi.org/pypi/"))
+(define pypi-ignored-inputs
+ ;; This list contains packages that are useful for development or quality
+ ;; testing, but that most of the time are not necessary to have as an input.
+ (list "argparse" ; native
+ "tox" ; test wrapper for other environments
+ "codecov" "coverage" ; coverage
+ "black" "isort" "pycodestyle" "pep8" ; style
+ "pyflakes" "flake8" "pylint" "mypy" ; style+lint
+ "coveralls" "twine" ; upload integration tools
+ "pytest-isort" "pytest-flake8" "pytest-cov" "pytest-black"
+ "pytest-pep8" "pytest-mypy" "pytest-pep8" "pre-commit")) ; variants
+
(define non-empty-string-or-false
(match-lambda
("" #f)
@@ -424,9 +438,10 @@ (define (compute-inputs source-url wheel-url archive)
"Given the SOURCE-URL and WHEEL-URL of an already downloaded ARCHIVE, return
the corresponding list of <upstream-input> records."
(define (requirements->upstream-inputs deps type)
- (filter-map (match-lambda
- ("argparse" #f)
- (name (upstream-input
+ (filter-map (lambda (name)
+ (if (member name pypi-ignored-inputs)
+ #f
+ (upstream-input
(name name)
(downstream-name (python->package-name name))
(type type))))
diff --git a/guix/lint.scm b/guix/lint.scm
index 68d532968de..f689cc2a2a8 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -71,6 +71,7 @@ (define-module (guix lint)
hg-reference-url)
#:autoload (guix bzr-download) (bzr-reference?
bzr-reference-url)
+ #:use-module ((guix import pypi) #:select (pypi-ignored-inputs))
#:use-module (guix import stackage)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
@@ -557,14 +558,12 @@ (define (check-inputs-should-be-native package)
"m4"
"qttools-5"
"yasm" "nasm" "fasm"
- "python-coverage"
"python-cython"
"python-docutils"
"python-mock"
"python-nose"
"python-pbr"
"python-pytest"
- "python-pytest-cov"
"python-setuptools-scm"
"python-sphinx"
"scdoc"
@@ -586,9 +585,12 @@ (define (check-inputs-should-be-native package)
(define (check-inputs-should-not-be-an-input-at-all package)
;; Emit a warning if some inputs of PACKAGE are likely to should not be
;; an input at all.
- (let ((input-names '("python-setuptools"
- "python-pip"
- "python-pre-commit")))
+ (let ((input-names (append
+ '("python-setuptools"
+ "python-pip"
+ "pre-commit")
+ (map (cut string-append "python-" <>)
+ pypi-ignored-inputs))))
(map (lambda (input)
(make-warning
package
diff --git a/tests/pypi.scm b/tests/pypi.scm
index 42b39cde730..fe01ab3beb3 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -97,6 +97,7 @@ (define test-requires.txt "\
[test]
pytest (>=2.5.0)
+pytest-cov # read but ignored
")
;; Beaker contains only optional dependencies.
@@ -244,7 +245,7 @@ (define-syntax-rule (with-pypi responses body ...)
(map specification->requirement-name test-specifications))
(test-equal "parse-requires.txt"
- (list '("foo" "bar") '("pytest"))
+ (list '("foo" "bar") '("pytest" "pytest-cov"))
(mock ((ice-9 ports) call-with-input-file
call-with-input-string)
(parse-requires.txt test-requires.txt)))
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 02/32] build-system/pyproject: Ignore unwanted pytest flags.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-2-ngraves@ngraves.fr
* guix/build/pyproject-build-system.scm : Ignore unwanted pytest flags.

Change-Id: Ib9f1602e5af11227e5b7ce124f0f9be4fa2b78e4
---
guix/build/pyproject-build-system.scm | 99 ++++++++++++++++++++++++++-
1 file changed, 96 insertions(+), 3 deletions(-)

Toggle diff (137 lines)
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index 947d240114a..2df9f2f4798 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,8 @@ (define-module (guix build pyproject-build-system)
add-installed-pythonpath
site-packages
python-version
- pyproject-build))
+ pyproject-build
+ with-guix-pytest-plugin))
;;; Commentary:
;;;
@@ -142,7 +144,94 @@ (define* (build #:key outputs build-backend backend-path configure-flags #:allow
wheel-dir
config-settings)))
-(define* (check #:key tests? test-backend test-flags #:allow-other-keys)
+(define pytest-default-ignore-alist
+ '(("cov" . ("--cov" "--cov-reset" "--cov-report" "--cov-config"
+ "--no-cov-on-fail" "--no-cov" "--cov-fail-under"
+ "--cov-append" "--cov-branch" "--cov-context"))
+ ("mypy" . ("--mypy" "--mypy-config-file" "--mypy-ignore-missing-imports"))
+ ("isort" . ("--isort"))
+ ("flake8" . ("--flake8"))
+ ("black" . ("--black"))
+ ("flakes" . ("--flakes"))
+ ("pep8" . ("--pep8"))))
+
+(define (pytest-ignore-flags-plugin flags)
+ "This function converts an list of flags into a string that can
+ be instantiated as a python pytest plugin."
+ (format #f "\
+import pytest
+
+def pytest_addoption(parser):
+ group = parser.getgroup('guix','Guix ignored options')
+ options = [~{~s, ~}]
+ for option in options:
+ group.addoption(option, action='append', nargs='?')"
+ flags))
+
+(define (call-with-guix-pytest-plugin inputs thunk)
+ "This function emulates command line options provided by pytest plugins in
+the absence of the plugins defining these options.
+
+This is done by selecting absent plugins, gettings their flags defined in
+PYTEST-DEFAULT-IGNORE-ALIST, and generating the plugin from there with
+PYTEST-IGNORE-FLAGS-PLUGIN."
+ (let* ((former-path (getenv "PYTHONPATH"))
+ (input-names
+ (map car
+ (filter (match-lambda
+ ((name . _)
+ (if (string-prefix? "python-pytest-" name)
+ name
+ #f))
+ ( _ #f))
+ inputs)))
+ (filtered-flags
+ (filter identity
+ (append-map
+ (match-lambda
+ ((group . flags)
+ (if (member (string-append "python-pytest-" group)
+ input-names)
+ (list #f)
+ flags))
+ (_ (list #f)))
+ pytest-default-ignore-alist)))
+ (dir (string-append
+ (if (access? (dirname (getcwd)) W_OK)
+ (dirname (getcwd))
+ ;; fallback if we're already out-of-source
+ (getcwd))
+ "/.guix-pytest")))
+ (dynamic-wind
+ (lambda ()
+ (setenv "PYTHONPATH"
+ (string-append
+ (if former-path
+ (string-append former-path ":")
+ "")
+ dir))
+ (setenv "PYTEST_PLUGINS"
+ (string-append
+ (if (getenv "PYTEST_PLUGINS")
+ (string-append former-path ",")
+ "")
+ "pytest_guix_plugin"))
+ (mkdir-p dir)
+ (with-output-to-file (string-append dir "/__init__.py")
+ (lambda _ (display "")))
+ (with-output-to-file (string-append dir "/pytest_guix_plugin.py")
+ (lambda _
+ (display (pytest-ignore-flags-plugin filtered-flags)))))
+ thunk
+ (lambda ()
+ (setenv "PYTHONPATH" former-path)
+ (unsetenv "PYTEST_PLUGINS")))))
+
+(define-syntax-rule (with-guix-pytest-plugin inputs exp ...)
+ "Evaluate EXP in a context where the Guix pytest plugin is added."
+ (call-with-guix-pytest-plugin inputs (lambda () exp ...)))
+
+(define* (check #:key inputs tests? test-backend test-flags #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
;; Unfortunately with PEP 517 there is no common method to specify test
@@ -165,7 +254,8 @@ (define* (check #:key tests? test-backend test-flags #:allow-other-keys)
(format #t "Using ~a~%" use-test-backend)
(match use-test-backend
('pytest
- (apply invoke pytest "-vv" test-flags))
+ (with-guix-pytest-plugin inputs
+ (apply invoke pytest "-vv" test-flags)))
('nose
(apply invoke nosetests "-v" test-flags))
('nose2
@@ -386,3 +476,6 @@ (define* (pyproject-build #:key inputs (phases %standard-phases)
(apply python:python-build #:inputs inputs #:phases phases args))
;;; pyproject-build-system.scm ends here
+;;; Local Variables:
+;;; eval: (put 'with-guix-pytest-plugin 'scheme-indent-function 1)
+;;; End:
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 03/32] build-system/pyproject: Remove python-black input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-3-ngraves@ngraves.fr
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-liana-py, scvelo)[native-inputs]: Remove python-black.

* gnu/packages/databases.scm (datasette):
[arguments]<#:test-flags>: Ignore black tests.
<#:phases>: Remove parts related to black in relax-requirements
added phase.
[native-inputs]: Remove python-black.

* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-black.

* gnu/packages/graph.scm (python-graphtools)[native-inputs]: Remove
python-black.

* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-hyperopt, python-captum,
python-pyro-ppl)[native-inputs]: Remove python-black.

* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]:
Remove python-black.

* gnu/packages/python-web.scm (python-ovh, python-openai,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-black.

* gnu/packages/python-xyz.scm (python-pydantic-cli, python-imageio,
python-update-checker, python-eliot, python-minikanren,
python-jupytext)[native-inputs]: Remove python-black.
(ptpython)[propagated-inputs]: Remove python-black.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-black.

Change-Id: Ie8098afda264bf9a5ab2cfe5d915bc7a41fdc604
---
gnu/packages/bioinformatics.scm | 11 +++--------
gnu/packages/databases.scm | 8 ++------
gnu/packages/finance.scm | 1 -
gnu/packages/graph.scm | 1 -
gnu/packages/machine-learning.scm | 11 +++--------
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 8 +++-----
gnu/packages/python-xyz.scm | 15 +++++----------
gnu/packages/virtualization.scm | 2 +-
9 files changed, 18 insertions(+), 42 deletions(-)

Toggle diff (271 lines)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a611caf715a..253c36947c3 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
@@ -2278,10 +2277,7 @@ (define-public python-liana-py
python-tqdm
tzdata))
(native-inputs
- (list python-black
- python-poetry-core
- python-pytest
- python-pytest-cov))
+ (list python-poetry-core python-pytest python-pytest-cov))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
@@ -21837,8 +21833,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-hypothesis
python-pytest
python-setuptools-scm
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 67e6ced7c32..96b2c2a0437 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5537,16 +5537,13 @@ (define-public datasette
" or test_custom_query_with_unicode_characters"
" or test_searchmode)")
"-n" (number->string (parallel-job-count))
- "-m" "not serial") ;cannot run in parallel
+ "-m" "not serial" ;cannot run in parallel
+ "--ignore=tests/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
- ;; The package needlessly specifies exact versions
- ;; of dependencies, when it works fine with others.
(substitute* "setup.py"
- (("(black)==[0-9\\.]+" _ package)
- package)
(("click-default-group-wheel")
"click-default-group")))))))
(propagated-inputs
@@ -5569,7 +5566,6 @@ (define-public datasette
python-uvicorn))
(native-inputs
(list python-beautifulsoup4
- python-black
python-cogapp
python-pip
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3c32a220c4e..7d1efde8187 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-black
python-isort
python-pillow
python-protobuf
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eda8365a424..033027a5aa9 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-black
python-coverage
python-coveralls
python-nose
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index ba6f51b3f11..e63dd0f0678 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-isort
python-nbsphinx
python-pandas
@@ -1923,8 +1922,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-keras
python-mypy
python-pandas
@@ -2359,8 +2357,7 @@ (define-public python-hyperopt
python-six
python-tqdm))
(native-inputs
- (list python-black
- python-nose
+ (list python-nose
python-pymongo
python-pytest
python-wheel))
@@ -4525,7 +4522,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-black
python-flake8
python-flask
python-flask-compress
@@ -5063,7 +5059,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-black
python-flake8
python-graphviz
python-isort
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5571cee2088..83fd723d12b 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-flake8
python-flask
python-httplib2
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 61ea8a63558..a7794741f42 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
@@ -2174,7 +2173,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
@@ -8968,8 +8967,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3f86ea8224b..7eff059637e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
(native-inputs
(list git-minimal
python-autopep8
- python-black
python-flake8
python-gitpython
python-isort
@@ -8029,8 +8028,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
@@ -10802,7 +10800,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-black python-flake8 python-fsspec python-pytest
+ (list python-flake8 python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -22108,8 +22106,7 @@ (define-public ptpython
(arguments
`(#:tests? #f)) ;there are no tests
(propagated-inputs
- (list python-appdirs python-black python-jedi python-prompt-toolkit
- python-pygments))
+ (list python-appdirs python-jedi python-prompt-toolkit python-pygments))
(home-page "https://github.com/jonathanslenders/ptpython")
(synopsis "Python Read-Eval-Print-Loop with nice IDE-like features")
(description
@@ -27291,7 +27288,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-black python-flake8 python-pytest))
+ (native-inputs (list python-flake8 python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31399,8 +31396,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-dask
python-flake8
python-hypothesis
@@ -34155,7 +34151,6 @@ (define-public python-minikanren
python-pytest
python-pytest-cov
python-pylint
- python-black
python-sympy
python-versioneer
python-coverage))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 20cbb0b8bed..b564bd043cb 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,7 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-black python-mypy python-pyhamcrest python-twine
+ (list python-mypy python-pyhamcrest python-twine
python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 04/32] build-system/pyproject: Remove python-pylint native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-4-ngraves@ngraves.fr
* gnu/packages/potassco.scm (python-clingraph):
[native-inputs]: Remove python-pylint.

* gnu/packages/python-xyz.scm (python-mediapy, python-fastjsonschema,
python-trio)[native-inputs]: Remove python-pylint.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-pylint.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-pylint.

Change-Id: If6a20e0b790f7157013a6868bba9e4a8d7e5ba28
---
gnu/packages/potassco.scm | 3 +--
gnu/packages/python-xyz.scm | 3 ---
gnu/packages/syndication.scm | 2 --
gnu/packages/terminals.scm | 6 +++---
4 files changed, 4 insertions(+), 10 deletions(-)

Toggle diff (95 lines)
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 9af307b4a90..054f9e9b180 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -563,8 +563,7 @@ (define-public python-clingraph
python-jsonschema
python-networkx
python-setuptools))
- (native-inputs (list dot2tex graphviz python-pylint python-pytest
- python-wheel))
+ (native-inputs (list dot2tex graphviz python-pytest python-wheel))
(home-page "https://github.com/potassco/clingraph")
(synopsis "Visualizer for graphs defined as logic programs")
(description
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7eff059637e..e558dcdc83a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4440,7 +4440,6 @@ (define-public python-mediapy
python-pillow))
(native-inputs
(list python-flit-core
- python-pylint
python-pytest
python-pytest-xdist))
(home-page "https://github.com/google/mediapy")
@@ -17184,7 +17183,6 @@ (define-public python-fastjsonschema
(list python-colorama
python-json-spec
python-jsonschema
- python-pylint
python-pytest
python-pytest-benchmark
python-pytest-cache
@@ -29072,7 +29070,6 @@ (define-public python-trio
(list python-astor
python-ipython
python-jedi
- python-pylint
python-pyopenssl
python-pytest
python-pytest-xdist
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index a2d8c61be45..29febdf3453 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -437,7 +437,6 @@ (define-public rtv
python-coveralls
python-coverage
python-mock
- python-pylint
python-pytest
python-vcrpy))
(home-page "https://github.com/michael-lazar/rtv")
@@ -472,7 +471,6 @@ (define-public tuir
(list python-coverage
python-coveralls
python-mock
- python-pylint
python-pytest
python-vcrpy
python-setuptools
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 98a6bf6684a..26af13af498 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,7 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-coverage python-nose python-pylint python-tox
+ (native-inputs (list python-coverage python-nose python-tox
python-twine python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
@@ -1224,7 +1224,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-coverage python-nose python-pylint
+ (native-inputs (list python-coverage python-nose
python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
@@ -1252,7 +1252,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-coverage python-nose python-pylint
+ (native-inputs (list python-coverage python-nose
python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 05/32] build-system/pyproject: Remove python-flake8 inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-5-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-crds)[native-inputs]: Remove
python-flake8.

* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-biom-format)[native-inputs]: Remove python-flake8.

* gnu/packages/ebook.scm (calibre)[native-inputs]: Remove
python-flake8.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-flake8.

* gnu/packages/finance.scm (python-mt-940)[native-inputs]: Remove
python-flake8.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-flake8.

* gnu/packages/gettext.scm (python-mdpo)[native-inputs]: Remove
python-flake8.

* gnu/packages/graph.scm (python-pygsp)[native-inputs]: Remove
python-flake8.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-flake8.

* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-captum, python-pyro-api,
python-pyro-ppl, python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-flake8.

* gnu/packages/music.scm (python-mutagen):
[arguments]<#:test-flags>: Ignore flake8 quality tests.
[native-inputs]: Remove python-flake8.

* gnu/packages/protobuf.scm (python-pure-protobuf):
[arguments]<#:phases>: Remove flake8 invocation from check phase.
[native-inputs]: Remove python-flake8.

* gnu/packages/python-web.scm (python-ovh, python-furl,
python-httplib2, python-http-ece, python-woob,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-flake8.

* gnu/packages/python-xyz.scm (python-apispec,
python-apispec-webframeworks, python-apprise, python-colorful,
python-pymd4c, python-pyls-black, python-docx, python-flasgger,
python-imageio, python-importlib-ressources, python-jaraco-test,
python-seaborn, python-progressbar2, python-inflect,
python-argcomplete, python-diff-cover, python-validators,
python-marshmallow, python-marshmallow-jsonapi, python-yq,
python-update-checker, python-eliot, python-dateparser,
python-jinja2-cli, python-nikola, python-verspec, python-mike,
python-arpeggio, python-versioneer, python-codespell)[native-inputs]:
Remove python-flake8.

* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-flake8.

* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[propagated-inputs]: Remove python-flake8.

* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-flake8.

* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-flake8.

* gnu/packages/wm.scm (qtile)[native-inputs]: Remove python-flake8.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-flake8.

Change-Id: I196a9c0b7497106c8f98598535cb8e0ea667481c
---
gnu/packages/astronomy.scm | 3 +-
gnu/packages/bioinformatics.scm | 7 +---
gnu/packages/ebook.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/finance.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graph.scm | 3 +-
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 15 ++------
gnu/packages/music.scm | 5 ++-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-web.scm | 12 ++----
gnu/packages/python-xyz.scm | 62 +++++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/sphinx.scm | 2 -
gnu/packages/statistics.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/vpn.scm | 1 -
gnu/packages/wm.scm | 1 -
20 files changed, 37 insertions(+), 90 deletions(-)

Toggle diff (399 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 32c6f30e8f6..ede10ab927a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2186,8 +2186,7 @@ (define-public python-crds
python-roman-datamodels
python-stsynphot
python-requests))
- (native-inputs (list python-flake8
- python-ipython
+ (native-inputs (list python-ipython
python-lockfile
python-mock
python-nose
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 253c36947c3..4f3a3d0ba01 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
(synopsis
@@ -3005,7 +3004,6 @@ (define-public python-biom-format
(propagated-inputs
(list python-anndata
python-click
- python-flake8
python-future
python-h5py
python-numpy
@@ -21833,8 +21831,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools-scm
python-wheel))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 16d4fcd6e36..3d536e59add 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -154,7 +154,6 @@ (define-public calibre
(native-inputs
(list bash-minimal
pkg-config
- python-flake8
python-pyqt-builder
qtbase-5 ; for qmake
xdg-utils))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f082f346278..610fb53087b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2679,7 +2679,6 @@ (define-public python-scikit-rf
python-qtpy
python-scipy))
(native-inputs (list python-coverage
- python-flake8
python-nbval
python-networkx
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7d1efde8187..7579001dd1f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2307,9 +2307,7 @@ (define-public python-mt-940
;; Remove custom --cov flags.
(delete-file "pytest.ini")
(invoke "pytest" "-vv")))))))
- (native-inputs (list python-flake8
- python-pytest
- python-pyyaml))
+ (native-inputs (list python-pytest python-pyyaml))
(home-page "https://mt940.readthedocs.io/")
(synopsis "Python parser for MT940-encoded SWIFT data")
(description
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 81a854f8a2a..69cc7e6ddc5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3265,7 +3265,6 @@ (define-public python-geopy
(native-inputs
(list python-async-generator
python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1408cc4cb46..bbb19bd4cb8 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -214,7 +214,6 @@ (define-public mdpo
(build-system python-build-system)
(native-inputs
(list python-bump2version
- python-flake8
python-flake8-implicit-str-concat
python-flake8-print
python-isort
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 033027a5aa9..eb8aa17fdfe 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -564,8 +564,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-flake8
- python-pytest))
+ (list python-coverage python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index db40b99928a..b396a97c0bc 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-flake8
python-isort
python-mypy
python-pytest
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e63dd0f0678..b4f0f65c837 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-flake8
- python-isort
+ (native-inputs (list python-isort
python-nbsphinx
python-pandas
python-pillow
@@ -1922,8 +1921,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-flake8
- python-keras
+ (native-inputs (list python-keras
python-mypy
python-pandas
python-pytest
@@ -4522,7 +4520,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-flake8
python-flask
python-flask-compress
python-ipython
@@ -5009,8 +5006,7 @@ (define-public python-pyro-api
(build-system python-build-system)
(arguments '(#:tests? #false)) ;requires pyro
(native-inputs
- (list python-flake8
- python-ipython
+ (list python-ipython
python-pytest
python-sphinx
python-sphinx-rtd-theme))
@@ -5059,7 +5055,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-flake8
python-graphviz
python-isort
python-lap
@@ -5106,8 +5101,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-pytest
python-setuptools
python-setuptools-scm
@@ -5138,7 +5132,6 @@ (define-public python-gpytorch
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
(native-inputs (list python-coverage
- python-flake8
python-flake8-print
python-nbval
python-pytest
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6b765dcb3d6..3af2b79b419 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3968,6 +3968,7 @@ (define-public python-mutagen
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags '(list "--ignore=tests/quality/test_flake8.py")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'remove-hypothesis-deadlines
@@ -3978,8 +3979,8 @@ (define-public python-mutagen
(("( +)@given" all spaces)
(string-append spaces "@settings(deadline=None)\n" all))))))))
(native-inputs
- (list python-pytest python-hypothesis python-flake8
- python-setuptools python-wheel))
+ (list python-pytest python-hypothesis python-setuptools python-wheel))
+ (home-page "https://mutagen.readthedocs.io/")
(synopsis "Read and write audio tags")
(description "Mutagen is a Python module to handle audio metadata. It
supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8ca730df3c3..502ad09a3a6 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-flake8 python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov python-isort))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -477,8 +477,6 @@ (define-public python-pure-protobuf
(lambda _
(invoke "pytest" "--cov-report" "term-missing" "--cov"
"pure_protobuf")
- (invoke "flake8" "pure_protobuf" "tests"
- "--ignore=F541")
(invoke "isort" "-rc" "-c" "pure_protobuf" "tests"))))))
(home-page "https://pypi.org/project/pure-protobuf/")
(synopsis "Protobuf implementation using dataclasses")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a7794741f42..4cf064e0742 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -978,7 +978,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
@@ -1239,8 +1238,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
@@ -1273,7 +1270,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
@@ -7307,7 +7303,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
@@ -8327,8 +8323,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8967,8 +8962,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e558dcdc83a..fa77102857c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -320,7 +320,6 @@ (define-public python-apprise
(native-inputs (list python-babel
python-coverage
python-cryptography
- python-flake8
python-paho-mqtt
python-pytest
python-pytest-cov
@@ -1183,8 +1182,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-flake8 python-pytest python-setuptools
- python-wheel))
+ (list python-coverage python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -2370,7 +2368,7 @@ (define-public python-pymd4c
(inputs
(list md4c))
(native-inputs
- (list python-flake8 python-pkgconfig pkg-config))
+ (list python-pkgconfig pkg-config))
(home-page "https://github.com/dominickpastore/pymd4c")
(synopsis "Python bindings for MD4C")
(description
@@ -3028,7 +3026,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-flake8 python-isort python-mypy python-pytest
+ (list python-isort python-mypy python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -7006,7 +7004,6 @@ (define-public python-docx
(build-system pyproject-build-system)
(native-inputs
(list behave
- python-flake8
python-mock
python-pyparsing
python-pytest
@@ -10799,7 +10796,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-flake8 python-fsspec python-pytest
+ (list python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -11577,8 +11574,7 @@ (define-public python-importlib-resources
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
- (list python-flake8
- python-pytest
+ (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -11900,8 +11896,7 @@ (define-public python-jaraco-test
(arguments
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
- (native-inputs (list python-flake8
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -13706,8 +13701,7 @@ (define-public python-seaborn
python-scipy
python-statsmodels))
(native-inputs
- (list python-flake8
- python-flit-core
+ (list python-flit-core
python-ipykernel
python-nbconvert
python-numpydoc
@@ -18691,8 +18685,7 @@ (define-public python-progressbar2
(propagated-inputs
(list python-six python-utils))
(native-inputs
- (list python-flake8
- python-fre
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 07/32] gnu: python-cram: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-7-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-cram):
[native-inputs]: Remove python-coverage.
[build-system]: Move to pyproject-build-system.
[arguments]<#:phases>: Adapt check and patch-source phases
to coverage removal.

Change-Id: I83fafcdcfbc977f9d3e3411d01d23d9a0e120ec6
---
gnu/packages/python-xyz.scm | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e84ce7df3eb..108b32d0459 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15081,25 +15081,17 @@ (define-public python-cram
;; causes the line showing the default shell to break into two
;; lines, but the test expects a single line...
(("env\\['COLUMNS'\\] = '80'")
- "env['COLUMNS'] = '160'"))
-
- (substitute* "Makefile"
- ;; Recent versions of python-coverage have caused the test
- ;; coverage to decrease (as of version 0.7). Allow that.
- (("--fail-under=100")
- "--fail-under=90"))
-
- #t))
+ "env['COLUMNS'] = '160'"))))
(replace 'check
;; The test phase uses the built library and executable.
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(setenv "PATH" (string-append (getenv "PATH") ":"
(assoc-ref outputs "out") "/bin"))
- (invoke "make" "test"))))))
- (build-system python-build-system)
+ (invoke "make" "quicktest"))))))
+ (build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-setuptools python-wheel which))
+ (list python-setuptools python-wheel which))
(synopsis "Simple testing framework for command line applications")
(description
"Cram is a functional testing framework for command line applications.
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 06/32] build-system/pyproject: Remove python-coverage input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-6-ngraves@ngraves.fr
* gnu/packages/android.scm (python-androguard):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt 'check phase replacement.

* gnu/packages/astronomy.scm (python-asdf-astropy, python-astropy,
python-poliastro)[native-inputs]: Remove python-coverage.

* gnu/packages/bioinformatics.scm (python-ega-download-client,
python-scikit-bio, python-cooler)[native-inputs]: Remove
python-coverage.

* gnu/packages/check.scm (python-pytest-randomly,
python-pytest-flakes, python-aiounittest)[native-inputs]: Remove
python-coverage.

* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-coverage.

* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-coverage.

* gnu/packages/django.scm (python-django-haystack)[native-inputs]:
Remove python-coverage.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-coverage.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-coverage.

* gnu/packages/gpodder.scm (gpodder)[native-inputs]: Remove
python-coverage.

* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coverage.

* gnu/packages/jupyter.scm (python-jupyter-packaging)[native-inputs]:
Remove python-coverage.

* gnu/packages/machine-learning.scm (onnx, onnx-optimizer,
python-lightning-utilities, python-pytorch-lightning,
python-torchmetrics, python-gpytorch)[native-inputs]: Remove
python-coverage.

* gnu/packages/music.scm (python-pylast)[native-inputs]: Remove
python-coverage.

* gnu/packages/package-management.scm (python-anaconda-client,
conda)[native-inputs]: Remove python-coverage.

* gnu/packages/python-check.scm (python-vcrpy,
python-re-assert)[native-inputs]: Remove python-coverage.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-coverage.

* gnu/packages/python-web.scm (python-ovh, python-flask-misaka,
python-zope-interface, python-zope-hookable, python-url,
python-transaction, python-sanic, python-woob,
python-flask-combo-jsonapi)[native-inputs]: Remove python-coverage.

* gnu/packages/python-xyz.scm (python-apprise, python-arpeggio,
python-affine, python-colorful, python-lunr, python-mdit-py-plugins,
python-bidict, python-sh, python-cftime, python-can,
python-jsonargparse, python-extension-helpers, python-pyjwt,
python-virtualenv-clone, python-lsp-server, python-pikepdf,
python-tasklogger, python-notebook, python-structlog, binwalk,
python-argcomplete, python-attrs, python-yq, python-stone,
python-identify, python-nodeenv, python-anyio, python-forbiddenfruit,
python-watchgod, python-eliot, python-pem, python-scikit-build,
python-minikanren, nikola, python-verspec, python-mike)
[native-inputs]: Remove python-coverage.

* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-coverage.

* gnu/packages/statistics.scm (python-emcee,
python-rpy2)[native-inputs]: Remove python-coverage.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coverage.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-coverage.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-coverage.

* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Remove
python-coverage.

* gnu/packages/web.scm (python-httpretty)[native-inputs]: Remove
python-coverage.

* gnu/packages/xml.scm (python-xmltodict)[native-inputs]: Remove
python-coverage.

Change-Id: I66b28e624aac94f1a2f6e4fae5cdb444193cd8d9
---
gnu/packages/android.scm | 6 +--
gnu/packages/astronomy.scm | 7 +--
gnu/packages/bioinformatics.scm | 8 ++--
gnu/packages/check.scm | 7 ++-
gnu/packages/cpp.scm | 3 +-
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/engineering.scm | 3 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 3 +-
gnu/packages/jupyter.scm | 2 +-
gnu/packages/machine-learning.scm | 10 +---
gnu/packages/music.scm | 3 +-
gnu/packages/package-management.scm | 6 +--
gnu/packages/python-check.scm | 5 +-
gnu/packages/python-compression.scm | 12 ++---
gnu/packages/python-web.scm | 20 ++++----
gnu/packages/python-xyz.scm | 72 +++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/statistics.scm | 6 +--
gnu/packages/syndication.scm | 4 +-
gnu/packages/terminals.scm | 8 ++--
gnu/packages/textutils.scm | 1 -
gnu/packages/version-control.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/xml.scm | 2 +-
27 files changed, 63 insertions(+), 136 deletions(-)

Toggle diff (381 lines)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index cbfbd6522f4..ab42f2be980 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1072,11 +1072,9 @@ (define-public python-androguard
(replace 'check
;; Adapted from .travis.yml
(lambda _
- (invoke "nosetests" "--with-coverage" "--with-timer"
- "--timer-top-n" "50"))))))
+ (invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-coverage python-mock python-nose
- python-nose-timer))
+ (list python-codecov python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index ede10ab927a..0ff2511208d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1678,7 +1678,6 @@ (define-public python-astropy
(native-inputs
(list pkg-config
python-colorlog
- python-coverage
python-cython-3
python-extension-helpers
python-h5py
@@ -2604,8 +2603,7 @@ (define-public python-poliastro
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-mypy
python-flit-core
python-pytest
@@ -4953,8 +4951,7 @@ (define-public python-asdf-astropy
(add-before 'check 'set-home-env
(lambda _ (setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-h5py
+ (list python-h5py
python-pandas
python-pytest
python-pytest-astropy
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4f3a3d0ba01..eabee35f70f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2766,8 +2766,7 @@ (define-public python-ega-download-client
(("==") ">=")))))))
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
- (native-inputs (list python-coverage
- python-mock
+ (native-inputs (list python-mock
python-pyfakefs
python-pytest
python-responses
@@ -5359,7 +5358,7 @@ (define-public python-scikit-bio
python-requests
python-scipy))
(native-inputs
- (list python-coverage python-pytest))
+ (list python-pytest))
(home-page "https://scikit-bio.org")
(synopsis "Data structures, algorithms and educational resources for bioinformatics")
(description
@@ -17971,8 +17970,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-coverage
- python-hatchling
+ (list python-hatchling
python-isort
python-pytest
python-pytest-cov))
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 880d3cb46f3..b7116b3f0e2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1617,8 +1617,7 @@ (define-public python-pytest-randomly
"not reordered "
"and not test_it_runs_before_stepwise "
"and not test_entrypoint_injection"))))))))
- (native-inputs (list python-coverage
- python-factory-boy
+ (native-inputs (list python-factory-boy
python-faker
python-numpy
python-pytest-xdist))
@@ -2715,7 +2714,7 @@ (define-public python-pytest-flakes
(add-installed-pythonpath inputs outputs)
(invoke "py.test" "-vv" "-k" "not test_syntax_error"))))))
(native-inputs
- (list python-coverage python-pytest python-pytest-pep8))
+ (list python-pytest python-pytest-pep8))
(propagated-inputs
(list python-pyflakes))
(home-page "https://github.com/fschulze/pytest-flakes")
@@ -3568,7 +3567,7 @@ (define-public python-aiounittest
#t)))))
(propagated-inputs (list python-wrapt))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page
"https://github.com/kwarunek/aiounittest")
(synopsis "Test asyncio code more easily")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8a0bd62d6b6..ba2698056da 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1189,8 +1189,7 @@ (define-public cpplint
(setenv "GUIX_PYTHONPATH"
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-cov
python-pytest-runner
python-testfixtures))
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d6..67567a6b310 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -269,7 +269,6 @@ (define-public reprotest
`(("diffoscope" ,diffoscope)
("help2man" ,help2man)
("libfaketime" ,libfaketime)
- ("python-coverage" ,python-coverage)
("python-docutils" ,python-docutils)
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4a271eaf0b5..298968d37c6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -495,7 +495,6 @@ (define-public python-django-haystack
(list python-django))
(native-inputs
(list gdal
- python-coverage
python-dateutil
python-geopy
python-mock
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 610fb53087b..2620d5272b6 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2678,8 +2678,7 @@ (define-public python-scikit-rf
python-pyqtgraph
python-qtpy
python-scipy))
- (native-inputs (list python-coverage
- python-nbval
+ (native-inputs (list python-nbval
python-networkx
python-pytest
python-pytest-cov
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 69cc7e6ddc5..806120e939d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3264,7 +3264,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-coverage
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index f9102d3a447..0786010471f 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -64,7 +64,6 @@ (define-public gpodder
(build-system python-build-system)
(native-inputs
(list intltool
- python-coverage
python-minimock
python-pytest
python-pytest-cov
@@ -173,7 +172,7 @@ (define-public python-mygpoclient
"1fi5x6k1mngr0iviw2s4n1f3y2x7pwqy5ivkcrjdprzvwr37f0mh"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-minimock python-nose))
+ (list python-minimock python-nose))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eb8aa17fdfe..f83a23dd0be 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coverage
python-coveralls
python-nose
python-nose2
@@ -564,7 +563,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-pytest))
+ (list python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index e2bef079ba0..456b0544a9a 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -486,7 +486,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-coverage python-pytest
+ (list python-pypa-build python-pytest
python-pytest-cov python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index b4f0f65c837..e6f6bfe410d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1364,7 +1364,6 @@ (define args
(list cmake
googletest
pybind11
- python-coverage
python-nbval
python-pytest
python-pytest-runner))
@@ -1443,8 +1442,7 @@ (define-public onnx-optimizer
#~(modify-phases #$phases
(delete 'relax-requirements)))))
(native-inputs
- (list cmake python-pytest python-pytest-runner python-nbval
- python-coverage))
+ (list cmake python-pytest python-pytest-runner python-nbval))
(inputs
(list onnx protobuf pybind11))
(propagated-inputs
@@ -4487,7 +4485,6 @@ (define-public python-lightning-utilities
(build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging
python-typing-extensions))
- (native-inputs (list python-coverage))
(home-page "https://github.com/Lightning-AI/utilities")
(synopsis "PyTorch Lightning sample project")
(description "This package provides common Python utilities and GitHub
@@ -4700,7 +4697,6 @@ (define-public python-pytorch-lightning
(native-inputs
(list python-aiohttp
python-cloudpickle
- python-coverage
python-flaky
python-pympler
python-pytest
@@ -4730,7 +4726,6 @@ (define-public python-torchmetrics
python-typing-extensions))
(native-inputs
(list python-cloudpickle
- python-coverage
python-fire
python-mir-eval
python-mypy
@@ -5131,8 +5126,7 @@ (define-public python-gpytorch
#~(list "-k" (string-append "not test_deprecated_methods"
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
- (native-inputs (list python-coverage
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-nbval
python-pytest
python-setuptools
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 3af2b79b419..5420a140657 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4069,8 +4069,7 @@ (define-public python-pylast
;; https://github.com/pylast/pylast/issues/105
(arguments '(#:tests? #f))
(native-inputs
- (list python-coverage python-pytest python-flaky python-pyyaml
- python-setuptools-scm))
+ (list python-pytest python-flaky python-pyyaml python-setuptools-scm))
(home-page "https://github.com/pylast/pylast")
(synopsis "Python interface to Last.fm and Libre.fm")
(description "A Python interface to Last.fm and other API-compatible
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index feed16ebcef..4e7e46bf1b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1100,8 +1100,7 @@ (define-public python-anaconda-client
(list python-clyent python-nbformat python-pyyaml python-requests
python-setuptools))
(native-inputs
- (list python-coverage
- python-dateutil
+ (list python-dateutil
python-freezegun
python-mock
python-pillow
@@ -1286,8 +1285,7 @@ (define-public conda
;; XXX: This is dragged in by libarchive and is needed at runtime.
zstd))
(native-inputs
- (list python-coverage
- python-flaky
+ (list python-flaky
python-pytest-timeout
python-pytest-xprocess
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 83fd723d12b..574a93782ce 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-coverage
- python-flake8
+ (list python-flake8
python-flask
python-httplib2
python-ipaddress
@@ -1145,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-coverage python-pytest))
+ (list python-covdefaults python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 34a9cd73a20..b2d789c92d0 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coverage
python-coveralls
python-hypothesis
python-pyannotate
@@ -247,8 +246,7 @@ (define-public python-pybcj
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-cov
python-setuptools-scm
@@ -281,8 +279,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-coverage python-pytest
- python-pytest-cov))
+ (list python-setuptools python-pytest python-pytest-cov))
(home-page "https
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 08/32] gnu: u-boot-tools: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-8-ngraves@ngraves.fr
* gnu/packages/bootloaders.scm (u-boot-tools):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt patch phase.

Change-Id: I94394544079197b4a3f8c53cc0b3d78d1f5dc8be
---
gnu/packages/bootloaders.scm | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 0e7bc66bd75..cf568b2bd6a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -802,8 +802,7 @@ (define-public u-boot-tools
(name "u-boot-tools")
(native-inputs
(modify-inputs (package-native-inputs u-boot)
- (prepend python-coverage
- python-filelock
+ (prepend python-filelock
python-pycryptodomex
python-pytest
python-pytest-xdist
@@ -820,14 +819,6 @@ (define-public u-boot-tools
(("/bin/false") (which "false")))
(substitute* "tools/dtoc/fdt_util.py"
(("'cc'") "'gcc'"))
- (substitute* "tools/u_boot_pylib/test_util.py"
- ;; python3-coverage is simply called coverage in guix.
- (("python3-coverage") "coverage")
-
- ;; Don't require 100% coverage since it's brittle and can
- ;; fail with newer versions of coverage or dependencies.
- (("raise ValueError\\('Test coverage failure'\\)")
- "print('Continuing anyway since Guix does not care :O')"))
(substitute* "test/run"
;; Make it easier to find test failures.
(("#!/bin/bash") "#!/bin/bash -x")
@@ -838,9 +829,9 @@ (define-public u-boot-tools
;; FIXME: test_spl fails, needs further investiation
(("test_ofplatdata or test_handoff or test_spl")
"test_ofplatdata or test_handoff")
- ;; FIXME: code coverage not working
- (("run_test \"binman code coverage\"")
- "# run_test \"binman code coverage\"")
+ ;; Disable code coverage tests.
+ (("run_test \"(\\w+) code coverage\"" all)
+ (string-append "# " all))
;; This test would require internet access.
(("\\./tools/buildman/buildman") (which "true")))
(substitute* "test/py/tests/test_sandbox_exit.py"
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 09/32] gnu: python-aiosqlite: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-9-ngraves@ngraves.fr
* gnu/packages/databases.scm (python-aiosqlite):
[arguments]<#:phases>: Adapt check phase.
[native-inputs]: Remove python-coverage.

Change-Id: I165d174426022f0603223e3def91ffe280f15899
---
gnu/packages/databases.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 96b2c2a0437..f9202639c53 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3935,11 +3935,8 @@ (define-public python-aiosqlite
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "python" "-m" "coverage" "run" "-m"
- "aiosqlite.tests")
- (invoke "python" "-m" "coverage" "report")))))))
+ (invoke "python" "-m" "aiosqlite.tests")))))))
(native-inputs (list python-flit-core
- python-coverage
python-mypy))
(home-page "https://github.com/jreese/aiosqlite")
(synopsis
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 10/32] gnu: python-openid: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-10-ngraves@ngraves.fr
* gnu/packages/python-web.scm (python-openid):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Rewrite check phase.

Change-Id: Id4ea5abc531f5fd84b60ff22407eb608f1e6ac29
---
gnu/packages/python-web.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 942999f6cf9..fe79f629bb8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2341,17 +2341,18 @@ (define-public python-openid
"1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "coverage" "run" "-m"
- "unittest" "openid.test.test_suite")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "python" "-m" "unittest" "openid.test.test_suite")
+ (format #t "test suite not run~%")))))))
(propagated-inputs
(list python-defusedxml))
(native-inputs
- (list python-coverage python-psycopg2 python-django))
+ (list python-psycopg2 python-django))
(home-page "https://github.com/necaris/python3-openid")
(synopsis "OpenID support for servers and consumers")
(description "This library provides OpenID authentication for Python, both
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 11/32] build-system/pyproject: Remove python-coveralls native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-11-ngraves@ngraves.fr
* gnu/packages/geo.scm (python-cartopy)[native-inputs]: Remove
python-coveralls.

* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coveralls.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-py7zr)[native-inputs]: Remove python-coveralls.

* gnu/packages/python-science.scm (python-trimesh)[native-inputs]:
Remove python-coveralls.

* gnu/packages/python-web.scm (python-flask-combo-jsonapi)
[native-inputs]: Remove python-coveralls.

* gnu/packages/python-xyz.scm (python-affine, python-cftime,
python-ddlparse, python-tasklogger, python-minikanren,
python-arpeggio)[native-inputs]: Remove python-coveralls.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coveralls.

* gnu/packages/telegram.scm (tgcli)[native-inputs]: Remove
python-coveralls.

Change-Id: I47b3c21f985175876618f1457b242e6841eb6d3b
---
gnu/packages/geo.scm | 3 +--
gnu/packages/graph.scm | 3 +--
gnu/packages/python-compression.scm | 2 --
gnu/packages/python-science.scm | 3 +--
gnu/packages/python-web.scm | 3 +--
gnu/packages/python-xyz.scm | 12 ++++--------
gnu/packages/syndication.scm | 4 +---
gnu/packages/telegram.scm | 3 +--
8 files changed, 10 insertions(+), 23 deletions(-)

Toggle diff (179 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 806120e939d..be96e6800a3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1479,8 +1479,7 @@ (define-public python-cartopy
(inputs
(list geos))
(native-inputs
- (list python-coveralls
- python-cython
+ (list python-cython
python-pytest
python-pytest-cov
python-pytest-mpl
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index f83a23dd0be..d66a3676fd2 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coveralls
python-nose
python-nose2
python-pandas
@@ -563,7 +562,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coveralls python-pytest))
+ (list python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index b2d789c92d0..5faf7b2a3cb 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coveralls
python-hypothesis
python-pyannotate
python-pytest
@@ -474,7 +473,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coveralls
python-libarchive-c
python-py-cpuinfo
python-pyannotate
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index f82feab0963..9301e82bb60 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -653,8 +653,7 @@ (define-public python-trimesh
(("\\$MESH_PRE")
"'$MESH_PRE'")))))))
(native-inputs
- (list python-coveralls
- python-pyinstrument
+ (list python-pyinstrument
python-pytest
python-pytest-cov))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe79f629bb8..0e969eef306 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8370,8 +8370,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coveralls
- python-pytest
+ (list python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
(synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 108b32d0459..c2926bf7497 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1019,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-pydocstyle
+ (propagated-inputs (list python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -3070,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coveralls
python-cython
python-pytest-cov
python-sphinx
@@ -5678,7 +5677,6 @@ (define-public python-ddlparse
(build-system pyproject-build-system)
(native-inputs
(list python-codecov
- python-coveralls
python-pytest
python-pytest-cov
python-setuptools
@@ -16022,7 +16020,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coveralls python-nose2
+ (native-inputs (list python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -34093,8 +34091,7 @@ (define-public python-minikanren
(invoke "python" "-m" "pytest" "-v" "tests/" "kanren/"))
#t)))))
(native-inputs
- (list python-coveralls
- python-pydocstyle
+ (list python-pydocstyle
python-pytest
python-pytest-cov
python-pylint
@@ -35928,8 +35925,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coveralls
- python-mike
+ (native-inputs (list python-mike
python-mkdocs
python-pytest
python-pytest-runner
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 0a6ff765c30..a9980f1777d 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -434,7 +434,6 @@ (define-public rtv
python-requests python-six))
(native-inputs
(list ncurses
- python-coveralls
python-mock
python-pytest
python-vcrpy))
@@ -467,8 +466,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coveralls
- python-mock
+ (list python-mock
python-pytest
python-vcrpy
python-setuptools
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 358374a5bb7..c5930180e6a 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -790,8 +790,7 @@ (define-public tgcli
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "tests")))))))
(native-inputs
- `(("coveralls" ,python-coveralls)
- ("pytest" ,python-pytest)
+ `(("pytest" ,python-pytest)
("pytest-click" ,python-pytest-click)
("pytest-cov" ,python-pytest-cov)
("mkdocs" ,python-mkdocs)
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 13/32] gnu: python-versioneer: Remove python-pycodestyle native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-13-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-versioneer):
[arguments]<#:phases>: Remove pycodestyle invocation in check phase.
[native-inputs]: Remove python-pycodestyle.

Change-Id: Ida3fd1e16cb8656be2af666203a82cb9f6d65f75
---
gnu/packages/python-xyz.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 18e4d21f136..8e54608678d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32658,11 +32658,9 @@ (define-public python-versioneer
(invoke "python" "setup.py" "make_long_version_py_git")
(invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
(invoke "python" "test/run_pyflakes_src.py")
- (invoke "pyflakes" "test")
- (invoke "pycodestyle" "--max-line-length=88"
- "git_version.py" "versioneer.py")))))))
+ (invoke "pyflakes" "test")))))))
(native-inputs
- (list git-minimal python-pycodestyle python-pyflakes
+ (list git-minimal python-pyflakes
python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 15/32] gnu: python-re-assert: Remove python-covdefaults native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-15-ngraves@ngraves.fr
* gnu/packages/python-check.scm (python-re-assert):
[native-inputs]: Remove python-covdefaults.

Change-Id: Ib30c58b69aef7f255e5893ae6f9a33bdf41ac85d
---
gnu/packages/python-check.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 574a93782ce..3281e5a772b 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1144,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-pytest))
+ (list python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 16/32] build-system/pyproject: Remove python-codecov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-16-ngraves@ngraves.fr
* gnu/packages/android.scm (python-androguard)[native-inputs]: Remove
python-codecov.

* gnu/packages/astronomy.scm (python-wiimatch, python-tweakwcs)
[native-inputs]: Remove python-codecov.

* gnu/packages/python-check.scm (python-pytest-trio):
[arguments]<#:test-flags>: Remove --cov flag.
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-xyz.scm (python-can,
python-ddlparse)[native-inputs]: Remove python-codecov.

Change-Id: Ic7d3789b3b30d3263f61442bb4e55fd332a4d2f6
---
gnu/packages/android.scm | 2 +-
gnu/packages/astronomy.scm | 8 +++-----
gnu/packages/python-check.scm | 5 ++---
gnu/packages/python-xyz.scm | 4 +---
4 files changed, 7 insertions(+), 12 deletions(-)

Toggle diff (86 lines)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index ab42f2be980..7cc1fa4ef05 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1074,7 +1074,7 @@ (define-public python-androguard
(lambda _
(invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-mock python-nose python-nose-timer))
+ (list python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 0ff2511208d..c2d874f8f3f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -4605,8 +4605,7 @@ (define-public python-tweakwcs
python-stsci-imagestats
python-stsci-stimage))
(native-inputs
- (list python-codecov
- python-pytest
+ (list python-pytest
python-pytest-cov
python-scipy
python-setuptools
@@ -5272,9 +5271,8 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-codecov python-pytest python-pytest-cov
- python-pytest-doctestplus python-setuptools-scm
- python-wheel))
+ (native-inputs (list python-pytest python-pytest-cov python-wheel
+ python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
"Optimal matching of weighted N-dimensional image intensity data")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 3281e5a772b..5345a15e108 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1191,7 +1191,7 @@ (define-public python-pytest-trio
(arguments
(list
#:test-flags '(list "-W" "error" "-ra" "-v" "--pyargs"
- "pytest_trio" "--verbose" "--cov" "-k"
+ "pytest_trio" "--verbose" "-k"
(string-append
;; Needs network
"not test_async_yield_fixture_with_nursery"
@@ -1199,8 +1199,7 @@ (define-public python-pytest-trio
;; No keyboard interrupt in our build environment.
" and not test_actual_test"))))
(native-inputs
- (list python-hypothesis python-pytest python-pytest-cov
- python-setuptools python-wheel))
+ (list python-hypothesis python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-async-generator python-outcome python-pytest python-trio))
(home-page "https://github.com/python-trio/pytest-trio")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c4167de452d..ca6d5279d19 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3572,7 +3572,6 @@ (define-public python-can
python-setuptools))
(native-inputs
(list ;; python-canalystii ; Not packed yet
- python-codecov
python-future
python-hypothesis
python-mock
@@ -5675,8 +5674,7 @@ (define-public python-ddlparse
(base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-codecov
- python-pytest
+ (list python-pytest
python-pytest-cov
python-setuptools
python-tox
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 12/32] build-system/pyproject: Remove python-pycodestyle native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-12-ngraves@ngraves.fr
* gnu/packages/python-science.scm (python-scipy):
[native-inputs]: Remove python-pycodestyle.

* gnu/packages/python-xyz.scm (python-jsonargparse, python-lsp-server,
python-orderedmultidict, python-progressbar2, python-stem)
[native-inputs]: Remove python-pycodestyle.

Change-Id: I4518bae13aa0e688bc6e0bb40c07082414e8130f
---
gnu/packages/python-science.scm | 1 -
gnu/packages/python-xyz.scm | 7 ++-----
2 files changed, 2 insertions(+), 6 deletions(-)

Toggle diff (60 lines)
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 9301e82bb60..e20cb56db9c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -296,7 +296,6 @@ (define-public python-scipy
python-doit
python-hypothesis
python-pooch
- python-pycodestyle
python-pydevtool
python-pytest
python-pytest-cov
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c2926bf7497..18e4d21f136 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4510,7 +4510,6 @@ (define-public python-jsonargparse
python-typeshed-client))
(native-inputs
(list python-attrs
- python-pycodestyle
python-pydantic
python-pytest
python-pytest-subtests
@@ -8180,7 +8179,6 @@ (define-public python-lsp-server
python-jedi
python-lsp-jsonrpc
python-pluggy
- python-pycodestyle
python-pydocstyle
python-ujson
python-whatthepatch
@@ -9915,7 +9913,7 @@ (define-public python-orderedmultidict
(propagated-inputs
(list python-six))
(native-inputs
- (list python-flake8 python-pycodestyle python-setuptools python-wheel))
+ (list python-flake8 python-setuptools python-wheel))
(home-page "https://github.com/gruns/orderedmultidict")
(synopsis "Python Ordered Multivalue Dictionary - omdict")
(description "This package contains a library for ordered multivalue
@@ -18660,7 +18658,6 @@ (define-public python-progressbar2
(list python-six python-utils))
(native-inputs
(list python-freezegun
- python-pycodestyle
python-pytest
python-pytest-cache
python-pytest-cov
@@ -22174,7 +22171,7 @@ (define-public python-stem
(invoke "./run_tests.py" "--unit")
#t)))))
(native-inputs
- (list python-mock python-pycodestyle python-pyflakes))
+ (list python-mock python-pyflakes))
(home-page "https://stem.torproject.org/")
(synopsis
"Python controller library that allows applications to interact with Tor")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 14/32] gnu: python-versioneer: Remove python-pyflakes native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-14-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-versioneer):
[arguments]<#:phases>: Remove pyflakes tests.
[native-inputs]: Remove python-pyflakes.

Change-Id: If2b8ab397f2ad25f73c434d28d8382f13d417f94
---
gnu/packages/python-xyz.scm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8e54608678d..c4167de452d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32655,13 +32655,9 @@ (define-public python-versioneer
(invoke "python" "test/git/test_git.py" "-v")
;; Some invocation tests require the network.
;;(invoke "python" "test/git/test_invocations.py" "-v")
- (invoke "python" "setup.py" "make_long_version_py_git")
- (invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
- (invoke "python" "test/run_pyflakes_src.py")
- (invoke "pyflakes" "test")))))))
+ (invoke "python" "setup.py" "make_long_version_py_git")))))))
(native-inputs
- (list git-minimal python-pyflakes
- python-pypa-build python-setuptools python-wheel))
+ (list git-minimal python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
(home-page "https://github.com/python-versioneer/python-versioneer")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 17/32] build-system/pyproject: Remove python-tox native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-17-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-regressions)[native-inputs]:
Remove python-tox.

* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-tox.

* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-tox.

* gnu/packages/logging.scm (tailon)[native-inputs]: Remove python-tox.

* gnu/packages/messaging.scm (python-harmony)[native-inputs]: Remove
python-tox.

* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]: Remove
python-tox.

* gnu/packages/python-web.scm (python-omnipath,
python-sanic)[native-inputs]: Remove python-tox.

* gnu/packages/python-xyz.scm (python-lunr, python-bidict,
python-jsonargparse, python-ddlparse, python-virtualenv-clone,
python-honcho, python-pdfminer-six, python-shshsh,
python-marshmallow-jsonapi, python-apispec-webframeworks, bpython,
python-loguru, python-ansicolors)[native-inputs]: Remove python-tox.

* gnu/packages/radio.scm (chirp)[native-inputs]: Remove python-tox.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-tox.

Change-Id: I39dadb40a73ad1c64ba8b9ef9d1b3fe7d1498b5a
---
gnu/packages/check.scm | 1 -
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/logging.scm | 2 +-
gnu/packages/messaging.scm | 2 --
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 2 --
gnu/packages/python-xyz.scm | 27 ++++++++-------------------
gnu/packages/radio.scm | 3 +--
gnu/packages/terminals.scm | 6 +++---
10 files changed, 13 insertions(+), 33 deletions(-)

Toggle diff (263 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b7116b3f0e2..6042f763f15 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3675,7 +3675,6 @@ (define-public python-pytest-regressions
python-pandas
python-pillow
python-restructuredtext-lint
- python-tox
python-setuptools-scm
python-pytest))
(home-page "https://github.com/ESSS/pytest-regressions")
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 67567a6b310..bfe4ce99fdc 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -273,7 +273,6 @@ (define-public reprotest
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
("python-tlsh" ,python-tlsh)
- ("python-tox" ,python-tox)
("unzip" ,unzip)
("xxd" ,xxd)))
(build-system python-build-system)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 298968d37c6..f5b1e0462bb 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -260,7 +260,6 @@ (define-public python-django-extensions
(native-inputs
(list python-mock
python-factory-boy
- python-tox
python-pytest
python-pytest-cov
python-pytest-django
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index a757c22154f..3c593001d00 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -134,7 +134,7 @@ (define-public tailon
"0xkmrivzilsc9wqr8ms67v7399gxnh7pv5687k4rdpdgz4309fwc"))))
(build-system python-build-system)
(native-inputs
- (list python-tox python-wheel))
+ (list python-wheel))
(inputs
(list python-pyyaml-5 python-sockjs-tornado python-tornado-http-auth
python-tornado python-deepmerge))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cb72bfb3e25..35ff807e12c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3504,8 +3504,6 @@ (define-public python-harmony
(base32
"1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js"))))
(build-system python-build-system)
- (native-inputs
- (list python-tox))
(inputs
(list python-librecaptcha python-keyring python-requests))
(synopsis "Discord account management")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5345a15e108..7f1c73ee0ad 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -419,7 +419,6 @@ (define-public python-vcrpy
python-pytest
python-pytest-cov
python-pytest-httpbin
- python-tox
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
(synopsis "Automatically mock your HTTP interactions")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0e969eef306..fa908ceafd9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2137,7 +2137,6 @@ (define-public python-omnipath
python-pytest-socket
python-requests-mock
python-setuptools-scm
- python-tox
python-setuptools
python-wheel))
(home-page "https://omnipathdb.org/")
@@ -7634,7 +7633,6 @@ (define-public python-sanic
python-setuptools
python-slotscheck
python-towncrier
- python-tox
python-types-ujson
python-uvicorn
python-wheel))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ca6d5279d19..32a18f52d20 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1308,8 +1308,7 @@ (define-public python-lunr
(list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
- python-pytest-timeout
- python-tox))
+ python-pytest-timeout))
(propagated-inputs
(list python-importlib-metadata python-typing-extensions))
(home-page
@@ -2695,8 +2694,7 @@ (define-public python-bidict
python-sortedcollections
python-sortedcontainers
python-sphinx
- python-sphinx-autodoc-typehints
- python-tox))
+ python-sphinx-autodoc-typehints))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-reqs
@@ -4513,7 +4511,6 @@ (define-public python-jsonargparse
python-pytest
python-pytest-subtests
python-responses
- python-tox
python-types-requests
python-setuptools
python-wheel))
@@ -5677,7 +5674,6 @@ (define-public python-ddlparse
(list python-pytest
python-pytest-cov
python-setuptools
- python-tox
python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
@@ -6219,7 +6215,6 @@ (define-public python-virtualenv-clone
(delete-file "tox.ini")
(invoke "pytest" "-vvv" "tests")))))))
(native-inputs (list python-pytest
- python-tox
python-virtualenv
python-wheel
python-tomli
@@ -11332,7 +11327,7 @@ (define-public python-honcho
(base32 "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-mock python-tox which)) ;for tests
+ (list python-pytest python-mock which)) ;for tests
(propagated-inputs
(list python-jinja2))
(arguments
@@ -20125,7 +20120,7 @@ (define-public python-pdfminer-six
(propagated-inputs
(list python-chardet python-cryptography python-sortedcontainers))
(native-inputs
- (list python-nose python-tox))
+ (list python-nose))
(home-page "https://github.com/pdfminer/pdfminer.six")
(synopsis "PDF parser and analyzer")
(description "@code{pdfminer.six} is a community maintained fork of
@@ -21272,9 +21267,7 @@ (define-public python-shshsh
"1wzqyj1a6jj6cyv5ymzy834qm2lyq80yy1kfz0q0zayq9gm1cj7f"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-poetry-core
- python-pytest
- python-tox))
+ (list python-poetry-core python-pytest))
(home-page "https://github.com/zqqqqz2000/shshsh")
(synopsis "Write Shell commands simply and safely within Python")
(description "This package provides a way to write Shell commands from
@@ -25140,8 +25133,7 @@ (define-public python-marshmallow-jsonapi
python-flake8-bugbear
python-flask
python-mock
- python-pytest
- python-tox))
+ python-pytest))
(home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
(synopsis "JSON:API 1.0 formatting with Marshmallow")
(description
@@ -25205,7 +25197,6 @@ (define-public python-apispec-webframeworks
python-pytest
python-pyyaml
python-tornado
- python-tox
python-wheel))
(home-page "https://github.com/marshmallow-code/apispec-webframeworks")
(synopsis "Web framework plugins for apispec")
@@ -26663,7 +26654,7 @@ (define-public bpython
python-watchdog
python-jedi))
(native-inputs
- (list python-sphinx python-mock python-tox python-wheel))
+ (list python-sphinx python-mock python-wheel))
(home-page "https://bpython-interpreter.org/")
(synopsis "Fancy interface to the Python interpreter")
(description "Bpython is a fancy interface to the Python
@@ -32923,7 +32914,6 @@ (define-public python-loguru
python-sphinx
python-sphinx-autobuild
python-sphinx-rtd-theme
- python-tox
python-setuptools
python-wheel))
(home-page "https://github.com/Delgan/loguru")
@@ -35280,8 +35270,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-tox
- python-pytest-cov
+ (list python-pytest-cov
unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 56e674a8edc..bfd601564d8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3171,8 +3171,7 @@ (define-public chirp
python-pep8
python-pytest
python-pytest-mock
- python-pyyaml
- python-tox))
+ python-pyyaml))
(inputs
(list python-future
python-importlib-resources
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index e96ee664eff..a0acaa71769 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,7 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-nose python-tox
+ (native-inputs (list python-nose
python-twine python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
@@ -1224,7 +1224,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1251,7 +1251,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 19/32] gnu: python-immutables: Remove python-mypy native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-19-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-immutables):
[origin]: Use git-fetch to use upstream test-data directory.
[build-system]: Move to pyrpoject-build-system.
[native-inputs]: Remove python-mypy.
[arguments]<#:phases>: Add phase to remove python-mypy native-input.

Change-Id: Ie67f634ffecbc3711f354e915b2fab54a1639925
---
gnu/packages/python-xyz.scm | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index dd2b35eb35d..6fc3f0dbb06 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15819,13 +15819,21 @@ (define-public python-immutables
(version "0.18")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "immutables" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/MagicStack/immutables")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1x4cinh0xbl6p6p2yfm2s07mxxy3lf0zzai9gqpydk4482bwfdjk"))))
+ (base32 "1xjbkgls0dqrvpg4yzkdzz6aayizxcv5chjc5gyynk196wyshw4m"))))
(build-system pyproject-build-system)
- (native-inputs (list python-mypy python-pytest
- python-setuptools python-wheel))
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-mypy-dependency
+ (lambda _
+ (delete-file "tests/test_mypy.py")
+ (delete-file "tests/conftest.py"))))))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/MagicStack/immutables")
(synopsis "High-performance immutable mapping type for Python")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 18/32] build-system/pyproject: Remove python-mypy native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-18-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-poliastro)[native-inputs]: Remove
python-mypy.

* gnu/packages/databases.scm (python-psycopg2)[native-inputs]: Remove
python-mypy.

* gnu/packages/engineering.scm (uranium, cura)[native-inputs]: Remove
python-mypy.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-mypy.

* gnu/packages/machine-learning.scm (python-imbalanced-learn,
python-captum, python-torchmetrics, python-pyro-ppl)[native-inputs]:
Remove python-mypy.

* gnu/packages/python-science.scm (python-scipy)[native-inputs]:
Remove python-mypy.

* gnu/packages/python-web.scm (python-huggingface-hub, python-asgiref,
python-starsessions-for-pytorch-lightning,
python-fastapi)[native-inputs]: Remove python-mypy.

* gnu/packages/python-xyz.scm (python-pyls-black, kalamine,
python-pydantic-cli, python-marshmallow, python-apispec,
python-typeguard, python-trio-typing, python-verspec,
python-catalogue, python-duckdb)[native-inputs]: Remove python-mypy.

* gnu/packages/serialization.scm (python-msgspec)[native-inputs]: Remove
python-mypy.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-mypy.

Change-Id: I947656750aa0c7732291d826641736aaefab274e
---
gnu/packages/astronomy.scm | 1 -
gnu/packages/databases.scm | 1 -
gnu/packages/engineering.scm | 2 --
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 ----
gnu/packages/python-science.scm | 1 -
gnu/packages/python-web.scm | 5 +----
gnu/packages/python-xyz.scm | 22 +++++++++-------------
gnu/packages/serialization.scm | 1 -
gnu/packages/virtualization.scm | 3 +--
10 files changed, 11 insertions(+), 30 deletions(-)

Toggle diff (272 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c2d874f8f3f..426cfd8c88f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2604,7 +2604,6 @@ (define-public python-poliastro
(setenv "HOME" "/tmp"))))))
(native-inputs
(list python-hypothesis
- python-mypy
python-flit-core
python-pytest
python-pytest-cov
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f9202639c53..ad27ec621ca 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4112,7 +4112,6 @@ (define-public python-psycopg
(delete 'sanity-check))))
(native-inputs
(list python-cython-3
- python-mypy
python-psycopg-pool
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2620d5272b6..af79172e53b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3923,7 +3923,6 @@ (define-public uranium
graphviz
pkg-config
python-pytest
- python-mypy
python-certifi
python-twisted))
(propagated-inputs
@@ -4126,7 +4125,6 @@ (define-public cura
(build-system qt-build-system)
(native-inputs
(list python-certifi
- python-mypy
python-pytest
python-requests))
(inputs
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b396a97c0bc..ecc2dc2bb4c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -218,7 +218,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-isort
- python-mypy
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e6f6bfe410d..3e3b7ab8ea8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1920,7 +1920,6 @@ (define-public python-imbalanced-learn
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
(native-inputs (list python-keras
- python-mypy
python-pandas
python-pytest
python-pytest-cov
@@ -4521,7 +4520,6 @@ (define-public python-captum
python-flask-compress
python-ipython
python-ipywidgets
- python-mypy
python-parameterized
python-pytest
python-pytest-cov
@@ -4728,7 +4726,6 @@ (define-public python-torchmetrics
(list python-cloudpickle
python-fire
python-mir-eval
- python-mypy
python-pandas
python-psutil
python-pytest
@@ -5054,7 +5051,6 @@ (define-public python-pyro-ppl
python-isort
python-lap
python-matplotlib
- python-mypy
python-nbformat
python-nbsphinx
python-nbstripout
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index e20cb56db9c..567fa5d1559 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -273,7 +273,6 @@ (define-public python-scipy
'())
(list python-matplotlib
python-mpmath
- python-mypy
python-numpy
python-numpydoc
python-pydata-sphinx-theme
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fa908ceafd9..04712745963 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -196,7 +196,6 @@ (define-public python-huggingface-hub
python-fastapi
python-jedi
python-jinja2
- python-mypy
python-numpy
python-pillow
python-pydantic
@@ -717,7 +716,7 @@ (define-public python-asgiref
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
- (list python-mypy python-pytest python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-typing-extensions))
(home-page "https://github.com/django/asgiref/")
@@ -8957,7 +8956,6 @@ (define-public python-starsessions-for-pytorch-lightning
python-starlette-for-fastapi-0.88))
(native-inputs
(list python-httpx
- python-mypy
python-poetry-core
python-pytest
python-pytest-asyncio
@@ -9003,7 +9001,6 @@ (define-public python-fastapi
python-hatchling
python-isort
python-jose
- python-mypy
python-passlib
python-peewee
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32a18f52d20..dd2b35eb35d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3020,7 +3020,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-isort python-mypy python-pytest
+ (list python-isort python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -6785,7 +6785,7 @@ (define-public kalamine
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs
- (list python-hatchling python-mypy python-pytest))
+ (list python-hatchling python-pytest))
(home-page "https://github.com/OneDeadKey/kalamine")
(synopsis "Keyboard layout maker")
(description
@@ -8002,8 +8002,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-mypy
- python-pytest))
+ (list python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
(description
@@ -23457,6 +23456,8 @@ (define-public python-duckdb
(list
#:test-flags
'(list "--ignore=tests/slow/test_h2oai_arrow.py"
+ ;; stubs require mypy and don't actually check functionality.
+ "--ignore=tests/stubs/test_stubs.py"
;; Don't install anything, thank you.
"-k" "not test_install_non_existent_extension")
#:phases
@@ -23481,7 +23482,6 @@ (define-public python-duckdb
(list pybind11
python-fsspec
python-google-cloud-storage
- python-mypy
python-numpy
python-pandas
python-psutil
@@ -25103,7 +25103,6 @@ (define-public python-marshmallow
(list python-packaging))
(native-inputs
(list python-flake8-bugbear
- python-mypy
python-pytest
python-pytz
python-simplejson
@@ -25165,7 +25164,6 @@ (define-public python-apispec
(native-inputs
(list python-flake8-bugbear
python-marshmallow
- python-mypy
python-pytest
python-pyyaml
python-setuptools
@@ -26582,8 +26580,7 @@ (define-public python-typeguard
;; XXX: These fail when installed as a library:
;; https://github.com/agronholm/typeguard/issues/176
"not usefixtures and not test_cached_module")))))))
- (native-inputs (list python-mypy
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools-scm
python-typing-extensions))
(home-page "https://github.com/agronholm/typeguard")
@@ -29050,8 +29047,7 @@ (define-public python-trio-typing
(native-inputs (list python-attrs python-pytest python-setuptools
python-wheel))
(propagated-inputs
- (list python-mypy python-mypy-extensions python-trio
- python-typing-extensions))
+ (list python-mypy-extensions python-trio python-typing-extensions))
(home-page "https://github.com/python-trio/trio-typing")
(synopsis "Static type checking support for Trio and related projects")
(description
@@ -35483,7 +35479,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-mypy python-pretend python-pytest))
+ (native-inputs (list python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -36230,7 +36226,7 @@ (define-public python-catalogue
"0srdxiil2xys8q1gpc1nvzhvis3a33d8a7amk2i1rlpbg6p36pak"))))
(build-system python-build-system)
(native-inputs (list python-pytest))
- (inputs (list python python-zipp python-typing-extensions python-mypy))
+ (inputs (list python python-zipp python-typing-extensions))
(home-page "https://github.com/explosion/catalogue")
(synopsis "Lightweight function registries for your library")
(description
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 728d6404bb9..b39ce176502 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -719,7 +719,6 @@ (define-public python-msgspec
(native-inputs (list python-attrs
python-gcovr
python-msgpack
- python-mypy
python-pytest
python-setuptools-scm
python-versioneer
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b564bd043cb..b4dce1cc9d6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-mypy python-pyhamcrest python-twine
- python-setuptools python-wheel))
+ (list python-pyhamcrest python-twine python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 20/32] build-system/pyproject: Remove python-isort native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-20-ngraves@ngraves.fr
* gnu/packages/bioinformatics.scm (python-cooler,
scvelo)[native-inputs]: Remove python-isort.

* gnu/packages/databases.scm (aerich)[native-inputs]: Remove
python-isort.

* gnu/packages/django.scm (python-django-taggit)[native-inputs]:
Remove python-isort.

* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-isort.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-isort.

* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-isort.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-isort.

* gnu/packages/machine-learning.scm (python-funsor,
python-pyro-ppl)[native-inputs]: Remove python-isort.

* gnu/packages/mail.scm (python-hyperkitty, postorius)[native-inputs]:
Remove python-isort.

* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-isort.

* gnu/packages/python-check.scm (python-pytest-toolbox)
[native-inputs]: Remove python-pytest-isort.

* gnu/packages/python-web.scm (python-ovh, python-tinycss2,
python-fastapi)[native-inputs]: Remove python-isort.

* gnu/packages/python-xyz.scm (python-jupytext, python-pyls-black,
python-eventlet, python-textdistance,
python-validators)[native-inputs]: Remove python-isort.

* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[native-inputs]: Remove python-isort.

* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-isort.

* gnu/packages/virtualization.scm (python-qemu-qmp)[native-inputs]:
Remove python-isort.

Change-Id: I6dc9a49cdbb10ddd33ea32854f891312d3a29e53
---
gnu/packages/bioinformatics.scm | 2 --
gnu/packages/databases.scm | 1 -
gnu/packages/django.scm | 2 +-
gnu/packages/finance.scm | 1 -
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 +---
gnu/packages/mail.scm | 3 +--
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 4 +---
gnu/packages/python-xyz.scm | 7 ++-----
gnu/packages/sphinx.scm | 2 --
gnu/packages/statistics.scm | 1 -
gnu/packages/virtualization.scm | 1 -
16 files changed, 8 insertions(+), 28 deletions(-)

Toggle diff (277 lines)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index eabee35f70f..3d5d381f0a0 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17971,7 +17971,6 @@ (define-public python-cooler
python-simplejson))
(native-inputs
(list python-hatchling
- python-isort
python-pytest
python-pytest-cov))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
@@ -21815,7 +21814,6 @@ (define-public scvelo
(propagated-inputs
(list python-anndata
python-hnswlib
- python-isort
python-igraph
python-loompy
python-louvain
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ad27ec621ca..9ec7855109c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3251,7 +3251,6 @@ (define-public aerich
(list poetry
python-bandit
python-cryptography
- python-isort
python-pydantic
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f5b1e0462bb..48b1b38a97f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -387,7 +387,7 @@ (define-public python-django-taggit
(lambda _
(invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
(propagated-inputs
- (list python-django python-isort))
+ (list python-django))
(native-inputs
(list python-pytest python-mock))
(home-page
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7579001dd1f..6f70d61f700 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-isort
python-pillow
python-protobuf
python-pyqt
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index be96e6800a3..73644ab2bb4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3263,7 +3263,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-isort
python-pytest
python-pytest-aiohttp
python-readme-renderer
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index bbb19bd4cb8..39215a0ccb6 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -216,7 +216,6 @@ (define-public mdpo
(list python-bump2version
python-flake8-implicit-str-concat
python-flake8-print
- python-isort
python-pytest
python-pytest-cov
python-sphinx
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index ecc2dc2bb4c..f6a58943ecb 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-isort
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3e3b7ab8ea8..d4ce01b0c1b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-isort
- python-nbsphinx
+ (native-inputs (list python-nbsphinx
python-pandas
python-pillow
python-pyro-api
@@ -5048,7 +5047,6 @@ (define-public python-pyro-ppl
(list ninja
jupyter
python-graphviz
- python-isort
python-lap
python-matplotlib
python-nbformat
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5743558e76b..7c4b6f2cb26 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3724,7 +3724,6 @@ (define-public python-hyperkitty
(native-inputs
(list python-beautifulsoup4
python-elasticsearch
- python-isort
python-lxml
python-mock
python-whoosh))
@@ -3763,7 +3762,7 @@ (define-public postorius
(list python-readme-renderer python-mailmanclient
python-django python-django-mailman3))
(native-inputs
- (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+ (list python-beautifulsoup4 python-mock python-vcrpy))
(home-page "https://gitlab.com/mailman/postorius")
(synopsis "Web user interface for GNU Mailman")
(description
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 502ad09a3a6..9c4d56bd384 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 7f1c73ee0ad..d51c5e19bba 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1487,8 +1487,7 @@ (define-public python-pytest-toolbox
(substitute* "setup.cfg"
((".*timeout.*") ""))))))))
(native-inputs
- (list python-pydantic python-pytest python-pytest-isort
- python-setuptools python-wheel))
+ (list python-pydantic python-pytest python-setuptools python-wheel))
(home-page "https://github.com/samuelcolvin/pytest-toolbox")
(synopsis "Numerous useful plugins for Pytest")
(description
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 04712745963..d4988620385 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -976,8 +976,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-isort
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-sphinx
@@ -8999,7 +8998,6 @@ (define-public python-fastapi
(native-inputs (list python-databases
python-flask
python-hatchling
- python-isort
python-jose
python-passlib
python-peewee
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6fc3f0dbb06..f467f5f5794 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
python-autopep8
python-flake8
python-gitpython
- python-isort
python-ipython-genutils
python-jupyter-server
python-pyaml
@@ -3020,7 +3019,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-isort python-pytest
+ (list python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -4242,7 +4241,6 @@ (define-public python-eventlet
python-hatchling
python-hatch-vcs
python-pytest
- python-isort
python-twine))
(arguments
(list
@@ -12910,7 +12908,6 @@ (define-public python-textdistance
#t)))))
(native-inputs
(list python-hypothesis
- python-isort
python-numpy
python-pytest
python-pytest-runner
@@ -25041,7 +25038,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-isort python-pytest))
+ (list python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 2057649ede5..e49e215de79 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -93,7 +93,6 @@ (define-public python-sphinx
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
@@ -191,7 +190,6 @@ (define-public python-sphinx-5
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index bfc69062587..de4fb6e3aa7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2446,7 +2446,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-isort
python-joblib
python-matplotlib
python-pytest
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b4dce1cc9d6..90f46e6f23a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2031,7 +2031,6 @@ (define-public python-qemu-qmp
(native-inputs
(list python-avocado-framework
python-flake8
- python-isort
python-pylint
python-setuptools
python-setuptools-scm
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 21/32] build-system/pyproject: Remove python-twine native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-21-ngraves@ngraves.fr
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-twine.

* gnu/packages/machine-learning.scm (python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-twine.

* gnu/packages/python-check.scm (python-testfixtures)[native-inputs]:
Remove python-twine.

* gnu/packages/python-web.scm (python-translation-finder)
[native-inputs]: Remove python-twine.

* gnu/packages/python-xyz.scm (python-cftime, python-eventlet,
python-eliot, python-arpeggio)[native-inputs]: Remove python-twine.

* gnu/packages/terminals.scm (python-halo)[native-inputs]: Remove
python-twine.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-twine.

Change-Id: Ie9ff17126810dc3e2b17ad42a1f765361401eae7
---
gnu/packages/gettext.scm | 1 -
gnu/packages/machine-learning.scm | 6 ++----
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 6 +-----
gnu/packages/terminals.scm | 3 +--
gnu/packages/virtualization.scm | 2 +-
7 files changed, 7 insertions(+), 15 deletions(-)

Toggle diff (129 lines)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 39215a0ccb6..b3c807c6774 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -221,7 +221,6 @@ (define-public mdpo
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
- python-twine
python-yamllint))
(propagated-inputs
(list python-polib python-pymd4c))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index d4ce01b0c1b..7c3faa94c5e 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5093,8 +5093,7 @@ (define-public python-linear-operator
(native-inputs (list python-flake8-print
python-pytest
python-setuptools
- python-setuptools-scm
- python-twine))
+ python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
(synopsis "Linear operator implementation")
(description "LinearOperator is a PyTorch package for abstracting away the
@@ -5123,8 +5122,7 @@ (define-public python-gpytorch
(native-inputs (list python-flake8-print
python-nbval
python-pytest
- python-setuptools
- python-twine))
+ python-setuptools))
(home-page "https://gpytorch.ai")
(synopsis "Implementation of Gaussian Processes in PyTorch")
(description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index d51c5e19bba..4426e5af2f5 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -245,7 +245,7 @@ (define-public python-testfixtures
(native-inputs
(list python-pytest python-pytest-cov
;;("python-pytest-django" ,python-pytest-django)
- python-twine python-wheel))
+ python-wheel))
(synopsis "Tests components for Python")
(description "Testfixtures is a collection of helpers and mock objects that
are useful when writing automated tests in Python.")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d4988620385..3aadc9060a0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6221,7 +6221,7 @@ (define-public python-translation-finder
(list python-chardet python-pathlib2 python-ruamel.yaml python-six))
(native-inputs
(list python-codecov python-codacy-coverage python-pytest-cov
- python-pytest-runner python-twine))
+ python-pytest-runner))
(home-page "https://weblate.org/")
(synopsis "Translation file finder for Weblate")
(description "This package provides a function to find translation file in
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f467f5f5794..4e6f0e1a29a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3070,7 +3070,6 @@ (define-public python-cftime
python-cython
python-pytest-cov
python-sphinx
- python-twine
python-wheel))
(home-page "https://unidata.github.io/cftime/")
(synopsis "Library for time handling")
@@ -4240,8 +4239,7 @@ (define-public python-eventlet
(list python-black
python-hatchling
python-hatch-vcs
- python-pytest
- python-twine))
+ python-pytest))
(arguments
(list
#:test-flags
@@ -31340,7 +31338,6 @@ (define-public python-eliot
python-sphinx
python-sphinx-rtd-theme
python-testtools
- python-twine
python-twisted))
(home-page "https://github.com/itamarst/eliot/")
(synopsis "Eliot: the logging system that tells you why it happened")
@@ -35908,7 +35905,6 @@ (define-public python-arpeggio
python-mkdocs
python-pytest
python-pytest-runner
- python-twine
python-wheel))
(home-page "https://github.com/textX/Arpeggio")
(synopsis "Packrat parser interpreter for Python")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index a0acaa71769..6a1946719a6 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,8 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-nose
- python-twine python-setuptools python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
(description "Halo is a Python library to display graphical spinners in
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 90f46e6f23a..cf090aec9fc 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2808,7 +2808,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-pyhamcrest python-twine python-setuptools python-wheel))
+ (list python-pyhamcrest python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 23/32] gnu: python-tinycss2: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-23-ngraves@ngraves.fr
* gnu/packages/python-web.scm (python-tinycss2):
[arguments]<#:phases>: Add phase remove-unwanted-dependency to
ignore coverage options.
[native-inputs]: Remove python-pytest-cov.

Change-Id: I853fe3371be84be1655db0ee8d1dca8d23c50ef9
---
gnu/packages/python-web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c73bc6294e9..8c51282c9cb 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5895,11 +5895,18 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'remove-unwanted-dependencies
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-cov
- python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 22/32] build-system/pyproject: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-22-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-astroml, python-casa-formats-io,
python-cdflib, python-czml3, python-poliastro, python-tweakwcs,
python-wiimatch, python-stcal)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/audio.scm (python-pysox)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/backup.scm (borgmatic)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/bioinformatics.scm (python-biom-format, python-pyfaidx,
python-cooler, python-screed)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/build-tools.scm (meson-python)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/check.scm (python-pytest-nunit, python-pytest-timeout,
python-pytest-enabler, python-pytest-perf,
python-pyhamcrest)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/databases.scm (python-alembic)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/dav.scm (vdirsyncer, radicale)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/embedded.scm (mbed-tools)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/fontutils.scm (psautohint)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/geo.scm (python-fiona, python-cartopy)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/graphviz.scm (python-graphviz, python-uqbar)
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/jupyter.scm (python-jupyter-packaging,
python-jupyter-server, python-jupyterlite-core, python-ipydatawidgets)
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/machine-learning.scm (python-persim,
python-scikit-learn-extra, python-imbalanced-learn,
python-keras-application, python-keras-preprocessing, python-keras,
python-tensorly, python-pytorch-geometric, python-captum,
python-torchmetrics, python-pyro-ppl)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/mastodon.scm (python-mastodon-py)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/messaging.scm (zulip-term)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/package-management.scm (python-conda-package-handling):
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/patchutils.scm (pwclient)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/python-check.scm (python-testfixtures, python-vcrpy,
python-pytest-filter-subpackage, python-atpublic, python-sybil,
python-vulture)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-crypto.scm (python-trustme)[native-inputs]:
Remove python-pytest-cov.
(python-certauth)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.

* gnu/packages/python-science.scm (python-scipy, python-trimesh,
python-pandaparallel, python-pyts, python-usetplot, python-pingouin,
python-opt-einsum, python-salib)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/python-web.scm (python-apiron, python-huggingface-hub,
python-portend, python-aiosignal, python-aiostream, python-ovh,
python-cbor2, python-httplib2, python-cheroot, parfive, python-jose,
python-pyscss, python-mechanicalsoup, python-priority, hypercorn,
python-aioftp, python-oauthlib, python-tinycss, python-cssselect2,
python-httpcore, python-wsgiprox, python-venusian, python-cloud-init,
python-siosocks, python-zeep, gunicorn)[native-inputs]: Remove
python-pytest-cov.
(python-warcio)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.

* gnu/packages/python-xyz.scm (python-apprise, python-janus,
python-logbook, python-affine, python-mdit-py-plugins, python-pint,
python-rasterio, python-bidict, python-can, dosage, python-contourpy,
python-portalocker, python-extension-helpers, python-mizani,
python-cligj, python-ddlparse, python-robotframework-pythonlibcore,
python-lsp-server, python-sparse, python-pikepdf, python-imageio,
python-manimpango, python-importlib-resources, python-jaraco-classes,
python-jaraco-collections, python-jaraco-context,
python-jaraco-functools, python-jaraco-test, python-jaraco-text,
python-ipyparallel, python-three-merge, python-seaborn,
python-sentry-sdk, python-sniffio, python-get-version,
python-legacy-api-wrap, python-path, python-pip-run, python-debugpy,
python-notebook, python-ipywidgets, python-qstylizer,
python-cookiecutter, python-pyqtgraph, python-codespell,
python-inflect, python-lazy-loader, python-pymemcache, python-natsort,
python-mwclient, python-flasgger, python-tempora, python-outcome,
python-trio, python-apscheduler, python-iocapture, python-argh,
python-flit, python-watchdog, python-watchgod, python-cmd2,
python-inform, python-qtsass, python-scikit-build, python-minikanren,
python-tablib, nikola, python-ansicolors, python-shtab, python-scooby,
dynaconf, python-pyan3, python-numpydoc, python-loguru,
python-multidict)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/sphinx.scm (python-sphinx-gallery)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/statistics.scm (python-pymc, python-emcee,
python-rpy2)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/task-management.scm (todoman)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/time.scm (python-arrow, python-tzlocal)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/web.scm (anonip, python-tibanna)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/wm.scm (qtile)[native-inputs]: Remove
python-pytest-cov. Add python-coverage.

Change-Id: Ia8c96b18a60b6ceb00b345ef06351eae1a68e070
---
gnu/packages/astronomy.scm | 12 +--
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 9 +-
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 8 +-
gnu/packages/cpp.scm | 1 -
gnu/packages/databases.scm | 2 +-
gnu/packages/dav.scm | 2 -
gnu/packages/django.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 3 +-
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 2 -
gnu/packages/jupyter.scm | 7 +-
gnu/packages/machine-learning.scm | 20 ++---
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 4 +-
gnu/packages/package-management.scm | 1 -
gnu/packages/patchutils.scm | 2 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 11 +--
gnu/packages/python-compression.scm | 9 +-
gnu/packages/python-crypto.scm | 3 +-
gnu/packages/python-science.scm | 16 ++--
gnu/packages/python-web.scm | 58 ++++---------
gnu/packages/python-xyz.scm | 123 +++++++---------------------
gnu/packages/sphinx.scm | 1 -
gnu/packages/statistics.scm | 6 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/time.scm | 2 -
gnu/packages/vpn.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/wm.scm | 1 -
37 files changed, 88 insertions(+), 234 deletions(-)

Toggle diff (290 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 426cfd8c88f..61ab7520aef 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -601,7 +601,7 @@ (define-public python-astroml
(setenv "HOME" "/tmp"))))))
(propagated-inputs (list python-astropy python-matplotlib python-numpy
python-scikit-learn python-scipy))
- (native-inputs (list python-pytest-astropy-header python-pytest-cov
+ (native-inputs (list python-pytest-astropy-header python-pytest
python-pytest-doctestplus python-pytest-remotedata
python-setuptools python-wheel))
(home-page "https://astroml.org")
@@ -2040,8 +2040,7 @@ (define-public python-casa-formats-io
(lambda _
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-openfiles
- python-setuptools))
+ (list python-pytest python-pytest-openfiles python-setuptools))
(propagated-inputs
(list python-astropy python-click python-dask python-numpy))
(home-page "https://casa-formats-io.readthedocs.io/")
@@ -2111,7 +2110,6 @@ (define-public python-cdflib
(list python-astropy
python-hypothesis
python-pytest
- python-pytest-cov
python-pytest-remotedata
python-setuptools-scm
python-xarray
@@ -2228,7 +2226,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-cov
python-pytest-mypy
python-setuptools
python-wheel))
@@ -2606,7 +2603,6 @@ (define-public python-poliastro
(list python-hypothesis
python-flit-core
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-mpl
python-pytest-mypy))
@@ -3386,7 +3382,6 @@ (define-public python-stcal
(list python-cython-3
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -4605,7 +4600,6 @@ (define-public python-tweakwcs
python-stsci-stimage))
(native-inputs
(list python-pytest
- python-pytest-cov
python-scipy
python-setuptools
python-setuptools-scm))
@@ -5270,7 +5264,7 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-pytest python-pytest-cov python-wheel
+ (native-inputs (list python-pytest python-wheel
python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e6d16211fd4..724430dae36 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6197,7 +6197,7 @@ (define-public python-pysox
(propagated-inputs
(list python-numpy python-typing-extensions))
(native-inputs
- (list sox python-pytest python-pytest-cov python-soundfile))
+ (list sox python-pytest python-soundfile))
(home-page "https://github.com/rabitt/pysox")
(synopsis "Python wrapper around SoX")
(description "@code{python-pysox} is a wrapper around the @command{sox}
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 663eb2568fe..566ea06338b 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1357,7 +1357,7 @@ (define-public borgmatic
python-jsonschema
python-requests
python-ruamel.yaml))
- (native-inputs (list python-flexmock python-pytest python-pytest-cov))
+ (native-inputs (list python-flexmock python-pytest))
(home-page "https://torsion.org/borgmatic/")
(synopsis "Simple, configuration-driven backup software")
(description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3d5d381f0a0..5a4cf23eabb 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3010,7 +3010,7 @@ (define-public python-biom-format
;;python-scikit-bio ;mutually recursive dependency
python-scipy))
(native-inputs
- (list python-cython python-pytest python-pytest-cov python-nose))
+ (list python-cython python-pytest python-nose))
(home-page "https://www.biom-format.org")
(synopsis "Biological Observation Matrix (BIOM) format utilities")
(description
@@ -10187,7 +10187,7 @@ (define-public python-screed
(base32 "0slva743xn93h4sl5zg2as4ricnnj5pp6nw9dm4qclk4i9xglkvk"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest-cov
+ (list python-pytest
python-pytest-runner
python-setuptools
python-wheel))
@@ -17920,7 +17920,6 @@ (define-public python-pyfaidx
python-mock
python-numpy
python-pytest
- python-pytest-cov
python-wheel))
(propagated-inputs (list python-setuptools))
(home-page "http://mattshirley.com")
@@ -17970,9 +17969,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-hatchling
- python-pytest
- python-pytest-cov))
+ (list python-hatchling python-pytest))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
(home-page "https://github.com/open2c/cooler")
(synopsis "Sparse binary format for genomic interaction matrices")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 8fec2f8e2f2..29974dfd8b6 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -376,7 +376,6 @@ (define-public meson-python
python-cython
python-gitpython
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/mesonbuild/meson-python")
(synopsis "Meson-based build backend for Python")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6042f763f15..6b16ec7711b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1530,7 +1530,7 @@ (define-public python-pytest-nunit
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;no tests included
(propagated-inputs (list python-attrs python-pytest))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
+ (native-inputs (list python-pytest python-setuptools
python-wheel python-xmlschema))
(home-page "https://github.com/pytest-dev/pytest-nunit")
(synopsis "Pytest plugin for generating NUnit3 test result XML output")
@@ -1796,7 +1796,7 @@ (define-public python-pytest-timeout
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(propagated-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(native-inputs
(list python-pexpect))
(home-page "https://github.com/pytest-dev/pytest-timeout")
@@ -2493,7 +2493,6 @@ (define-public python-pytest-enabler
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -2667,7 +2666,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -3242,7 +3240,7 @@ (define-public python-pyhamcrest
(base32
"05kdzlhs2kvj82pfca13qszszcj6dyrk4b9pbr46x06sq2s4qyls"))))
(native-inputs ;all native inputs are for tests
- (list python-pytest-cov python-mock python-pytest python-hypothesis))
+ (list python-mock python-pytest python-hypothesis))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ba2698056da..9c693fb16c3 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1190,7 +1190,6 @@ (define-public cpplint
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-runner
python-testfixtures))
(home-page "https://github.com/cpplint/cpplint")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9ec7855109c..8abea7ec385 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3763,7 +3763,7 @@ (define-public python-alembic
(base32 "0lxi2g2025lz5k7k5dd5fc1lfijqi2yw6qqyjzp073z6laa8cckw"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-mock python-pytest-cov))
+ (list python-mock python-pytest))
(propagated-inputs
(list python-dateutil python-sqlalchemy python-mako python-editor))
(home-page "https://bitbucket.org/zzzeek/alembic")
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index b30b1ef5a59..0612a72c831 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-flake8
python-pytest-isort
python-pytest-runner
@@ -146,7 +145,6 @@ (define-public vdirsyncer
python-trustme
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpserver
radicale))
(inputs
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 48b1b38a97f..3ab2bc139d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -261,7 +261,6 @@ (define-public python-django-extensions
(list python-mock
python-factory-boy
python-pytest
- python-pytest-cov
python-pytest-django
python-shortuuid))
(home-page
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 1da41415194..542895c8779 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1798,7 +1798,6 @@ (define-public mbed-tools
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-factory-boy
python-requests-mock
python-semver))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index af79172e53b..eaff8546dc4 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2681,7 +2681,6 @@ (define-public python-scikit-rf
(native-inputs (list python-nbval
python-networkx
python-pytest
- python-pytest-cov
python-pytest-mock
python-pyvisa))
(home-page "https://scikit-rf.org/")
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 84eb33d19bf..46b06765f0c 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -856,7 +856,6 @@ (define-public psautohint
(native-inputs
(list psautohint-font-data
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setu
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 25/32] gnu: python-dateutil: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-25-ngraves@ngraves.fr
* gnu/packages/time.scm (python-dateutil):
[native-inputs]: Remove python-pytest-cov.
[arguments]<#:phases>: Add remove-pytest-cov-dep phase.

Change-Id: Id82a147d6e40383ecc2661ac896b65b858c181e0
---
gnu/packages/time.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 1064467020f..ad33306c7cf 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -246,14 +246,20 @@ (define-public python-dateutil
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list ; avoid freezegun dependency
- "--ignore=dateutil/test/test_utils.py"
- "--ignore=dateutil/test/test_rrule.py"
- ;; XXX: Fails to get timezone from /etc/localtime.
- "--ignore=dateutil/test/test_tz.py")))
+ #:test-flags '(list "dateutil/test" "docs"
+ ;; avoid freezegun dependency
+ "--ignore=dateutil/test/test_utils.py"
+ "--ignore=dateutil/test/test_rrule.py"
+ ;; XXX: Fails to get timezone from /etc/localtime.
+ "--ignore=dateutil/test/test_tz.py")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-pytest-cov-dep
+ (lambda _
+ (substitute* "dateutil/test/conftest.py"
+ (("item\\.add_marker\\(pytest\\.mark\\.no_cover\\)")
+ "pass")))))))
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools
- python-setuptools-scm python-wheel))
+ (list python-pytest python-setuptools python-setuptools-scm python-wheel))
(propagated-inputs
(list python-six))
(home-page "https://dateutil.readthedocs.io/en/stable/")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 26/32] build-system/pyproject: Remove python-pytest-isort native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-26-ngraves@ngraves.fr
* gnu/packages/dav.scm (radicale):
[native-inputs]: Remove python-pytest-isort.

* gnu/packages/python-web.scm (python-tinycss):
[arguments]<#:test-flags>: Ignore isort tests.
[native-inputs]: Remove python-pytest-isort.

Change-Id: I706e8c310adbeda49b91c6815d299172ce05df22
---
gnu/packages/dav.scm | 1 -
gnu/packages/python-web.scm | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 0612a72c831..99284220846 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -59,7 +59,6 @@ (define-public radicale
(native-inputs
(list python-pytest
python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8c51282c9cb..340ef0836b4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5862,9 +5862,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not test_speedups")))
+ '(list "-k" "not ISORT and not test_speedups")))
(native-inputs
- (list python-pytest-flake8 python-pytest-isort
+ (list python-pytest-flake8
python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 27/32] build-system/pyproject: Remove python-pytest-black native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-27-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-perf, python-pytest-enabler)
[native-inputs]: Remove python-pytest-black.

* gnu/packages/python-web.scm (python-portend)[native-inputs]:
Remove python-pytest-black.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-legacy-api-wrap, python-path,
python-pip-run, python-inflect, python-isort, python-tempora,
python-sparse)[native-inputs]: Remove python-pytest-black.

Change-Id: Ib46f1c4a3cc33821cda3d7b2172d36158aa812c9
---
gnu/packages/check.scm | 2 --
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 22 +++++-----------------
3 files changed, 5 insertions(+), 20 deletions(-)

Toggle diff (165 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6b16ec7711b..f8ead8df4e4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2491,7 +2491,6 @@ (define-public python-pytest-enabler
python-jaraco-functools
python-toml))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -2664,7 +2663,6 @@ (define-public python-pytest-perf
"and not upstream_url"))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 340ef0836b4..5f19d93ea19 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -311,7 +311,6 @@ (define-public python-portend
(propagated-inputs (list python-tempora))
;; TODO: Add python-pytest-ruff to native-inputs once it has been packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bc4761e4c38..9c15ca8e566 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8686,7 +8686,7 @@ (define-public python-sparse
(list python-numba python-numpy python-scipy))
(native-inputs
(list python-dask python-importlib-metadata python-pytest
- python-pytest-black python-setuptools))
+ python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
(description
@@ -11523,7 +11523,6 @@ (define-public python-importlib-resources
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11653,7 +11652,6 @@ (define-public python-jaraco-classes
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11686,7 +11684,6 @@ (define-public python-jaraco-collections
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -11746,7 +11743,6 @@ (define-public python-jaraco-context
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11780,7 +11776,6 @@ (define-public python-jaraco-functools
(native-inputs
(list python-jaraco-classes
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11840,7 +11835,6 @@ (define-public python-jaraco-test
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11873,7 +11867,6 @@ (define-public python-jaraco-text
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -16255,8 +16248,7 @@ (define-public python-legacy-api-wrap
"06qhp0g543dy98vpa41hwdalvdbsjfc3ldk474yr9sd75mhl8jh3"))))
(build-system python-build-system)
(propagated-inputs
- (list python-get-version python-pytest python-pytest-black
- python-setuptools))
+ (list python-get-version python-pytest python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16516,7 +16508,6 @@ (define-public python-path
python-packaging
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -16621,7 +16612,6 @@ (define-public python-pip-run
(append python-nbformat
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -21059,7 +21049,6 @@ (define-public python-inflect
(propagated-inputs (list python-pydantic))
(native-inputs (list python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -24089,7 +24078,8 @@ (define-public python-isort
(arguments
(list
#:test-flags '(list "tests/unit/" "-k" "not test_gitignore"
- "--ignore=tests/unit/test_deprecated_finders.py")
+ "--ignore=tests/unit/test_deprecated_finders.py"
+ "--ignore=tests/unit/profiles/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-example-plugins
@@ -24107,8 +24097,7 @@ (define-public python-isort
(apply invoke "pip" "--no-cache-dir" "--no-input"
"install" "--user" "--no-deps" example-whls)))))))
(native-inputs
- (list python-black
- python-colorama
+ (list python-colorama
python-hypothesmith
python-libcst-minimal
python-natsort
@@ -25908,7 +25897,6 @@ (define-public python-tempora
(native-inputs
(list python-freezegun
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 24/32] gnu: python-django-contact-form: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-24-ngraves@ngraves.fr
* gnu/packages/django.scm (python-django-contact-form):
[native-inputs]: Remove python-pytest-cov.
[build-system]: Upgrade to pyproject-build-system.
[arguments]<#:phases>: Remove coverage tests for check phase.

Change-Id: I4d0fc406401b7e923f7efa084dbe8ea3753e50fc
---
gnu/packages/django.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3ab2bc139d1..726dd77639e 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -838,16 +838,13 @@ (define-public python-django-contact-form
(sha256
(base32
"1my9hkrylckp5vfqg9b0kncrdlxjnwxll56sdciqn4v19i4wbq1y"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
- (invoke "coverage" "run" "--source" "contact_form"
- "runtests.py"))))))
- (native-inputs
- (list python-coverage))
+ (invoke "python" "runtests.py"))))))
(propagated-inputs
(list python-django))
(home-page "https://github.com/ubernostrum/django-contact-form")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-28-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-enabler, python-pytest-perf):
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/dav.scm (radicale)[native-inputs]: Remove
python-pytest-flake8.

* gnu/packages/jupyter.scm (python-nbstripout)[native-inputs]:
Remove python-pytest-flake8.

* gnu/packages/python-check.scm (python-pytest-csv):
[arguments]<#:test-flags>: Ignore flake8 test.
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/python-web.scm (python-mechanicalsoup,
python-tinycss2)[native-inputs]: Remove python-pytest-flake8.
(python-tinycss):
[arguments]<#:test-flags>: Ignore flake8 tests.
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-context, python-jaraco-functools,
python-jaraco-packaging, python-jaraco-test, python-path,
python-pip-run, python-inflect, python-tempora, python-cairosvg)
[native-inputs]: Remove python-pytest-flake8.

Change-Id: I60ad04391d1c4b081e3293d50b3ac93c6430c7bf
---
gnu/packages/check.scm | 2 --
gnu/packages/dav.scm | 1 -
gnu/packages/jupyter.scm | 1 -
gnu/packages/python-check.scm | 5 +++--
gnu/packages/python-web.scm | 10 ++++------
gnu/packages/python-xyz.scm | 12 +-----------
6 files changed, 8 insertions(+), 23 deletions(-)

Toggle diff (192 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f8ead8df4e4..e8f121e9fe9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2492,7 +2492,6 @@ (define-public python-pytest-enabler
python-toml))
(native-inputs (list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -2665,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 99284220846..b5a1ba749d8 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-flake8
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index c25663e4da6..4bc0bc2a8f4 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -817,7 +817,6 @@ (define-public python-nbstripout
(native-inputs
(list python-pytest
python-pytest-cram
- python-pytest-flake8
python-pytest-runner
python-setuptools
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index fdef98f6c8a..4b5ca23569a 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -214,9 +214,10 @@ (define-public python-pytest-csv
(base32
"17518f2fn5l98lyk9p8r7215c1whi61imzrh6ahrmcksr8w0zz04"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags '(list "--ignore=tests/test_flake8.py")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-xdist
+ (list python-pytest-xdist
python-setuptools
python-tabulate
python-wheel))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5f19d93ea19..2a7d083b9de 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1578,8 +1578,7 @@ (define-public python-mechanicalsoup
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-flake8
- python-pytest-httpbin
+ (list python-pytest-httpbin
python-pytest-mock
python-pytest-runner
python-requests-mock
@@ -5861,10 +5860,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not ISORT and not test_speedups")))
+ '(list "-k" "not ISORT and not FLAKE8 and not test_speedups")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-runner python-setuptools python-wheel))
+ (list python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
(description
@@ -5905,7 +5903,7 @@ (define-public python-tinycss2
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9c15ca8e566..1b3837dddc4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11525,7 +11525,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
@@ -11653,7 +11652,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11744,7 +11742,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11777,7 +11774,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11807,7 +11803,6 @@ (define-public python-jaraco-packaging
(propagated-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-rst.linker
python-setuptools
python-setuptools-scm
@@ -11837,7 +11832,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
@@ -16510,7 +16504,6 @@ (define-public python-path
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden?
(package-properties
@@ -16614,7 +16607,6 @@ (define-public python-pip-run
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21051,7 +21043,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
;; For the version number
python-setuptools-scm
@@ -25899,7 +25890,6 @@ (define-public python-tempora
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-freezegun
python-pytest-mypy
python-setuptools-scm
@@ -29569,7 +29559,7 @@ (define-public python-cairosvg
(list python-cairocffi python-cssselect2 python-defusedxml
python-pillow python-tinycss2))
(native-inputs
- (list python-pytest-flake8 python-pytest-isort python-pytest-runner
+ (list python-pytest-isort python-pytest-runner
python-setuptools python-wheel))
(home-page "https://cairosvg.org/")
(synopsis "SVG to PDF/PS/PNG converter based on Cairo")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 29/32] build-system/pyproject: Remove python-pytest-mypy inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-29-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-czml3, python-poliastro)
[native-inputs]: Remove python-pytest-mypy.

* gnu/packages/check.scm (python-pytest-perf)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/python-web.scm (python-portend)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-path, python-pip-run, python-inflect,
python-tempora, python-loguru, python-portalocker)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/sphinx.scm (python-sphinx, python-sphinx-5):
[propagated-inputs]: Remove python-mypy.

Change-Id: Ia36ca82e0327a886f9c5317e9ef4ffc35dc8ac9d
---
gnu/packages/astronomy.scm | 4 +---
gnu/packages/check.scm | 1 -
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 17 ++---------------
gnu/packages/sphinx.scm | 2 --
5 files changed, 3 insertions(+), 22 deletions(-)

Toggle diff (180 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 61ab7520aef..2b78738f5a8 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2226,7 +2226,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/poliastro/czml3")
@@ -2604,8 +2603,7 @@ (define-public python-poliastro
python-flit-core
python-pytest
python-pytest-doctestplus
- python-pytest-mpl
- python-pytest-mypy))
+ python-pytest-mpl))
(propagated-inputs
(list python-astropy
python-astroquery
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e8f121e9fe9..8eac2b13563 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2664,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2a7d083b9de..425aa9d5d0f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -313,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/portend")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1b3837dddc4..733a60b087d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4928,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-mypy
python-pytest-timeout
python-redis
python-setuptools
@@ -11525,7 +11524,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
(propagated-inputs
@@ -11652,7 +11650,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11684,7 +11681,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.collections")
@@ -11742,7 +11738,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11774,7 +11769,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11832,7 +11826,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.test")
@@ -11863,7 +11856,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.text")
@@ -16503,8 +16495,7 @@ (define-public python-path
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden?
(package-properties
python-path-bootstrap)))))
@@ -16606,8 +16597,7 @@ (define-public python-pip-run
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21043,7 +21033,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
;; For the version number
python-setuptools-scm
python-setuptools
@@ -25891,7 +25880,6 @@ (define-public python-tempora
python-pytest-checkdocs
python-pytest-enabler
python-pytest-freezegun
- python-pytest-mypy
python-setuptools-scm
python-types-freezegun
python-types-pytz
@@ -32828,7 +32816,6 @@ (define-public python-loguru
(propagated-inputs (list python-colorama))
(native-inputs (list python-colorama
python-freezegun
- python-mypy
python-pre-commit
python-pytest
python-pytest-mypy-plugins
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 669120cad0a..35eaef3036e 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -94,7 +94,6 @@ (define-public python-sphinx
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
@@ -191,7 +190,6 @@ (define-public python-sphinx-5
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 30/32] build-system/pyproject: Stop hiding options.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-30-ngraves@ngraves.fr
* gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]
<#:test-flags>: Remove arguments hiding coverage options.

* gnu/packages/python-crypto.scm (python-keyring)
[arguments]<#:test-flags>: Remove arguments hiding coverage options.

* gnu/packages/python-web.scm (python-asgi-csrf, python-asgi-lifespan,
python-openapi-schema-validator, python-openapi-spec-validator,
python-openapi-core)[arguments]<#:test-flags>: Remove arguments hiding
coverage options.
(python-openapi-schema-validator, python-openapi-spec-validator)
[arguments]<#:phases>: Remove 'remove-coverage-pytest-options phase.
(python-cssselect2, python-tinycss2)[arguments]: Remove uneeded field.
(python-jsonpickle)[arguments]<#:test-flags>: Remove uneeded
test-flags.

* gnu/packages/python-xyz.scm (python-cattrs)
[arguments]<#:phases>: Remove arguments hiding coverage options.

Change-Id: Ibe08ecfebf8a24259c8658918d98fe9e5a8925b7
---
gnu/packages/pdf.scm | 6 +---
gnu/packages/python-crypto.scm | 1 -
gnu/packages/python-web.scm | 51 ++++------------------------------
gnu/packages/python-xyz.scm | 4 +--
4 files changed, 7 insertions(+), 55 deletions(-)

Toggle diff (164 lines)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4e260d614de..16d4d9336e3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -816,9 +816,6 @@ (define-public python-pydyf
(sha256
(base32 "18q43g5d9455msipcgd5fvnh8m4a2rz189slzfg80yycjw66rshs"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags #~'("-c" "/dev/null")))
(propagated-inputs (list python-pillow))
(native-inputs
(list ghostscript
@@ -1635,8 +1632,7 @@ (define-public weasyprint
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags #~(list "-c" "/dev/null"
- "-n" (number->string (parallel-job-count)))
+ #:test-flags #~(list "-n" (number->string (parallel-job-count)))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-library-paths
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6965a330624..6139856a906 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -288,7 +288,6 @@ (define-public python-keyring
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list "-c" "/dev/null") ;avoid extra test dependencies
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'workaround-test-failure
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 425aa9d5d0f..a149e561243 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -738,10 +738,7 @@ (define-public python-asgi-csrf
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- ;; Provide a null config to avoid the extraneous dependency on
- ;; python-pytest-coverage.
- #~(list "-c" "/dev/null"
- ;; Disable two failing tests (see:
+ #~(list ;; Disable two failing tests (see:
;; https://github.com/simonw/asgi-csrf/issues/24).
"-k" (string-append
"not (test_multipart "
@@ -780,8 +777,7 @@ (define-public python-asgi-lifespan
(arguments
(list
#:test-flags
- '(list "-c" "/dev/null" ;ignore coverage-related options
- "-k"
+ '(list "-k"
(string-append
;; XXX: Some tests fail because of a 'lifespan.shutdown.failed'
;; extra event, perhaps because our version of trio is older.
@@ -1528,10 +1524,7 @@ (define-public python-jsonpickle
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags
- ;; Prevent running the flake8 and black pytest plugins, which only tests
- ;; style and frequently causes harmless failures.
- '(list "-o" "addopts=''" "tests")
+ #:test-flags '(list "tests")
#:phases
'(modify-phases %standard-phases
(add-before 'check 'pre-check
@@ -2178,13 +2171,7 @@ (define-public python-openapi-schema-validator
(list
#:test-flags
;; This one returns 5 instead of 4 elements
- '(list "-k" "not test_array_prefixitems_invalid")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ '(list "-k" "not test_array_prefixitems_invalid")))
(native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-isodate
@@ -2222,13 +2209,7 @@ (define-public python-openapi-spec-validator
(list
;; These tests attempt to fetch resources from the Internet
#:test-flags '(list "--ignore-glob=tests/integration/validation/**"
- "-k" "not example")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ "-k" "not example")))
(native-inputs
(list python-poetry-core
python-pytest))
@@ -2267,9 +2248,6 @@ (define-public python-openapi-core
(list
#:test-flags
'(list "tests/unit"
- ;; Ignore Pytest configuration in setup.cfg that adds
- ;; unwanted flake8 and coverage options.
- "-c" "/dev/null"
"-k" (string-append
;; Type mismatches
"not TestFlaskOpenAPIRequest"
@@ -5891,14 +5869,6 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'remove-unwanted-dependencies
- (lambda _
- (substitute* "pyproject.toml"
- (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
@@ -5925,17 +5895,6 @@ (define-public python-cssselect2
(sha256
(base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
(build-system pyproject-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-linters
- ;; Their check fails; none of our business.
- (lambda _
- (substitute* '("setup.py" "pyproject.toml")
- (("'pytest-flake8',") "")
- (("'pytest-isort',") "")
- (("--flake8") "")
- (("--isort") "")))))))
(propagated-inputs
(list python-tinycss2))
(native-inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 733a60b087d..2bfeecf33e0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21316,9 +21316,7 @@ (define-public python-cattrs
(substitute* "pyproject.toml"
;; Fix version string
(("dynamic = \\[\"version\"\\]")
- (string-append "version = \"" #$version "\""))
- ;; Just run pytest with no frills
- (("addopts = \"-l.*") "")))))))
+ (string-append "version = \"" #$version "\""))))))))
(native-inputs
(list python-hatchling
python-hatch-vcs
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 31/32] gnu: python-linear-operator: Remove python-flake8-print native-input
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-31-ngraves@ngraves.fr
* gnu/packages/machine-learning.scm (python-linear-operator):
[native-inputs]: Remove pytest-flake8-print.

Change-Id: Iba2670b47e479c20a3f4ae1c703ad9fe815e3764
---
gnu/packages/machine-learning.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index a3c598ba1c8..cc33a3e9762 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5082,8 +5082,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8-print
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools
python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
--
2.41.0
N
N
Nicolas Graves wrote on 10 May 09:55 +0200
[PATCH 32/32] gnu: abjad-ext-ipython: Remove uneeded inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240510075605.6303-32-ngraves@ngraves.fr
* gnu/packages/music.scm (abjad-ext-ipython):
[arguments]<#:phases>: Remove unwanted dev dependencies in phase
losen-requirements.
[native-inputs]: Remove python-black, python-flake8, python-isort,
python-mypy, python-pytest-cov, python-iniconfig,
python-pytest-helpers-namespace.
[propagated-inputs]: Remove python-sphinx-autodoc-typehints.

Change-Id: Id337da7731bc04d69831096b31f52e0e4c6a13c0
---
gnu/packages/music.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5420a140657..45daa9438ae 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1790,7 +1790,9 @@ (define-public abjad-ext-ipython
(substitute* "setup.py"
;; Don't require a specific version of abjad.
(("abjad==")
- "abjad>="))))
+ "abjad>=")
+ ;; XXX: Remove unwanted dev dependencies.
+ (("\"(black|flake8|isort|mypy|pytest)[^,]*,") ""))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
@@ -1800,17 +1802,9 @@ (define-public abjad-ext-ipython
(invoke "jupyter" "nbconvert" "--to=html"
"--ExecutePreprocessor.enabled=True" "tests/test.ipynb")))))))
(native-inputs
- (list lilypond
- python-black
- python-flake8
- python-iniconfig
- python-isort
- python-mypy
- python-pytest
- python-pytest-cov
- python-pytest-helpers-namespace))
+ (list lilypond python-pytest))
(propagated-inputs
- (list abjad jupyter python-sphinx-autodoc-typehints))
+ (list abjad jupyter))
(home-page "https://abjad.github.io")
(synopsis "Abjad IPython Extension")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 00/32] Remove unwanted native-inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-1-ngraves@ngraves.fr
Simply rebased the v1, ontop of 69980.

Nicolas Graves (32):
guix: import: pypi: Ignore pypi-ignored-inputs.
build-system/pyproject: Ignore unwanted pytest flags.
build-system/pyproject: Remove python-black input.
build-system/pyproject: Remove python-pylint native-input.
build-system/pyproject: Remove python-flake8 inputs.
build-system/pyproject: Remove python-coverage input.
gnu: python-cram: Remove python-coverage native-input.
gnu: u-boot-tools: Remove python-coverage native-input.
gnu: python-aiosqlite: Remove python-coverage native-input.
gnu: python-openid: Remove python-coverage native-input.
build-system/pyproject: Remove python-coveralls native-input.
build-system/pyproject: Remove python-pycodestyle native-input.
gnu: python-versioneer: Remove python-pycodestyle native-input.
gnu: python-versioneer: Remove python-pyflakes native-input.
gnu: python-re-assert: Remove python-covdefaults native-input.
build-system/pyproject: Remove python-codecov native-input.
build-system/pyproject: Remove python-tox native-input.
build-system/pyproject: Remove python-mypy native-input.
gnu: python-immutables: Remove python-mypy native-input.
build-system/pyproject: Remove python-isort native-input.
build-system/pyproject: Remove python-twine native-input.
build-system/pyproject: Remove python-pytest-cov native-input.
gnu: python-tinycss2: Remove python-pytest-cov native-input.
gnu: python-django-contact-form: Remove python-pytest-cov
native-input.
gnu: python-dateutil: Remove python-pytest-cov native-input.
build-system/pyproject: Remove python-pytest-isort native-input.
build-system/pyproject: Remove python-pytest-black native-input.
build-system/pyproject: Remove python-pytest-flake8 native-input.
build-system/pyproject: Remove python-pytest-mypy inputs.
build-system/pyproject: Stop hiding options.
gnu: python-linear-operator: Remove python-flake8-print native-input
gnu: abjad-ext-ipython: Remove uneeded inputs.

gnu/packages/android.scm | 6 +-
gnu/packages/astronomy.scm | 31 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 31 +-
gnu/packages/bootloaders.scm | 17 +-
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 21 +-
gnu/packages/cpp.scm | 4 +-
gnu/packages/databases.scm | 17 +-
gnu/packages/dav.scm | 4 -
gnu/packages/diffoscope.scm | 2 -
gnu/packages/django.scm | 12 +-
gnu/packages/ebook.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 7 +-
gnu/packages/finance.scm | 6 +-
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 9 +-
gnu/packages/gettext.scm | 4 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 6 +-
gnu/packages/graphviz.scm | 5 -
gnu/packages/jupyter.scm | 8 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/machine-learning.scm | 64 +---
gnu/packages/mail.scm | 3 +-
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 6 +-
gnu/packages/music.scm | 23 +-
gnu/packages/package-management.scm | 7 +-
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 6 +-
gnu/packages/potassco.scm | 3 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-check.scm | 29 +-
gnu/packages/python-compression.scm | 21 +-
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-science.scm | 21 +-
gnu/packages/python-web.scm | 175 +++--------
gnu/packages/python-xyz.scm | 414 +++++++-------------------
gnu/packages/radio.scm | 3 +-
gnu/packages/serialization.scm | 1 -
gnu/packages/simulation.scm | 2 -
gnu/packages/sphinx.scm | 7 -
gnu/packages/statistics.scm | 14 +-
gnu/packages/syndication.scm | 8 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/telegram.scm | 3 +-
gnu/packages/terminals.scm | 12 +-
gnu/packages/textutils.scm | 3 -
gnu/packages/time.scm | 20 +-
gnu/packages/version-control.scm | 1 -
gnu/packages/virtualization.scm | 6 +-
gnu/packages/vpn.scm | 2 -
gnu/packages/web.scm | 6 +-
gnu/packages/wm.scm | 2 -
gnu/packages/xml.scm | 2 +-
guix/build/pyproject-build-system.scm | 99 +++++-
guix/import/pypi.scm | 21 +-
guix/lint.scm | 12 +-
tests/pypi.scm | 3 +-
62 files changed, 405 insertions(+), 809 deletions(-)

--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 01/32] guix: import: pypi: Ignore pypi-ignored-inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-2-ngraves@ngraves.fr
* guix/import/pypi.scm (pypi-ignored-inputs): New variable.
(compute-inputs): Use it.

* tests/pypi.scm (parse-requires.txt): Add ignored input to test the
feature.

* guix/lint.scm (check-inputs-should-be-native): Adapt list.
(check-inputs-should-not-be-an-input-at-all): Use pypi-ignored-list.

Change-Id: I774e526c5a090026e778ee44049637174a1dca95
---
guix/import/pypi.scm | 21 ++++++++++++++++++---
guix/lint.scm | 12 +++++++-----
tests/pypi.scm | 3 ++-
3 files changed, 27 insertions(+), 9 deletions(-)

Toggle diff (119 lines)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6719fde330a..d4b70061e86 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2022 Vivien Kraus <vivien@planete-kraus.eu>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -61,6 +62,7 @@ (define-module (guix import pypi)
#:use-module (guix upstream)
#:use-module ((guix licenses) #:prefix license:)
#:export (%pypi-base-url
+ pypi-ignored-inputs
parse-requires.txt
parse-wheel-metadata
specification->requirement-name
@@ -77,6 +79,18 @@ (define %pypi-base-url
;; Base URL of the PyPI API.
(make-parameter "https://pypi.org/pypi/"))
+(define pypi-ignored-inputs
+ ;; This list contains packages that are useful for development or quality
+ ;; testing, but that most of the time are not necessary to have as an input.
+ (list "argparse" ; native
+ "tox" ; test wrapper for other environments
+ "codecov" "coverage" ; coverage
+ "black" "isort" "pycodestyle" "pep8" ; style
+ "pyflakes" "flake8" "pylint" "mypy" ; style+lint
+ "coveralls" "twine" ; upload integration tools
+ "pytest-isort" "pytest-flake8" "pytest-cov" "pytest-black"
+ "pytest-pep8" "pytest-mypy" "pytest-pep8" "pre-commit")) ; variants
+
(define non-empty-string-or-false
(match-lambda
("" #f)
@@ -424,9 +438,10 @@ (define (compute-inputs source-url wheel-url archive)
"Given the SOURCE-URL and WHEEL-URL of an already downloaded ARCHIVE, return
the corresponding list of <upstream-input> records."
(define (requirements->upstream-inputs deps type)
- (filter-map (match-lambda
- ("argparse" #f)
- (name (upstream-input
+ (filter-map (lambda (name)
+ (if (member name pypi-ignored-inputs)
+ #f
+ (upstream-input
(name name)
(downstream-name (python->package-name name))
(type type))))
diff --git a/guix/lint.scm b/guix/lint.scm
index 68d532968de..f689cc2a2a8 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -71,6 +71,7 @@ (define-module (guix lint)
hg-reference-url)
#:autoload (guix bzr-download) (bzr-reference?
bzr-reference-url)
+ #:use-module ((guix import pypi) #:select (pypi-ignored-inputs))
#:use-module (guix import stackage)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
@@ -557,14 +558,12 @@ (define (check-inputs-should-be-native package)
"m4"
"qttools-5"
"yasm" "nasm" "fasm"
- "python-coverage"
"python-cython"
"python-docutils"
"python-mock"
"python-nose"
"python-pbr"
"python-pytest"
- "python-pytest-cov"
"python-setuptools-scm"
"python-sphinx"
"scdoc"
@@ -586,9 +585,12 @@ (define (check-inputs-should-be-native package)
(define (check-inputs-should-not-be-an-input-at-all package)
;; Emit a warning if some inputs of PACKAGE are likely to should not be
;; an input at all.
- (let ((input-names '("python-setuptools"
- "python-pip"
- "python-pre-commit")))
+ (let ((input-names (append
+ '("python-setuptools"
+ "python-pip"
+ "pre-commit")
+ (map (cut string-append "python-" <>)
+ pypi-ignored-inputs))))
(map (lambda (input)
(make-warning
package
diff --git a/tests/pypi.scm b/tests/pypi.scm
index 42b39cde730..fe01ab3beb3 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -97,6 +97,7 @@ (define test-requires.txt "\
[test]
pytest (>=2.5.0)
+pytest-cov # read but ignored
")
;; Beaker contains only optional dependencies.
@@ -244,7 +245,7 @@ (define-syntax-rule (with-pypi responses body ...)
(map specification->requirement-name test-specifications))
(test-equal "parse-requires.txt"
- (list '("foo" "bar") '("pytest"))
+ (list '("foo" "bar") '("pytest" "pytest-cov"))
(mock ((ice-9 ports) call-with-input-file
call-with-input-string)
(parse-requires.txt test-requires.txt)))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 02/32] build-system/pyproject: Ignore unwanted pytest flags.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-3-ngraves@ngraves.fr
* guix/build/pyproject-build-system.scm : Ignore unwanted pytest flags.

Change-Id: Ib9f1602e5af11227e5b7ce124f0f9be4fa2b78e4
---
guix/build/pyproject-build-system.scm | 99 ++++++++++++++++++++++++++-
1 file changed, 96 insertions(+), 3 deletions(-)

Toggle diff (137 lines)
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index 947d240114a..2df9f2f4798 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,8 @@ (define-module (guix build pyproject-build-system)
add-installed-pythonpath
site-packages
python-version
- pyproject-build))
+ pyproject-build
+ with-guix-pytest-plugin))
;;; Commentary:
;;;
@@ -142,7 +144,94 @@ (define* (build #:key outputs build-backend backend-path configure-flags #:allow
wheel-dir
config-settings)))
-(define* (check #:key tests? test-backend test-flags #:allow-other-keys)
+(define pytest-default-ignore-alist
+ '(("cov" . ("--cov" "--cov-reset" "--cov-report" "--cov-config"
+ "--no-cov-on-fail" "--no-cov" "--cov-fail-under"
+ "--cov-append" "--cov-branch" "--cov-context"))
+ ("mypy" . ("--mypy" "--mypy-config-file" "--mypy-ignore-missing-imports"))
+ ("isort" . ("--isort"))
+ ("flake8" . ("--flake8"))
+ ("black" . ("--black"))
+ ("flakes" . ("--flakes"))
+ ("pep8" . ("--pep8"))))
+
+(define (pytest-ignore-flags-plugin flags)
+ "This function converts an list of flags into a string that can
+ be instantiated as a python pytest plugin."
+ (format #f "\
+import pytest
+
+def pytest_addoption(parser):
+ group = parser.getgroup('guix','Guix ignored options')
+ options = [~{~s, ~}]
+ for option in options:
+ group.addoption(option, action='append', nargs='?')"
+ flags))
+
+(define (call-with-guix-pytest-plugin inputs thunk)
+ "This function emulates command line options provided by pytest plugins in
+the absence of the plugins defining these options.
+
+This is done by selecting absent plugins, gettings their flags defined in
+PYTEST-DEFAULT-IGNORE-ALIST, and generating the plugin from there with
+PYTEST-IGNORE-FLAGS-PLUGIN."
+ (let* ((former-path (getenv "PYTHONPATH"))
+ (input-names
+ (map car
+ (filter (match-lambda
+ ((name . _)
+ (if (string-prefix? "python-pytest-" name)
+ name
+ #f))
+ ( _ #f))
+ inputs)))
+ (filtered-flags
+ (filter identity
+ (append-map
+ (match-lambda
+ ((group . flags)
+ (if (member (string-append "python-pytest-" group)
+ input-names)
+ (list #f)
+ flags))
+ (_ (list #f)))
+ pytest-default-ignore-alist)))
+ (dir (string-append
+ (if (access? (dirname (getcwd)) W_OK)
+ (dirname (getcwd))
+ ;; fallback if we're already out-of-source
+ (getcwd))
+ "/.guix-pytest")))
+ (dynamic-wind
+ (lambda ()
+ (setenv "PYTHONPATH"
+ (string-append
+ (if former-path
+ (string-append former-path ":")
+ "")
+ dir))
+ (setenv "PYTEST_PLUGINS"
+ (string-append
+ (if (getenv "PYTEST_PLUGINS")
+ (string-append former-path ",")
+ "")
+ "pytest_guix_plugin"))
+ (mkdir-p dir)
+ (with-output-to-file (string-append dir "/__init__.py")
+ (lambda _ (display "")))
+ (with-output-to-file (string-append dir "/pytest_guix_plugin.py")
+ (lambda _
+ (display (pytest-ignore-flags-plugin filtered-flags)))))
+ thunk
+ (lambda ()
+ (setenv "PYTHONPATH" former-path)
+ (unsetenv "PYTEST_PLUGINS")))))
+
+(define-syntax-rule (with-guix-pytest-plugin inputs exp ...)
+ "Evaluate EXP in a context where the Guix pytest plugin is added."
+ (call-with-guix-pytest-plugin inputs (lambda () exp ...)))
+
+(define* (check #:key inputs tests? test-backend test-flags #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
;; Unfortunately with PEP 517 there is no common method to specify test
@@ -165,7 +254,8 @@ (define* (check #:key tests? test-backend test-flags #:allow-other-keys)
(format #t "Using ~a~%" use-test-backend)
(match use-test-backend
('pytest
- (apply invoke pytest "-vv" test-flags))
+ (with-guix-pytest-plugin inputs
+ (apply invoke pytest "-vv" test-flags)))
('nose
(apply invoke nosetests "-v" test-flags))
('nose2
@@ -386,3 +476,6 @@ (define* (pyproject-build #:key inputs (phases %standard-phases)
(apply python:python-build #:inputs inputs #:phases phases args))
;;; pyproject-build-system.scm ends here
+;;; Local Variables:
+;;; eval: (put 'with-guix-pytest-plugin 'scheme-indent-function 1)
+;;; End:
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 03/32] build-system/pyproject: Remove python-black input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-4-ngraves@ngraves.fr
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-liana-py, scvelo)[native-inputs]: Remove python-black.

* gnu/packages/databases.scm (datasette):
[arguments]<#:test-flags>: Ignore black tests.
<#:phases>: Remove parts related to black in relax-requirements
added phase.
[native-inputs]: Remove python-black.

* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-black.

* gnu/packages/graph.scm (python-graphtools)[native-inputs]: Remove
python-black.

* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-hyperopt, python-captum,
python-pyro-ppl)[native-inputs]: Remove python-black.

* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]:
Remove python-black.

* gnu/packages/python-web.scm (python-ovh, python-openai,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-black.

* gnu/packages/python-xyz.scm (python-pydantic-cli, python-imageio,
python-update-checker, python-eliot, python-minikanren,
python-jupytext)[native-inputs]: Remove python-black.
(ptpython)[propagated-inputs]: Remove python-black.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-black.

Change-Id: Ie8098afda264bf9a5ab2cfe5d915bc7a41fdc604
---
gnu/packages/bioinformatics.scm | 11 +++--------
gnu/packages/databases.scm | 8 ++------
gnu/packages/finance.scm | 1 -
gnu/packages/graph.scm | 1 -
gnu/packages/machine-learning.scm | 11 +++--------
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 8 +++-----
gnu/packages/python-xyz.scm | 15 +++++----------
gnu/packages/virtualization.scm | 3 +--
9 files changed, 18 insertions(+), 43 deletions(-)

Toggle diff (272 lines)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d4a39fd3e1a..adeb7b1c3be 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
@@ -2278,10 +2277,7 @@ (define-public python-liana-py
python-tqdm
tzdata))
(native-inputs
- (list python-black
- python-poetry-core
- python-pytest
- python-pytest-cov))
+ (list python-poetry-core python-pytest python-pytest-cov))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
@@ -21838,8 +21834,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-hypothesis
python-pytest
python-setuptools-scm
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 67e6ced7c32..96b2c2a0437 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5537,16 +5537,13 @@ (define-public datasette
" or test_custom_query_with_unicode_characters"
" or test_searchmode)")
"-n" (number->string (parallel-job-count))
- "-m" "not serial") ;cannot run in parallel
+ "-m" "not serial" ;cannot run in parallel
+ "--ignore=tests/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
- ;; The package needlessly specifies exact versions
- ;; of dependencies, when it works fine with others.
(substitute* "setup.py"
- (("(black)==[0-9\\.]+" _ package)
- package)
(("click-default-group-wheel")
"click-default-group")))))))
(propagated-inputs
@@ -5569,7 +5566,6 @@ (define-public datasette
python-uvicorn))
(native-inputs
(list python-beautifulsoup4
- python-black
python-cogapp
python-pip
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3c32a220c4e..7d1efde8187 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-black
python-isort
python-pillow
python-protobuf
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eda8365a424..033027a5aa9 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-black
python-coverage
python-coveralls
python-nose
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index d5ce3bfe7de..494d7174859 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-isort
python-nbsphinx
python-pandas
@@ -1923,8 +1922,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-keras
python-mypy
python-pandas
@@ -2359,8 +2357,7 @@ (define-public python-hyperopt
python-six
python-tqdm))
(native-inputs
- (list python-black
- python-nose
+ (list python-nose
python-pymongo
python-pytest
python-wheel))
@@ -4525,7 +4522,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-black
python-flake8
python-flask
python-flask-compress
@@ -5064,7 +5060,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-black
python-flake8
python-graphviz
python-isort
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index e3f0499fecb..ca87289a1e1 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-flake8
python-flask
python-httplib2
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e417fc2bb47..4f5d7baab97 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
@@ -2171,7 +2170,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
@@ -8974,8 +8973,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d81de891c4f..0388cefee4c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
(native-inputs
(list git-minimal
python-autopep8
- python-black
python-flake8
python-gitpython
python-isort
@@ -8029,8 +8028,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
@@ -10812,7 +10810,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-black python-flake8 python-fsspec python-pytest
+ (list python-flake8 python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -22112,8 +22110,7 @@ (define-public ptpython
(arguments
`(#:tests? #f)) ;there are no tests
(propagated-inputs
- (list python-appdirs python-black python-jedi python-prompt-toolkit
- python-pygments))
+ (list python-appdirs python-jedi python-prompt-toolkit python-pygments))
(home-page "https://github.com/jonathanslenders/ptpython")
(synopsis "Python Read-Eval-Print-Loop with nice IDE-like features")
(description
@@ -27295,7 +27292,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-black python-flake8 python-pytest))
+ (native-inputs (list python-flake8 python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31409,8 +31406,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-dask
python-flake8
python-hypothesis
@@ -34165,7 +34161,6 @@ (define-public python-minikanren
python-pytest
python-pytest-cov
python-pylint
- python-black
python-sympy
python-versioneer
python-coverage))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 6d28b32c863..85ad5031059 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pyhamcrest
python-setuptools
python-twine
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 04/32] build-system/pyproject: Remove python-pylint native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-5-ngraves@ngraves.fr
* gnu/packages/potassco.scm (python-clingraph):
[native-inputs]: Remove python-pylint.

* gnu/packages/python-xyz.scm (python-mediapy, python-fastjsonschema,
python-trio)[native-inputs]: Remove python-pylint.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-pylint.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-pylint.

Change-Id: If6a20e0b790f7157013a6868bba9e4a8d7e5ba28
---
gnu/packages/potassco.scm | 3 +--
gnu/packages/python-xyz.scm | 3 ---
gnu/packages/syndication.scm | 2 --
gnu/packages/terminals.scm | 5 ++---
4 files changed, 3 insertions(+), 10 deletions(-)

Toggle diff (94 lines)
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 9af307b4a90..054f9e9b180 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -563,8 +563,7 @@ (define-public python-clingraph
python-jsonschema
python-networkx
python-setuptools))
- (native-inputs (list dot2tex graphviz python-pylint python-pytest
- python-wheel))
+ (native-inputs (list dot2tex graphviz python-pytest python-wheel))
(home-page "https://github.com/potassco/clingraph")
(synopsis "Visualizer for graphs defined as logic programs")
(description
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0388cefee4c..8d4ce3f9844 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4440,7 +4440,6 @@ (define-public python-mediapy
python-pillow))
(native-inputs
(list python-flit-core
- python-pylint
python-pytest
python-pytest-xdist))
(home-page "https://github.com/google/mediapy")
@@ -17189,7 +17188,6 @@ (define-public python-fastjsonschema
(list python-colorama
python-json-spec
python-jsonschema
- python-pylint
python-pytest
python-pytest-benchmark
python-pytest-cache
@@ -29079,7 +29077,6 @@ (define-public python-trio
(list python-astor
python-ipython
python-jedi
- python-pylint
python-pyopenssl
python-pytest
python-pytest-xdist
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index bbb89099b06..0f12f94d0bc 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -437,7 +437,6 @@ (define-public rtv
python-coveralls
python-coverage
python-mock
- python-pylint
python-pytest
python-vcrpy))
(home-page "https://github.com/michael-lazar/rtv")
@@ -472,7 +471,6 @@ (define-public tuir
(list python-coverage
python-coveralls
python-mock
- python-pylint
python-pytest
python-setuptools
python-vcrpy
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 8d9157fd949..90dc011a70e 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1199,7 +1199,6 @@ (define-public python-halo
(native-inputs
(list python-coverage
python-nose
- python-pylint
python-setuptools
python-tox
python-twine
@@ -1230,7 +1229,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-coverage python-nose python-pylint
+ (native-inputs (list python-coverage python-nose
python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
@@ -1258,7 +1257,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-coverage python-nose python-pylint
+ (native-inputs (list python-coverage python-nose
python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 05/32] build-system/pyproject: Remove python-flake8 inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-6-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-crds)[native-inputs]: Remove
python-flake8.

* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-biom-format)[native-inputs]: Remove python-flake8.

* gnu/packages/ebook.scm (calibre)[native-inputs]: Remove
python-flake8.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-flake8.

* gnu/packages/finance.scm (python-mt-940)[native-inputs]: Remove
python-flake8.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-flake8.

* gnu/packages/gettext.scm (python-mdpo)[native-inputs]: Remove
python-flake8.

* gnu/packages/graph.scm (python-pygsp)[native-inputs]: Remove
python-flake8.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-flake8.

* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-captum, python-pyro-api,
python-pyro-ppl, python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-flake8.

* gnu/packages/music.scm (python-mutagen):
[arguments]<#:test-flags>: Ignore flake8 quality tests.
[native-inputs]: Remove python-flake8.

* gnu/packages/protobuf.scm (python-pure-protobuf):
[arguments]<#:phases>: Remove flake8 invocation from check phase.
[native-inputs]: Remove python-flake8.

* gnu/packages/python-web.scm (python-ovh, python-furl,
python-httplib2, python-http-ece, python-woob,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-flake8.

* gnu/packages/python-xyz.scm (python-apispec,
python-apispec-webframeworks, python-apprise, python-colorful,
python-pymd4c, python-pyls-black, python-docx, python-flasgger,
python-imageio, python-importlib-ressources, python-jaraco-test,
python-seaborn, python-progressbar2, python-inflect,
python-argcomplete, python-diff-cover, python-validators,
python-marshmallow, python-marshmallow-jsonapi, python-yq,
python-update-checker, python-eliot, python-dateparser,
python-jinja2-cli, python-nikola, python-verspec, python-mike,
python-arpeggio, python-versioneer, python-codespell)[native-inputs]:
Remove python-flake8.

* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-flake8.

* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[propagated-inputs]: Remove python-flake8.

* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-flake8.

* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-flake8.

* gnu/packages/wm.scm (qtile)[native-inputs]: Remove python-flake8.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-flake8.

Change-Id: I196a9c0b7497106c8f98598535cb8e0ea667481c
---
gnu/packages/astronomy.scm | 3 +-
gnu/packages/bioinformatics.scm | 7 +---
gnu/packages/ebook.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/finance.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graph.scm | 3 +-
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 15 ++------
gnu/packages/music.scm | 4 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-web.scm | 12 ++----
gnu/packages/python-xyz.scm | 62 +++++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/sphinx.scm | 2 -
gnu/packages/statistics.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/vpn.scm | 1 -
gnu/packages/wm.scm | 1 -
20 files changed, 36 insertions(+), 90 deletions(-)

Toggle diff (407 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c05f8e51885..02d0726b9be 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2188,8 +2188,7 @@ (define-public python-crds
python-roman-datamodels
python-stsynphot
python-requests))
- (native-inputs (list python-flake8
- python-ipython
+ (native-inputs (list python-ipython
python-lockfile
python-mock
python-nose
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index adeb7b1c3be..aa7f2988191 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
(synopsis
@@ -3006,7 +3005,6 @@ (define-public python-biom-format
(propagated-inputs
(list python-anndata
python-click
- python-flake8
python-future
python-h5py
python-numpy
@@ -21834,8 +21832,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools-scm
python-wheel))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 16d4fcd6e36..3d536e59add 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -154,7 +154,6 @@ (define-public calibre
(native-inputs
(list bash-minimal
pkg-config
- python-flake8
python-pyqt-builder
qtbase-5 ; for qmake
xdg-utils))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f082f346278..610fb53087b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2679,7 +2679,6 @@ (define-public python-scikit-rf
python-qtpy
python-scipy))
(native-inputs (list python-coverage
- python-flake8
python-nbval
python-networkx
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7d1efde8187..7579001dd1f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2307,9 +2307,7 @@ (define-public python-mt-940
;; Remove custom --cov flags.
(delete-file "pytest.ini")
(invoke "pytest" "-vv")))))))
- (native-inputs (list python-flake8
- python-pytest
- python-pyyaml))
+ (native-inputs (list python-pytest python-pyyaml))
(home-page "https://mt940.readthedocs.io/")
(synopsis "Python parser for MT940-encoded SWIFT data")
(description
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 81a854f8a2a..69cc7e6ddc5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3265,7 +3265,6 @@ (define-public python-geopy
(native-inputs
(list python-async-generator
python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1408cc4cb46..bbb19bd4cb8 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -214,7 +214,6 @@ (define-public mdpo
(build-system python-build-system)
(native-inputs
(list python-bump2version
- python-flake8
python-flake8-implicit-str-concat
python-flake8-print
python-isort
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 033027a5aa9..eb8aa17fdfe 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -564,8 +564,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-flake8
- python-pytest))
+ (list python-coverage python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index db40b99928a..b396a97c0bc 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-flake8
python-isort
python-mypy
python-pytest
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 494d7174859..bf09c9ec4c1 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-flake8
- python-isort
+ (native-inputs (list python-isort
python-nbsphinx
python-pandas
python-pillow
@@ -1922,8 +1921,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-flake8
- python-keras
+ (native-inputs (list python-keras
python-mypy
python-pandas
python-pytest
@@ -4522,7 +4520,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-flake8
python-flask
python-flask-compress
python-ipython
@@ -5010,8 +5007,7 @@ (define-public python-pyro-api
(build-system python-build-system)
(arguments '(#:tests? #false)) ;requires pyro
(native-inputs
- (list python-flake8
- python-ipython
+ (list python-ipython
python-pytest
python-sphinx
python-sphinx-rtd-theme))
@@ -5060,7 +5056,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-flake8
python-graphviz
python-isort
python-lap
@@ -5107,8 +5102,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-pytest
python-setuptools
python-setuptools-scm
@@ -5139,7 +5133,6 @@ (define-public python-gpytorch
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
(native-inputs (list python-coverage
- python-flake8
python-flake8-print
python-nbval
python-pytest
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ab3fe970997..ad026f5d359 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3968,6 +3968,7 @@ (define-public python-mutagen
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags '(list "--ignore=tests/quality/test_flake8.py")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'remove-hypothesis-deadlines
@@ -3978,8 +3979,7 @@ (define-public python-mutagen
(("( +)@given" all spaces)
(string-append spaces "@settings(deadline=None)\n" all))))))))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools
python-wheel))
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8ca730df3c3..502ad09a3a6 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-flake8 python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov python-isort))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -477,8 +477,6 @@ (define-public python-pure-protobuf
(lambda _
(invoke "pytest" "--cov-report" "term-missing" "--cov"
"pure_protobuf")
- (invoke "flake8" "pure_protobuf" "tests"
- "--ignore=F541")
(invoke "isort" "-rc" "-c" "pure_protobuf" "tests"))))))
(home-page "https://pypi.org/project/pure-protobuf/")
(synopsis "Protobuf implementation using dataclasses")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4f5d7baab97..ba378088cf8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -978,7 +978,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
@@ -1240,8 +1239,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
@@ -1274,7 +1271,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
@@ -7313,7 +7309,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
@@ -8333,8 +8329,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8973,8 +8968,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8d4ce3f9844..3ca12d05ee5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -320,7 +320,6 @@ (define-public python-apprise
(native-inputs (list python-babel
python-coverage
python-cryptography
- python-flake8
python-paho-mqtt
python-pytest
python-pytest-cov
@@ -1183,8 +1182,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-flake8 python-pytest python-setuptools
- python-wheel))
+ (list python-coverage python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -2370,7 +2368,7 @@ (define-public python-pymd4c
(inputs
(list md4c))
(native-inputs
- (list python-flake8 python-pkgconfig pkg-config))
+ (list python-pkgconfig pkg-config))
(home-page "https://github.com/dominickpastore/pymd4c")
(synopsis "Python bindings for MD4C")
(description
@@ -3028,7 +3026,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-flake8 python-isort python-mypy python-pytest
+ (list python-isort python-mypy python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -7006,7 +7004,6 @@ (define-public python-docx
(build-system pyproject-build-system)
(native-inputs
(list behave
- python-flake8
python-mock
python-pyparsing
python-pytest
@@ -10809,7 +10806,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-flake8 python-fsspec python-pytest
+ (list python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -11587,8 +11584,7 @@ (define-public python-importlib-resources
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
- (list python-flake8
- python-pytest
+ (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -11910,8 +11906,7 @@ (define-public python-jaraco-test
(arguments
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
- (native-inputs (list python-flake8
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -13710,8 +13705,7 @@ (define-public python-seaborn
python-scipy
python-statsmodels))
(native-inputs
- (list python-flake8
- python-flit-core
+ (list python-flit-core
python-ipykernel
python-nbconvert
python-numpydoc
@@ -18695,8 +18689,7 @@ (define-public python-progressbar2
(propagated-inputs
(list python-six python-utils))
(native-inputs
- (list python-flake8
- python-freezegun
+ (list python-freezegun
python-pycodestyle
python-pytest
python-pytest-cache
@@ -20052,8 +20045,7 @@ (define-public python-codespell
(inputs
(list python-chardet))
(native-inputs
- (l
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 06/32] build-system/pyproject: Remove python-coverage input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-7-ngraves@ngraves.fr
* gnu/packages/android.scm (python-androguard):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt 'check phase replacement.

* gnu/packages/astronomy.scm (python-asdf-astropy, python-astropy,
python-poliastro)[native-inputs]: Remove python-coverage.

* gnu/packages/bioinformatics.scm (python-ega-download-client,
python-scikit-bio, python-cooler)[native-inputs]: Remove
python-coverage.

* gnu/packages/check.scm (python-pytest-randomly,
python-pytest-flakes, python-aiounittest)[native-inputs]: Remove
python-coverage.

* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-coverage.

* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-coverage.

* gnu/packages/django.scm (python-django-haystack)[native-inputs]:
Remove python-coverage.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-coverage.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-coverage.

* gnu/packages/gpodder.scm (gpodder)[native-inputs]: Remove
python-coverage.

* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coverage.

* gnu/packages/jupyter.scm (python-jupyter-packaging)[native-inputs]:
Remove python-coverage.

* gnu/packages/machine-learning.scm (onnx, onnx-optimizer,
python-lightning-utilities, python-pytorch-lightning,
python-torchmetrics, python-gpytorch)[native-inputs]: Remove
python-coverage.

* gnu/packages/music.scm (python-pylast)[native-inputs]: Remove
python-coverage.

* gnu/packages/package-management.scm (python-anaconda-client,
conda)[native-inputs]: Remove python-coverage.

* gnu/packages/python-check.scm (python-vcrpy,
python-re-assert)[native-inputs]: Remove python-coverage.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-coverage.

* gnu/packages/python-web.scm (python-ovh, python-flask-misaka,
python-zope-interface, python-zope-hookable, python-url,
python-transaction, python-sanic, python-woob,
python-flask-combo-jsonapi)[native-inputs]: Remove python-coverage.

* gnu/packages/python-xyz.scm (python-apprise, python-arpeggio,
python-affine, python-colorful, python-lunr, python-mdit-py-plugins,
python-bidict, python-sh, python-cftime, python-can,
python-jsonargparse, python-extension-helpers, python-pyjwt,
python-virtualenv-clone, python-lsp-server, python-pikepdf,
python-tasklogger, python-notebook, python-structlog, binwalk,
python-argcomplete, python-attrs, python-yq, python-stone,
python-identify, python-nodeenv, python-anyio, python-forbiddenfruit,
python-watchgod, python-eliot, python-pem, python-scikit-build,
python-minikanren, nikola, python-verspec, python-mike)
[native-inputs]: Remove python-coverage.

* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-coverage.

* gnu/packages/statistics.scm (python-emcee,
python-rpy2)[native-inputs]: Remove python-coverage.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coverage.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-coverage.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-coverage.

* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Remove
python-coverage.

* gnu/packages/web.scm (python-httpretty)[native-inputs]: Remove
python-coverage.

* gnu/packages/xml.scm (python-xmltodict)[native-inputs]: Remove
python-coverage.

Change-Id: I66b28e624aac94f1a2f6e4fae5cdb444193cd8d9
---
gnu/packages/android.scm | 6 +--
gnu/packages/astronomy.scm | 7 +--
gnu/packages/bioinformatics.scm | 8 ++--
gnu/packages/check.scm | 7 ++-
gnu/packages/cpp.scm | 3 +-
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/engineering.scm | 3 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 3 +-
gnu/packages/jupyter.scm | 2 +-
gnu/packages/machine-learning.scm | 10 +---
gnu/packages/music.scm | 3 +-
gnu/packages/package-management.scm | 6 +--
gnu/packages/python-check.scm | 5 +-
gnu/packages/python-compression.scm | 12 ++---
gnu/packages/python-web.scm | 20 ++++----
gnu/packages/python-xyz.scm | 72 +++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/statistics.scm | 6 +--
gnu/packages/syndication.scm | 4 +-
gnu/packages/terminals.scm | 9 ++--
gnu/packages/textutils.scm | 1 -
gnu/packages/version-control.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/xml.scm | 2 +-
27 files changed, 63 insertions(+), 137 deletions(-)

Toggle diff (383 lines)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index cbfbd6522f4..ab42f2be980 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1072,11 +1072,9 @@ (define-public python-androguard
(replace 'check
;; Adapted from .travis.yml
(lambda _
- (invoke "nosetests" "--with-coverage" "--with-timer"
- "--timer-top-n" "50"))))))
+ (invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-coverage python-mock python-nose
- python-nose-timer))
+ (list python-codecov python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 02d0726b9be..7589ecbb8ae 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1678,7 +1678,6 @@ (define-public python-astropy
(native-inputs
(list pkg-config
python-colorlog
- python-coverage
python-cython-3
python-extension-helpers
python-h5py
@@ -2606,8 +2605,7 @@ (define-public python-poliastro
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-mypy
python-flit-core
python-pytest
@@ -4955,8 +4953,7 @@ (define-public python-asdf-astropy
(add-before 'check 'set-home-env
(lambda _ (setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-h5py
+ (list python-h5py
python-pandas
python-pytest
python-pytest-astropy
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index aa7f2988191..d8994cf65fa 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2767,8 +2767,7 @@ (define-public python-ega-download-client
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
(native-inputs
- (list python-coverage
- python-mock
+ (list python-mock
python-pyfakefs
python-pytest
python-responses
@@ -5360,7 +5359,7 @@ (define-public python-scikit-bio
python-requests
python-scipy))
(native-inputs
- (list python-coverage python-pytest))
+ (list python-pytest))
(home-page "https://scikit-bio.org")
(synopsis "Data structures, algorithms and educational resources for bioinformatics")
(description
@@ -17972,8 +17971,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-coverage
- python-hatchling
+ (list python-hatchling
python-isort
python-pytest
python-pytest-cov))
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 880d3cb46f3..b7116b3f0e2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1617,8 +1617,7 @@ (define-public python-pytest-randomly
"not reordered "
"and not test_it_runs_before_stepwise "
"and not test_entrypoint_injection"))))))))
- (native-inputs (list python-coverage
- python-factory-boy
+ (native-inputs (list python-factory-boy
python-faker
python-numpy
python-pytest-xdist))
@@ -2715,7 +2714,7 @@ (define-public python-pytest-flakes
(add-installed-pythonpath inputs outputs)
(invoke "py.test" "-vv" "-k" "not test_syntax_error"))))))
(native-inputs
- (list python-coverage python-pytest python-pytest-pep8))
+ (list python-pytest python-pytest-pep8))
(propagated-inputs
(list python-pyflakes))
(home-page "https://github.com/fschulze/pytest-flakes")
@@ -3568,7 +3567,7 @@ (define-public python-aiounittest
#t)))))
(propagated-inputs (list python-wrapt))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page
"https://github.com/kwarunek/aiounittest")
(synopsis "Test asyncio code more easily")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8a0bd62d6b6..ba2698056da 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1189,8 +1189,7 @@ (define-public cpplint
(setenv "GUIX_PYTHONPATH"
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-cov
python-pytest-runner
python-testfixtures))
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d6..67567a6b310 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -269,7 +269,6 @@ (define-public reprotest
`(("diffoscope" ,diffoscope)
("help2man" ,help2man)
("libfaketime" ,libfaketime)
- ("python-coverage" ,python-coverage)
("python-docutils" ,python-docutils)
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4a271eaf0b5..298968d37c6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -495,7 +495,6 @@ (define-public python-django-haystack
(list python-django))
(native-inputs
(list gdal
- python-coverage
python-dateutil
python-geopy
python-mock
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 610fb53087b..2620d5272b6 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2678,8 +2678,7 @@ (define-public python-scikit-rf
python-pyqtgraph
python-qtpy
python-scipy))
- (native-inputs (list python-coverage
- python-nbval
+ (native-inputs (list python-nbval
python-networkx
python-pytest
python-pytest-cov
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 69cc7e6ddc5..806120e939d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3264,7 +3264,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-coverage
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index f9102d3a447..0786010471f 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -64,7 +64,6 @@ (define-public gpodder
(build-system python-build-system)
(native-inputs
(list intltool
- python-coverage
python-minimock
python-pytest
python-pytest-cov
@@ -173,7 +172,7 @@ (define-public python-mygpoclient
"1fi5x6k1mngr0iviw2s4n1f3y2x7pwqy5ivkcrjdprzvwr37f0mh"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-minimock python-nose))
+ (list python-minimock python-nose))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eb8aa17fdfe..f83a23dd0be 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coverage
python-coveralls
python-nose
python-nose2
@@ -564,7 +563,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-pytest))
+ (list python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 9175780b748..6600aab6c6b 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -512,7 +512,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-coverage python-pytest
+ (list python-pypa-build python-pytest
python-pytest-cov python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index bf09c9ec4c1..19f73d562e7 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1364,7 +1364,6 @@ (define args
(list cmake
googletest
pybind11
- python-coverage
python-nbval
python-pytest
python-pytest-runner))
@@ -1443,8 +1442,7 @@ (define-public onnx-optimizer
#~(modify-phases #$phases
(delete 'relax-requirements)))))
(native-inputs
- (list cmake python-pytest python-pytest-runner python-nbval
- python-coverage))
+ (list cmake python-pytest python-pytest-runner python-nbval))
(inputs
(list onnx protobuf pybind11))
(propagated-inputs
@@ -4487,7 +4485,6 @@ (define-public python-lightning-utilities
(build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging
python-typing-extensions))
- (native-inputs (list python-coverage))
(home-page "https://github.com/Lightning-AI/utilities")
(synopsis "PyTorch Lightning sample project")
(description "This package provides common Python utilities and GitHub
@@ -4701,7 +4698,6 @@ (define-public python-pytorch-lightning
(native-inputs
(list python-aiohttp
python-cloudpickle
- python-coverage
python-flaky
python-pympler
python-pytest
@@ -4731,7 +4727,6 @@ (define-public python-torchmetrics
python-typing-extensions))
(native-inputs
(list python-cloudpickle
- python-coverage
python-fire
python-mir-eval
python-mypy
@@ -5132,8 +5127,7 @@ (define-public python-gpytorch
#~(list "-k" (string-append "not test_deprecated_methods"
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
- (native-inputs (list python-coverage
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-nbval
python-pytest
python-setuptools
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ad026f5d359..fb9ff038de5 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4072,8 +4072,7 @@ (define-public python-pylast
;; https://github.com/pylast/pylast/issues/105
(arguments '(#:tests? #f))
(native-inputs
- (list python-coverage python-pytest python-flaky python-pyyaml
- python-setuptools-scm))
+ (list python-pytest python-flaky python-pyyaml python-setuptools-scm))
(home-page "https://github.com/pylast/pylast")
(synopsis "Python interface to Last.fm and Libre.fm")
(description "A Python interface to Last.fm and other API-compatible
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index feed16ebcef..4e7e46bf1b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1100,8 +1100,7 @@ (define-public python-anaconda-client
(list python-clyent python-nbformat python-pyyaml python-requests
python-setuptools))
(native-inputs
- (list python-coverage
- python-dateutil
+ (list python-dateutil
python-freezegun
python-mock
python-pillow
@@ -1286,8 +1285,7 @@ (define-public conda
;; XXX: This is dragged in by libarchive and is needed at runtime.
zstd))
(native-inputs
- (list python-coverage
- python-flaky
+ (list python-flaky
python-pytest-timeout
python-pytest-xprocess
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ca87289a1e1..eb48ae3fadf 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-coverage
- python-flake8
+ (list python-flake8
python-flask
python-httplib2
python-ipaddress
@@ -1145,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-coverage python-pytest))
+ (list python-covdefaults python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 34a9cd73a20..b2d789c92d0 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coverage
python-coveralls
python-hypothesis
python-pyannotate
@@ -247,8 +246,7 @@ (define-public python-pybcj
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-cov
python-setuptools-scm
@@ -281,8 +279,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-coverage python-pytest
- python-pytest-cov))
+ (list python-setuptools python-pytest python-pytest-cov))
(home-page "https://github.com/miurahr/bcj-cffi")
(synopsis "Branch / Call /Jump CFFI library in Python")
(
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 07/32] gnu: python-cram: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-8-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-cram):
[native-inputs]: Remove python-coverage.
[build-system]: Move to pyproject-build-system.
[arguments]<#:phases>: Adapt check and patch-source phases
to coverage removal.

Change-Id: I83fafcdcfbc977f9d3e3411d01d23d9a0e120ec6
---
gnu/packages/python-xyz.scm | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b849f6fdaa2..f45f375f38e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15086,25 +15086,17 @@ (define-public python-cram
;; causes the line showing the default shell to break into two
;; lines, but the test expects a single line...
(("env\\['COLUMNS'\\] = '80'")
- "env['COLUMNS'] = '160'"))
-
- (substitute* "Makefile"
- ;; Recent versions of python-coverage have caused the test
- ;; coverage to decrease (as of version 0.7). Allow that.
- (("--fail-under=100")
- "--fail-under=90"))
-
- #t))
+ "env['COLUMNS'] = '160'"))))
(replace 'check
;; The test phase uses the built library and executable.
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(setenv "PATH" (string-append (getenv "PATH") ":"
(assoc-ref outputs "out") "/bin"))
- (invoke "make" "test"))))))
- (build-system python-build-system)
+ (invoke "make" "quicktest"))))))
+ (build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-setuptools python-wheel which))
+ (list python-setuptools python-wheel which))
(synopsis "Simple testing framework for command line applications")
(description
"Cram is a functional testing framework for command line applications.
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 08/32] gnu: u-boot-tools: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-9-ngraves@ngraves.fr
* gnu/packages/bootloaders.scm (u-boot-tools):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt patch phase.

Change-Id: I94394544079197b4a3f8c53cc0b3d78d1f5dc8be
---
gnu/packages/bootloaders.scm | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 0e7bc66bd75..cf568b2bd6a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -802,8 +802,7 @@ (define-public u-boot-tools
(name "u-boot-tools")
(native-inputs
(modify-inputs (package-native-inputs u-boot)
- (prepend python-coverage
- python-filelock
+ (prepend python-filelock
python-pycryptodomex
python-pytest
python-pytest-xdist
@@ -820,14 +819,6 @@ (define-public u-boot-tools
(("/bin/false") (which "false")))
(substitute* "tools/dtoc/fdt_util.py"
(("'cc'") "'gcc'"))
- (substitute* "tools/u_boot_pylib/test_util.py"
- ;; python3-coverage is simply called coverage in guix.
- (("python3-coverage") "coverage")
-
- ;; Don't require 100% coverage since it's brittle and can
- ;; fail with newer versions of coverage or dependencies.
- (("raise ValueError\\('Test coverage failure'\\)")
- "print('Continuing anyway since Guix does not care :O')"))
(substitute* "test/run"
;; Make it easier to find test failures.
(("#!/bin/bash") "#!/bin/bash -x")
@@ -838,9 +829,9 @@ (define-public u-boot-tools
;; FIXME: test_spl fails, needs further investiation
(("test_ofplatdata or test_handoff or test_spl")
"test_ofplatdata or test_handoff")
- ;; FIXME: code coverage not working
- (("run_test \"binman code coverage\"")
- "# run_test \"binman code coverage\"")
+ ;; Disable code coverage tests.
+ (("run_test \"(\\w+) code coverage\"" all)
+ (string-append "# " all))
;; This test would require internet access.
(("\\./tools/buildman/buildman") (which "true")))
(substitute* "test/py/tests/test_sandbox_exit.py"
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 10/32] gnu: python-openid: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-11-ngraves@ngraves.fr
* gnu/packages/python-web.scm (python-openid):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Rewrite check phase.

Change-Id: Id4ea5abc531f5fd84b60ff22407eb608f1e6ac29
---
gnu/packages/python-web.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ffac7968e02..5e585d7b60d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2338,17 +2338,18 @@ (define-public python-openid
"1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "coverage" "run" "-m"
- "unittest" "openid.test.test_suite")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "python" "-m" "unittest" "openid.test.test_suite")
+ (format #t "test suite not run~%")))))))
(propagated-inputs
(list python-defusedxml))
(native-inputs
- (list python-coverage python-psycopg2 python-django))
+ (list python-psycopg2 python-django))
(home-page "https://github.com/necaris/python3-openid")
(synopsis "OpenID support for servers and consumers")
(description "This library provides OpenID authentication for Python, both
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 09/32] gnu: python-aiosqlite: Remove python-coverage native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-10-ngraves@ngraves.fr
* gnu/packages/databases.scm (python-aiosqlite):
[arguments]<#:phases>: Adapt check phase.
[native-inputs]: Remove python-coverage.

Change-Id: I165d174426022f0603223e3def91ffe280f15899
---
gnu/packages/databases.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 96b2c2a0437..f9202639c53 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3935,11 +3935,8 @@ (define-public python-aiosqlite
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "python" "-m" "coverage" "run" "-m"
- "aiosqlite.tests")
- (invoke "python" "-m" "coverage" "report")))))))
+ (invoke "python" "-m" "aiosqlite.tests")))))))
(native-inputs (list python-flit-core
- python-coverage
python-mypy))
(home-page "https://github.com/jreese/aiosqlite")
(synopsis
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 11/32] build-system/pyproject: Remove python-coveralls native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-12-ngraves@ngraves.fr
* gnu/packages/geo.scm (python-cartopy)[native-inputs]: Remove
python-coveralls.

* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coveralls.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-py7zr)[native-inputs]: Remove python-coveralls.

* gnu/packages/python-science.scm (python-trimesh)[native-inputs]:
Remove python-coveralls.

* gnu/packages/python-web.scm (python-flask-combo-jsonapi)
[native-inputs]: Remove python-coveralls.

* gnu/packages/python-xyz.scm (python-affine, python-cftime,
python-ddlparse, python-tasklogger, python-minikanren,
python-arpeggio)[native-inputs]: Remove python-coveralls.

* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coveralls.

* gnu/packages/telegram.scm (tgcli)[native-inputs]: Remove
python-coveralls.

Change-Id: I47b3c21f985175876618f1457b242e6841eb6d3b
---
gnu/packages/geo.scm | 3 +--
gnu/packages/graph.scm | 3 +--
gnu/packages/python-compression.scm | 2 --
gnu/packages/python-science.scm | 3 +--
gnu/packages/python-web.scm | 3 +--
gnu/packages/python-xyz.scm | 12 ++++--------
gnu/packages/syndication.scm | 4 +---
gnu/packages/telegram.scm | 3 +--
8 files changed, 10 insertions(+), 23 deletions(-)

Toggle diff (179 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 806120e939d..be96e6800a3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1479,8 +1479,7 @@ (define-public python-cartopy
(inputs
(list geos))
(native-inputs
- (list python-coveralls
- python-cython
+ (list python-cython
python-pytest
python-pytest-cov
python-pytest-mpl
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index f83a23dd0be..d66a3676fd2 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coveralls
python-nose
python-nose2
python-pandas
@@ -563,7 +562,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coveralls python-pytest))
+ (list python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index b2d789c92d0..5faf7b2a3cb 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coveralls
python-hypothesis
python-pyannotate
python-pytest
@@ -474,7 +473,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coveralls
python-libarchive-c
python-py-cpuinfo
python-pyannotate
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index f82feab0963..9301e82bb60 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -653,8 +653,7 @@ (define-public python-trimesh
(("\\$MESH_PRE")
"'$MESH_PRE'")))))))
(native-inputs
- (list python-coveralls
- python-pyinstrument
+ (list python-pyinstrument
python-pytest
python-pytest-cov))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5e585d7b60d..8265ef41aff 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8376,8 +8376,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coveralls
- python-pytest
+ (list python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
(synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f45f375f38e..b2a5d234eab 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1019,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-pydocstyle
+ (propagated-inputs (list python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -3070,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coveralls
python-cython
python-pytest-cov
python-sphinx
@@ -5678,7 +5677,6 @@ (define-public python-ddlparse
(build-system pyproject-build-system)
(native-inputs
(list python-codecov
- python-coveralls
python-pytest
python-pytest-cov
python-setuptools
@@ -16027,7 +16025,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coveralls python-nose2
+ (native-inputs (list python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -34103,8 +34101,7 @@ (define-public python-minikanren
(invoke "python" "-m" "pytest" "-v" "tests/" "kanren/"))
#t)))))
(native-inputs
- (list python-coveralls
- python-pydocstyle
+ (list python-pydocstyle
python-pytest
python-pytest-cov
python-pylint
@@ -35943,8 +35940,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coveralls
- python-mike
+ (native-inputs (list python-mike
python-mkdocs
python-pytest
python-pytest-runner
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 397a477972e..d102548bb9c 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -434,7 +434,6 @@ (define-public rtv
python-requests python-six))
(native-inputs
(list ncurses
- python-coveralls
python-mock
python-pytest
python-vcrpy))
@@ -467,8 +466,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coveralls
- python-mock
+ (list python-mock
python-pytest
python-setuptools
python-vcrpy
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 358374a5bb7..c5930180e6a 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -790,8 +790,7 @@ (define-public tgcli
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "tests")))))))
(native-inputs
- `(("coveralls" ,python-coveralls)
- ("pytest" ,python-pytest)
+ `(("pytest" ,python-pytest)
("pytest-click" ,python-pytest-click)
("pytest-cov" ,python-pytest-cov)
("mkdocs" ,python-mkdocs)
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 12/32] build-system/pyproject: Remove python-pycodestyle native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-13-ngraves@ngraves.fr
* gnu/packages/python-science.scm (python-scipy):
[native-inputs]: Remove python-pycodestyle.

* gnu/packages/python-xyz.scm (python-jsonargparse, python-lsp-server,
python-orderedmultidict, python-progressbar2, python-stem)
[native-inputs]: Remove python-pycodestyle.

Change-Id: I4518bae13aa0e688bc6e0bb40c07082414e8130f
---
gnu/packages/python-science.scm | 1 -
gnu/packages/python-xyz.scm | 7 ++-----
2 files changed, 2 insertions(+), 6 deletions(-)

Toggle diff (60 lines)
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 9301e82bb60..e20cb56db9c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -296,7 +296,6 @@ (define-public python-scipy
python-doit
python-hypothesis
python-pooch
- python-pycodestyle
python-pydevtool
python-pytest
python-pytest-cov
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b2a5d234eab..0b618024383 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4510,7 +4510,6 @@ (define-public python-jsonargparse
python-typeshed-client))
(native-inputs
(list python-attrs
- python-pycodestyle
python-pydantic
python-pytest
python-pytest-subtests
@@ -8180,7 +8179,6 @@ (define-public python-lsp-server
python-jedi
python-lsp-jsonrpc
python-pluggy
- python-pycodestyle
python-pydocstyle
python-ujson
python-whatthepatch
@@ -9925,7 +9923,7 @@ (define-public python-orderedmultidict
(propagated-inputs
(list python-six))
(native-inputs
- (list python-flake8 python-pycodestyle python-setuptools python-wheel))
+ (list python-flake8 python-setuptools python-wheel))
(home-page "https://github.com/gruns/orderedmultidict")
(synopsis "Python Ordered Multivalue Dictionary - omdict")
(description "This package contains a library for ordered multivalue
@@ -18664,7 +18662,6 @@ (define-public python-progressbar2
(list python-six python-utils))
(native-inputs
(list python-freezegun
- python-pycodestyle
python-pytest
python-pytest-cache
python-pytest-cov
@@ -22178,7 +22175,7 @@ (define-public python-stem
(invoke "./run_tests.py" "--unit")
#t)))))
(native-inputs
- (list python-mock python-pycodestyle python-pyflakes))
+ (list python-mock python-pyflakes))
(home-page "https://stem.torproject.org/")
(synopsis
"Python controller library that allows applications to interact with Tor")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 13/32] gnu: python-versioneer: Remove python-pycodestyle native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-14-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-versioneer):
[arguments]<#:phases>: Remove pycodestyle invocation in check phase.
[native-inputs]: Remove python-pycodestyle.

Change-Id: Ida3fd1e16cb8656be2af666203a82cb9f6d65f75
---
gnu/packages/python-xyz.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0b618024383..3f5cac16d45 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32668,11 +32668,9 @@ (define-public python-versioneer
(invoke "python" "setup.py" "make_long_version_py_git")
(invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
(invoke "python" "test/run_pyflakes_src.py")
- (invoke "pyflakes" "test")
- (invoke "pycodestyle" "--max-line-length=88"
- "git_version.py" "versioneer.py")))))))
+ (invoke "pyflakes" "test")))))))
(native-inputs
- (list git-minimal python-pycodestyle python-pyflakes
+ (list git-minimal python-pyflakes
python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 14/32] gnu: python-versioneer: Remove python-pyflakes native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-15-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-versioneer):
[arguments]<#:phases>: Remove pyflakes tests.
[native-inputs]: Remove python-pyflakes.

Change-Id: If2b8ab397f2ad25f73c434d28d8382f13d417f94
---
gnu/packages/python-xyz.scm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3f5cac16d45..b6260c13f65 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32665,13 +32665,9 @@ (define-public python-versioneer
(invoke "python" "test/git/test_git.py" "-v")
;; Some invocation tests require the network.
;;(invoke "python" "test/git/test_invocations.py" "-v")
- (invoke "python" "setup.py" "make_long_version_py_git")
- (invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
- (invoke "python" "test/run_pyflakes_src.py")
- (invoke "pyflakes" "test")))))))
+ (invoke "python" "setup.py" "make_long_version_py_git")))))))
(native-inputs
- (list git-minimal python-pyflakes
- python-pypa-build python-setuptools python-wheel))
+ (list git-minimal python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
(home-page "https://github.com/python-versioneer/python-versioneer")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 15/32] gnu: python-re-assert: Remove python-covdefaults native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-16-ngraves@ngraves.fr
* gnu/packages/python-check.scm (python-re-assert):
[native-inputs]: Remove python-covdefaults.

Change-Id: Ib30c58b69aef7f255e5893ae6f9a33bdf41ac85d
---
gnu/packages/python-check.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index eb48ae3fadf..b7ea36cbea7 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1144,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-pytest))
+ (list python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 16/32] build-system/pyproject: Remove python-codecov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-17-ngraves@ngraves.fr
* gnu/packages/android.scm (python-androguard)[native-inputs]: Remove
python-codecov.

* gnu/packages/astronomy.scm (python-wiimatch, python-tweakwcs)
[native-inputs]: Remove python-codecov.

* gnu/packages/python-check.scm (python-pytest-trio):
[arguments]<#:test-flags>: Remove --cov flag.
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-xyz.scm (python-can,
python-ddlparse)[native-inputs]: Remove python-codecov.

Change-Id: Ic7d3789b3b30d3263f61442bb4e55fd332a4d2f6
---
gnu/packages/android.scm | 2 +-
gnu/packages/astronomy.scm | 8 +++-----
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-xyz.scm | 4 +---
4 files changed, 6 insertions(+), 11 deletions(-)

Toggle diff (84 lines)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index ab42f2be980..7cc1fa4ef05 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1074,7 +1074,7 @@ (define-public python-androguard
(lambda _
(invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-mock python-nose python-nose-timer))
+ (list python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 7589ecbb8ae..32fc07d8d86 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -4607,8 +4607,7 @@ (define-public python-tweakwcs
python-stsci-imagestats
python-stsci-stimage))
(native-inputs
- (list python-codecov
- python-pytest
+ (list python-pytest
python-pytest-cov
python-scipy
python-setuptools
@@ -5274,9 +5273,8 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-codecov python-pytest python-pytest-cov
- python-pytest-doctestplus python-setuptools-scm
- python-wheel))
+ (native-inputs (list python-pytest python-pytest-cov python-wheel
+ python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
"Optimal matching of weighted N-dimensional image intensity data")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index b7ea36cbea7..ed3625421ae 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1194,7 +1194,7 @@ (define-public python-pytest-trio
(arguments
(list
#:test-flags '(list "-W" "error" "-ra" "-v" "--pyargs"
- "pytest_trio" "--verbose" "--cov" "-k"
+ "pytest_trio" "--verbose" "-k"
(string-append
;; Needs network
"not test_async_yield_fixture_with_nursery"
@@ -1204,7 +1204,6 @@ (define-public python-pytest-trio
(native-inputs
(list python-hypothesis
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b6260c13f65..446326afc74 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3572,7 +3572,6 @@ (define-public python-can
python-setuptools))
(native-inputs
(list ;; python-canalystii ; Not packed yet
- python-codecov
python-future
python-hypothesis
python-mock
@@ -5675,8 +5674,7 @@ (define-public python-ddlparse
(base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-codecov
- python-pytest
+ (list python-pytest
python-pytest-cov
python-setuptools
python-tox
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 17/32] build-system/pyproject: Remove python-tox native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-18-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-regressions)[native-inputs]:
Remove python-tox.

* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-tox.

* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-tox.

* gnu/packages/logging.scm (tailon)[native-inputs]: Remove python-tox.

* gnu/packages/messaging.scm (python-harmony)[native-inputs]: Remove
python-tox.

* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]: Remove
python-tox.

* gnu/packages/python-web.scm (python-omnipath,
python-sanic)[native-inputs]: Remove python-tox.

* gnu/packages/python-xyz.scm (python-lunr, python-bidict,
python-jsonargparse, python-ddlparse, python-virtualenv-clone,
python-honcho, python-pdfminer-six, python-shshsh,
python-marshmallow-jsonapi, python-apispec-webframeworks, bpython,
python-loguru, python-ansicolors)[native-inputs]: Remove python-tox.

* gnu/packages/radio.scm (chirp)[native-inputs]: Remove python-tox.

* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-tox.

Change-Id: I39dadb40a73ad1c64ba8b9ef9d1b3fe7d1498b5a
---
gnu/packages/check.scm | 1 -
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/logging.scm | 2 +-
gnu/packages/messaging.scm | 2 --
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 2 --
gnu/packages/python-xyz.scm | 27 ++++++++-------------------
gnu/packages/radio.scm | 3 +--
gnu/packages/terminals.scm | 5 ++---
10 files changed, 12 insertions(+), 33 deletions(-)

Toggle diff (262 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b7116b3f0e2..6042f763f15 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3675,7 +3675,6 @@ (define-public python-pytest-regressions
python-pandas
python-pillow
python-restructuredtext-lint
- python-tox
python-setuptools-scm
python-pytest))
(home-page "https://github.com/ESSS/pytest-regressions")
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 67567a6b310..bfe4ce99fdc 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -273,7 +273,6 @@ (define-public reprotest
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
("python-tlsh" ,python-tlsh)
- ("python-tox" ,python-tox)
("unzip" ,unzip)
("xxd" ,xxd)))
(build-system python-build-system)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 298968d37c6..f5b1e0462bb 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -260,7 +260,6 @@ (define-public python-django-extensions
(native-inputs
(list python-mock
python-factory-boy
- python-tox
python-pytest
python-pytest-cov
python-pytest-django
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index a757c22154f..3c593001d00 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -134,7 +134,7 @@ (define-public tailon
"0xkmrivzilsc9wqr8ms67v7399gxnh7pv5687k4rdpdgz4309fwc"))))
(build-system python-build-system)
(native-inputs
- (list python-tox python-wheel))
+ (list python-wheel))
(inputs
(list python-pyyaml-5 python-sockjs-tornado python-tornado-http-auth
python-tornado python-deepmerge))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cb72bfb3e25..35ff807e12c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3504,8 +3504,6 @@ (define-public python-harmony
(base32
"1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js"))))
(build-system python-build-system)
- (native-inputs
- (list python-tox))
(inputs
(list python-librecaptcha python-keyring python-requests))
(synopsis "Discord account management")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ed3625421ae..8fd3a8924f1 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -419,7 +419,6 @@ (define-public python-vcrpy
python-pytest
python-pytest-cov
python-pytest-httpbin
- python-tox
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
(synopsis "Automatically mock your HTTP interactions")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8265ef41aff..51753adae77 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2134,7 +2134,6 @@ (define-public python-omnipath
python-pytest-socket
python-requests-mock
python-setuptools-scm
- python-tox
python-setuptools
python-wheel))
(home-page "https://omnipathdb.org/")
@@ -7640,7 +7639,6 @@ (define-public python-sanic
python-setuptools
python-slotscheck
python-towncrier
- python-tox
python-types-ujson
python-uvicorn
python-wheel))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 446326afc74..c83146372bf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1308,8 +1308,7 @@ (define-public python-lunr
(list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
- python-pytest-timeout
- python-tox))
+ python-pytest-timeout))
(propagated-inputs
(list python-importlib-metadata python-typing-extensions))
(home-page
@@ -2695,8 +2694,7 @@ (define-public python-bidict
python-sortedcollections
python-sortedcontainers
python-sphinx
- python-sphinx-autodoc-typehints
- python-tox))
+ python-sphinx-autodoc-typehints))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-reqs
@@ -4513,7 +4511,6 @@ (define-public python-jsonargparse
python-pytest
python-pytest-subtests
python-responses
- python-tox
python-types-requests
python-setuptools
python-wheel))
@@ -5677,7 +5674,6 @@ (define-public python-ddlparse
(list python-pytest
python-pytest-cov
python-setuptools
- python-tox
python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
@@ -6219,7 +6215,6 @@ (define-public python-virtualenv-clone
(delete-file "tox.ini")
(invoke "pytest" "-vvv" "tests")))))))
(native-inputs (list python-pytest
- python-tox
python-virtualenv
python-wheel
python-tomli
@@ -11342,7 +11337,7 @@ (define-public python-honcho
(base32 "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-mock python-tox which)) ;for tests
+ (list python-pytest python-mock which)) ;for tests
(propagated-inputs
(list python-jinja2))
(arguments
@@ -20129,7 +20124,7 @@ (define-public python-pdfminer-six
(propagated-inputs
(list python-chardet python-cryptography python-sortedcontainers))
(native-inputs
- (list python-nose python-tox))
+ (list python-nose))
(home-page "https://github.com/pdfminer/pdfminer.six")
(synopsis "PDF parser and analyzer")
(description "@code{pdfminer.six} is a community maintained fork of
@@ -21276,9 +21271,7 @@ (define-public python-shshsh
"1wzqyj1a6jj6cyv5ymzy834qm2lyq80yy1kfz0q0zayq9gm1cj7f"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-poetry-core
- python-pytest
- python-tox))
+ (list python-poetry-core python-pytest))
(home-page "https://github.com/zqqqqz2000/shshsh")
(synopsis "Write Shell commands simply and safely within Python")
(description "This package provides a way to write Shell commands from
@@ -25144,8 +25137,7 @@ (define-public python-marshmallow-jsonapi
python-flake8-bugbear
python-flask
python-mock
- python-pytest
- python-tox))
+ python-pytest))
(home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
(synopsis "JSON:API 1.0 formatting with Marshmallow")
(description
@@ -25209,7 +25201,6 @@ (define-public python-apispec-webframeworks
python-pytest
python-pyyaml
python-tornado
- python-tox
python-wheel))
(home-page "https://github.com/marshmallow-code/apispec-webframeworks")
(synopsis "Web framework plugins for apispec")
@@ -26667,7 +26658,7 @@ (define-public bpython
python-watchdog
python-jedi))
(native-inputs
- (list python-sphinx python-mock python-tox python-wheel))
+ (list python-sphinx python-mock python-wheel))
(home-page "https://bpython-interpreter.org/")
(synopsis "Fancy interface to the Python interpreter")
(description "Bpython is a fancy interface to the Python
@@ -32933,7 +32924,6 @@ (define-public python-loguru
python-sphinx
python-sphinx-autobuild
python-sphinx-rtd-theme
- python-tox
python-setuptools
python-wheel))
(home-page "https://github.com/Delgan/loguru")
@@ -35290,8 +35280,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-tox
- python-pytest-cov
+ (list python-pytest-cov
unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 56e674a8edc..bfd601564d8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3171,8 +3171,7 @@ (define-public chirp
python-pep8
python-pytest
python-pytest-mock
- python-pyyaml
- python-tox))
+ python-pyyaml))
(inputs
(list python-future
python-importlib-resources
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index e424e41a222..d61dc6cb3c7 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1199,7 +1199,6 @@ (define-public python-halo
(native-inputs
(list python-nose
python-setuptools
- python-tox
python-twine
python-wheel))
(home-page "https://github.com/manrajgrover/halo")
@@ -1228,7 +1227,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1255,7 +1254,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 18/32] build-system/pyproject: Remove python-mypy native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-19-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-poliastro)[native-inputs]: Remove
python-mypy.

* gnu/packages/databases.scm (python-psycopg2)[native-inputs]: Remove
python-mypy.

* gnu/packages/engineering.scm (uranium, cura)[native-inputs]: Remove
python-mypy.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-mypy.

* gnu/packages/machine-learning.scm (python-imbalanced-learn,
python-captum, python-torchmetrics, python-pyro-ppl)[native-inputs]:
Remove python-mypy.

* gnu/packages/python-science.scm (python-scipy)[native-inputs]:
Remove python-mypy.

* gnu/packages/python-web.scm (python-huggingface-hub, python-asgiref,
python-starsessions-for-pytorch-lightning,
python-fastapi)[native-inputs]: Remove python-mypy.

* gnu/packages/python-xyz.scm (python-pyls-black, kalamine,
python-pydantic-cli, python-marshmallow, python-apispec,
python-typeguard, python-trio-typing, python-verspec,
python-catalogue, python-duckdb)[native-inputs]: Remove python-mypy.

* gnu/packages/serialization.scm (python-msgspec)[native-inputs]: Remove
python-mypy.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-mypy.

Change-Id: I947656750aa0c7732291d826641736aaefab274e
---
gnu/packages/astronomy.scm | 1 -
gnu/packages/databases.scm | 1 -
gnu/packages/engineering.scm | 2 --
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 ----
gnu/packages/python-science.scm | 1 -
gnu/packages/python-web.scm | 5 +----
gnu/packages/python-xyz.scm | 22 +++++++++-------------
gnu/packages/serialization.scm | 1 -
gnu/packages/virtualization.scm | 3 +--
10 files changed, 11 insertions(+), 30 deletions(-)

Toggle diff (272 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 32fc07d8d86..77bf41b68b9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2606,7 +2606,6 @@ (define-public python-poliastro
(setenv "HOME" "/tmp"))))))
(native-inputs
(list python-hypothesis
- python-mypy
python-flit-core
python-pytest
python-pytest-cov
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f9202639c53..ad27ec621ca 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4112,7 +4112,6 @@ (define-public python-psycopg
(delete 'sanity-check))))
(native-inputs
(list python-cython-3
- python-mypy
python-psycopg-pool
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2620d5272b6..af79172e53b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3923,7 +3923,6 @@ (define-public uranium
graphviz
pkg-config
python-pytest
- python-mypy
python-certifi
python-twisted))
(propagated-inputs
@@ -4126,7 +4125,6 @@ (define-public cura
(build-system qt-build-system)
(native-inputs
(list python-certifi
- python-mypy
python-pytest
python-requests))
(inputs
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b396a97c0bc..ecc2dc2bb4c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -218,7 +218,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-isort
- python-mypy
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 19f73d562e7..686cd726e37 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1920,7 +1920,6 @@ (define-public python-imbalanced-learn
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
(native-inputs (list python-keras
- python-mypy
python-pandas
python-pytest
python-pytest-cov
@@ -4521,7 +4520,6 @@ (define-public python-captum
python-flask-compress
python-ipython
python-ipywidgets
- python-mypy
python-parameterized
python-pytest
python-pytest-cov
@@ -4729,7 +4727,6 @@ (define-public python-torchmetrics
(list python-cloudpickle
python-fire
python-mir-eval
- python-mypy
python-pandas
python-psutil
python-pytest
@@ -5055,7 +5052,6 @@ (define-public python-pyro-ppl
python-isort
python-lap
python-matplotlib
- python-mypy
python-nbformat
python-nbsphinx
python-nbstripout
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index e20cb56db9c..567fa5d1559 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -273,7 +273,6 @@ (define-public python-scipy
'())
(list python-matplotlib
python-mpmath
- python-mypy
python-numpy
python-numpydoc
python-pydata-sphinx-theme
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 51753adae77..db815812299 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -196,7 +196,6 @@ (define-public python-huggingface-hub
python-fastapi
python-jedi
python-jinja2
- python-mypy
python-numpy
python-pillow
python-pydantic
@@ -717,7 +716,7 @@ (define-public python-asgiref
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
- (list python-mypy python-pytest python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-typing-extensions))
(home-page "https://github.com/django/asgiref/")
@@ -8963,7 +8962,6 @@ (define-public python-starsessions-for-pytorch-lightning
python-starlette-for-fastapi-0.88))
(native-inputs
(list python-httpx
- python-mypy
python-poetry-core
python-pytest
python-pytest-asyncio
@@ -9009,7 +9007,6 @@ (define-public python-fastapi
python-hatchling
python-isort
python-jose
- python-mypy
python-passlib
python-peewee
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c83146372bf..963747bb06a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3020,7 +3020,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-isort python-mypy python-pytest
+ (list python-isort python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -6785,7 +6785,7 @@ (define-public kalamine
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs
- (list python-hatchling python-mypy python-pytest))
+ (list python-hatchling python-pytest))
(home-page "https://github.com/OneDeadKey/kalamine")
(synopsis "Keyboard layout maker")
(description
@@ -8002,8 +8002,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-mypy
- python-pytest))
+ (list python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
(description
@@ -23461,6 +23460,8 @@ (define-public python-duckdb
(list
#:test-flags
'(list "--ignore=tests/slow/test_h2oai_arrow.py"
+ ;; stubs require mypy and don't actually check functionality.
+ "--ignore=tests/stubs/test_stubs.py"
;; Don't install anything, thank you.
"-k" "not test_install_non_existent_extension")
#:phases
@@ -23485,7 +23486,6 @@ (define-public python-duckdb
(list pybind11
python-fsspec
python-google-cloud-storage
- python-mypy
python-numpy
python-pandas
python-psutil
@@ -25107,7 +25107,6 @@ (define-public python-marshmallow
(list python-packaging))
(native-inputs
(list python-flake8-bugbear
- python-mypy
python-pytest
python-pytz
python-simplejson
@@ -25169,7 +25168,6 @@ (define-public python-apispec
(native-inputs
(list python-flake8-bugbear
python-marshmallow
- python-mypy
python-pytest
python-pyyaml
python-setuptools
@@ -26586,8 +26584,7 @@ (define-public python-typeguard
;; XXX: These fail when installed as a library:
;; https://github.com/agronholm/typeguard/issues/176
"not usefixtures and not test_cached_module")))))))
- (native-inputs (list python-mypy
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools-scm
python-typing-extensions))
(home-page "https://github.com/agronholm/typeguard")
@@ -29057,8 +29054,7 @@ (define-public python-trio-typing
(native-inputs (list python-attrs python-pytest python-setuptools
python-wheel))
(propagated-inputs
- (list python-mypy python-mypy-extensions python-trio
- python-typing-extensions))
+ (list python-mypy-extensions python-trio python-typing-extensions))
(home-page "https://github.com/python-trio/trio-typing")
(synopsis "Static type checking support for Trio and related projects")
(description
@@ -35498,7 +35494,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-mypy python-pretend python-pytest))
+ (native-inputs (list python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -36245,7 +36241,7 @@ (define-public python-catalogue
"0srdxiil2xys8q1gpc1nvzhvis3a33d8a7amk2i1rlpbg6p36pak"))))
(build-system python-build-system)
(native-inputs (list python-pytest))
- (inputs (list python python-zipp python-typing-extensions python-mypy))
+ (inputs (list python python-zipp python-typing-extensions))
(home-page "https://github.com/explosion/catalogue")
(synopsis "Lightweight function registries for your library")
(description
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 728d6404bb9..b39ce176502 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -719,7 +719,6 @@ (define-public python-msgspec
(native-inputs (list python-attrs
python-gcovr
python-msgpack
- python-mypy
python-pytest
python-setuptools-scm
python-versioneer
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 85ad5031059..1a75ae0a09e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-mypy
- python-pyhamcrest
+ (list python-pyhamcrest
python-setuptools
python-twine
python-wheel))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 19/32] gnu: python-immutables: Remove python-mypy native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-20-ngraves@ngraves.fr
* gnu/packages/python-xyz.scm (python-immutables):
[origin]: Use git-fetch to use upstream test-data directory.
[build-system]: Move to pyrpoject-build-system.
[native-inputs]: Remove python-mypy.
[arguments]<#:phases>: Add phase to remove python-mypy native-input.

Change-Id: Ie67f634ffecbc3711f354e915b2fab54a1639925
---
gnu/packages/python-xyz.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 963747bb06a..180158e3b64 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15824,13 +15824,22 @@ (define-public python-immutables
(version "0.18")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "immutables" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/MagicStack/immutables")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "1x4cinh0xbl6p6p2yfm2s07mxxy3lf0zzai9gqpydk4482bwfdjk"))))
+ (base32 "1xjbkgls0dqrvpg4yzkdzz6aayizxcv5chjc5gyynk196wyshw4m"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-mypy-dependency
+ (lambda _
+ (delete-file "tests/test_mypy.py")
+ (delete-file "tests/conftest.py"))))))
(native-inputs
- (list python-mypy python-pytest python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/MagicStack/immutables")
(synopsis "High-performance immutable mapping type for Python")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 20/32] build-system/pyproject: Remove python-isort native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-21-ngraves@ngraves.fr
* gnu/packages/bioinformatics.scm (python-cooler,
scvelo)[native-inputs]: Remove python-isort.

* gnu/packages/databases.scm (aerich)[native-inputs]: Remove
python-isort.

* gnu/packages/django.scm (python-django-taggit)[native-inputs]:
Remove python-isort.

* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-isort.

* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-isort.

* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-isort.

* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-isort.

* gnu/packages/machine-learning.scm (python-funsor,
python-pyro-ppl)[native-inputs]: Remove python-isort.

* gnu/packages/mail.scm (python-hyperkitty, postorius)[native-inputs]:
Remove python-isort.

* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-isort.

* gnu/packages/python-check.scm (python-pytest-toolbox)
[native-inputs]: Remove python-pytest-isort.

* gnu/packages/python-web.scm (python-ovh, python-tinycss2,
python-fastapi)[native-inputs]: Remove python-isort.

* gnu/packages/python-xyz.scm (python-jupytext, python-pyls-black,
python-eventlet, python-textdistance,
python-validators)[native-inputs]: Remove python-isort.

* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[native-inputs]: Remove python-isort.

* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-isort.

* gnu/packages/virtualization.scm (python-qemu-qmp)[native-inputs]:
Remove python-isort.

Change-Id: I6dc9a49cdbb10ddd33ea32854f891312d3a29e53
---
gnu/packages/bioinformatics.scm | 2 --
gnu/packages/databases.scm | 1 -
gnu/packages/django.scm | 2 +-
gnu/packages/finance.scm | 1 -
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 +---
gnu/packages/mail.scm | 3 +--
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 4 +---
gnu/packages/python-xyz.scm | 7 ++-----
gnu/packages/sphinx.scm | 2 --
gnu/packages/statistics.scm | 1 -
gnu/packages/virtualization.scm | 1 -
16 files changed, 7 insertions(+), 27 deletions(-)

Toggle diff (275 lines)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d8994cf65fa..366caec31fd 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17972,7 +17972,6 @@ (define-public python-cooler
python-simplejson))
(native-inputs
(list python-hatchling
- python-isort
python-pytest
python-pytest-cov))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
@@ -21816,7 +21815,6 @@ (define-public scvelo
(propagated-inputs
(list python-anndata
python-hnswlib
- python-isort
python-igraph
python-loompy
python-louvain
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ad27ec621ca..9ec7855109c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3251,7 +3251,6 @@ (define-public aerich
(list poetry
python-bandit
python-cryptography
- python-isort
python-pydantic
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f5b1e0462bb..48b1b38a97f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -387,7 +387,7 @@ (define-public python-django-taggit
(lambda _
(invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
(propagated-inputs
- (list python-django python-isort))
+ (list python-django))
(native-inputs
(list python-pytest python-mock))
(home-page
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7579001dd1f..6f70d61f700 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-isort
python-pillow
python-protobuf
python-pyqt
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index be96e6800a3..73644ab2bb4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3263,7 +3263,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-isort
python-pytest
python-pytest-aiohttp
python-readme-renderer
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index bbb19bd4cb8..39215a0ccb6 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -216,7 +216,6 @@ (define-public mdpo
(list python-bump2version
python-flake8-implicit-str-concat
python-flake8-print
- python-isort
python-pytest
python-pytest-cov
python-sphinx
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index ecc2dc2bb4c..f6a58943ecb 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-isort
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 686cd726e37..bec948a4bfd 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-isort
- python-nbsphinx
+ (native-inputs (list python-nbsphinx
python-pandas
python-pillow
python-pyro-api
@@ -5049,7 +5048,6 @@ (define-public python-pyro-ppl
(list ninja
jupyter
python-graphviz
- python-isort
python-lap
python-matplotlib
python-nbformat
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5743558e76b..7c4b6f2cb26 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3724,7 +3724,6 @@ (define-public python-hyperkitty
(native-inputs
(list python-beautifulsoup4
python-elasticsearch
- python-isort
python-lxml
python-mock
python-whoosh))
@@ -3763,7 +3762,7 @@ (define-public postorius
(list python-readme-renderer python-mailmanclient
python-django python-django-mailman3))
(native-inputs
- (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+ (list python-beautifulsoup4 python-mock python-vcrpy))
(home-page "https://gitlab.com/mailman/postorius")
(synopsis "Web user interface for GNU Mailman")
(description
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 502ad09a3a6..9c4d56bd384 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 8fd3a8924f1..1087f7b9168 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1495,7 +1495,6 @@ (define-public python-pytest-toolbox
(native-inputs
(list python-pydantic
python-pytest
- python-pytest-isort
python-setuptools
python-wheel))
(home-page "https://github.com/samuelcolvin/pytest-toolbox")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index db815812299..a040eb81448 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -976,8 +976,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-isort
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-sphinx
@@ -9005,7 +9004,6 @@ (define-public python-fastapi
(native-inputs (list python-databases
python-flask
python-hatchling
- python-isort
python-jose
python-passlib
python-peewee
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 180158e3b64..4538dccd84c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
python-autopep8
python-flake8
python-gitpython
- python-isort
python-ipython-genutils
python-jupyter-server
python-pyaml
@@ -3020,7 +3019,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-isort python-pytest
+ (list python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -4242,7 +4241,6 @@ (define-public python-eventlet
python-hatchling
python-hatch-vcs
python-pytest
- python-isort
python-twine))
(arguments
(list
@@ -12914,7 +12912,6 @@ (define-public python-textdistance
#t)))))
(native-inputs
(list python-hypothesis
- python-isort
python-numpy
python-pytest
python-pytest-runner
@@ -25046,7 +25043,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-isort python-pytest))
+ (list python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index ed3fba059d8..26ee93b3aaf 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -93,7 +93,6 @@ (define-public python-sphinx
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
@@ -196,7 +195,6 @@ (define-public python-sphinx-5
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index bfc69062587..de4fb6e3aa7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2446,7 +2446,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-isort
python-joblib
python-matplotlib
python-pytest
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 1a75ae0a09e..b0b71cceaf5 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2031,7 +2031,6 @@ (define-public python-qemu-qmp
(native-inputs
(list python-avocado-framework
python-flake8
- python-isort
python-pylint
python-setuptools
python-setuptools-scm
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 21/32] build-system/pyproject: Remove python-twine native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-22-ngraves@ngraves.fr
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-twine.

* gnu/packages/machine-learning.scm (python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-twine.

* gnu/packages/python-check.scm (python-testfixtures)[native-inputs]:
Remove python-twine.

* gnu/packages/python-web.scm (python-translation-finder)
[native-inputs]: Remove python-twine.

* gnu/packages/python-xyz.scm (python-cftime, python-eventlet,
python-eliot, python-arpeggio)[native-inputs]: Remove python-twine.

* gnu/packages/terminals.scm (python-halo)[native-inputs]: Remove
python-twine.

* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-twine.

Change-Id: Ie9ff17126810dc3e2b17ad42a1f765361401eae7
---
gnu/packages/gettext.scm | 1 -
gnu/packages/machine-learning.scm | 6 ++----
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 6 +-----
gnu/packages/terminals.scm | 1 -
gnu/packages/virtualization.scm | 1 -
7 files changed, 5 insertions(+), 14 deletions(-)

Toggle diff (126 lines)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 39215a0ccb6..b3c807c6774 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -221,7 +221,6 @@ (define-public mdpo
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
- python-twine
python-yamllint))
(propagated-inputs
(list python-polib python-pymd4c))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index bec948a4bfd..27749093ee5 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5094,8 +5094,7 @@ (define-public python-linear-operator
(native-inputs (list python-flake8-print
python-pytest
python-setuptools
- python-setuptools-scm
- python-twine))
+ python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
(synopsis "Linear operator implementation")
(description "LinearOperator is a PyTorch package for abstracting away the
@@ -5124,8 +5123,7 @@ (define-public python-gpytorch
(native-inputs (list python-flake8-print
python-nbval
python-pytest
- python-setuptools
- python-twine))
+ python-setuptools))
(home-page "https://gpytorch.ai")
(synopsis "Implementation of Gaussian Processes in PyTorch")
(description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 1087f7b9168..d2618807bc7 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -245,7 +245,7 @@ (define-public python-testfixtures
(native-inputs
(list python-pytest python-pytest-cov
;;("python-pytest-django" ,python-pytest-django)
- python-twine python-wheel))
+ python-wheel))
(synopsis "Tests components for Python")
(description "Testfixtures is a collection of helpers and mock objects that
are useful when writing automated tests in Python.")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a040eb81448..08be81ad1c5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6224,7 +6224,7 @@ (define-public python-translation-finder
(list python-chardet python-pathlib2 python-ruamel.yaml python-six))
(native-inputs
(list python-codecov python-codacy-coverage python-pytest-cov
- python-pytest-runner python-twine))
+ python-pytest-runner))
(home-page "https://weblate.org/")
(synopsis "Translation file finder for Weblate")
(description "This package provides a function to find translation file in
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4538dccd84c..9396290401d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3070,7 +3070,6 @@ (define-public python-cftime
python-cython
python-pytest-cov
python-sphinx
- python-twine
python-wheel))
(home-page "https://unidata.github.io/cftime/")
(synopsis "Library for time handling")
@@ -4240,8 +4239,7 @@ (define-public python-eventlet
(list python-black
python-hatchling
python-hatch-vcs
- python-pytest
- python-twine))
+ python-pytest))
(arguments
(list
#:test-flags
@@ -31351,7 +31349,6 @@ (define-public python-eliot
python-sphinx
python-sphinx-rtd-theme
python-testtools
- python-twine
python-twisted))
(home-page "https://github.com/itamarst/eliot/")
(synopsis "Eliot: the logging system that tells you why it happened")
@@ -35924,7 +35921,6 @@ (define-public python-arpeggio
python-mkdocs
python-pytest
python-pytest-runner
- python-twine
python-wheel))
(home-page "https://github.com/textX/Arpeggio")
(synopsis "Packrat parser interpreter for Python")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d61dc6cb3c7..d39d1347a2c 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1199,7 +1199,6 @@ (define-public python-halo
(native-inputs
(list python-nose
python-setuptools
- python-twine
python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b0b71cceaf5..16919ccee51 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2810,7 +2810,6 @@ (define-public python-transient
(native-inputs
(list python-pyhamcrest
python-setuptools
- python-twine
python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 23/32] gnu: python-tinycss2: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-24-ngraves@ngraves.fr
* gnu/packages/python-web.scm (python-tinycss2):
[arguments]<#:phases>: Add phase remove-unwanted-dependency to
ignore coverage options.
[native-inputs]: Remove python-pytest-cov.

Change-Id: I853fe3371be84be1655db0ee8d1dca8d23c50ef9
---
gnu/packages/python-web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c1f803cb131..707bf903bd1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5897,11 +5897,18 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'remove-unwanted-dependencies
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-cov
- python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 24/32] gnu: python-django-contact-form: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-25-ngraves@ngraves.fr
* gnu/packages/django.scm (python-django-contact-form):
[native-inputs]: Remove python-pytest-cov.
[build-system]: Upgrade to pyproject-build-system.
[arguments]<#:phases>: Remove coverage tests for check phase.

Change-Id: I4d0fc406401b7e923f7efa084dbe8ea3753e50fc
---
gnu/packages/django.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3ab2bc139d1..726dd77639e 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -838,16 +838,13 @@ (define-public python-django-contact-form
(sha256
(base32
"1my9hkrylckp5vfqg9b0kncrdlxjnwxll56sdciqn4v19i4wbq1y"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
- (invoke "coverage" "run" "--source" "contact_form"
- "runtests.py"))))))
- (native-inputs
- (list python-coverage))
+ (invoke "python" "runtests.py"))))))
(propagated-inputs
(list python-django))
(home-page "https://github.com/ubernostrum/django-contact-form")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 25/32] gnu: python-dateutil: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-26-ngraves@ngraves.fr
* gnu/packages/time.scm (python-dateutil):
[native-inputs]: Remove python-pytest-cov.
[arguments]<#:phases>: Add remove-pytest-cov-dep phase.

Change-Id: Id82a147d6e40383ecc2661ac896b65b858c181e0
---
gnu/packages/time.scm | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 6e34f80a79d..99cf7ceb6a6 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -246,14 +246,20 @@ (define-public python-dateutil
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list ; avoid freezegun dependency
- "--ignore=dateutil/test/test_utils.py"
- "--ignore=dateutil/test/test_rrule.py"
- ;; XXX: Fails to get timezone from /etc/localtime.
- "--ignore=dateutil/test/test_tz.py")))
+ #:test-flags '(list "dateutil/test" "docs"
+ ;; avoid freezegun dependency
+ "--ignore=dateutil/test/test_utils.py"
+ "--ignore=dateutil/test/test_rrule.py"
+ ;; XXX: Fails to get timezone from /etc/localtime.
+ "--ignore=dateutil/test/test_tz.py")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-pytest-cov-dep
+ (lambda _
+ (substitute* "dateutil/test/conftest.py"
+ (("item\\.add_marker\\(pytest\\.mark\\.no_cover\\)")
+ "pass")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-setuptools
python-setuptools-scm
python-wheel))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 26/32] build-system/pyproject: Remove python-pytest-isort native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-27-ngraves@ngraves.fr
* gnu/packages/dav.scm (radicale):
[native-inputs]: Remove python-pytest-isort.

* gnu/packages/python-web.scm (python-tinycss):
[arguments]<#:test-flags>: Ignore isort tests.
[native-inputs]: Remove python-pytest-isort.

Change-Id: I706e8c310adbeda49b91c6815d299172ce05df22
---
gnu/packages/dav.scm | 1 -
gnu/packages/python-web.scm | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 0612a72c831..99284220846 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -59,7 +59,6 @@ (define-public radicale
(native-inputs
(list python-pytest
python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 707bf903bd1..0b794590620 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5861,10 +5861,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not test_speedups")))
+ '(list "-k" "not ISORT and not test_speedups")))
(native-inputs
(list python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-setuptools
python-wheel))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 22/32] build-system/pyproject: Remove python-pytest-cov native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-23-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-astroml, python-casa-formats-io,
python-cdflib, python-czml3, python-poliastro, python-tweakwcs,
python-wiimatch, python-stcal)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/audio.scm (python-pysox)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/backup.scm (borgmatic)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/bioinformatics.scm (python-biom-format, python-pyfaidx,
python-cooler, python-screed)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/build-tools.scm (meson-python)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/check.scm (python-pytest-nunit, python-pytest-timeout,
python-pytest-enabler, python-pytest-perf,
python-pyhamcrest)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/databases.scm (python-alembic)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/dav.scm (vdirsyncer, radicale)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/embedded.scm (mbed-tools)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/fontutils.scm (psautohint)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/geo.scm (python-fiona, python-cartopy)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/graphviz.scm (python-graphviz, python-uqbar)
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/jupyter.scm (python-jupyter-packaging,
python-jupyter-server, python-jupyterlite-core, python-ipydatawidgets)
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/machine-learning.scm (python-persim,
python-scikit-learn-extra, python-imbalanced-learn,
python-keras-application, python-keras-preprocessing, python-keras,
python-tensorly, python-pytorch-geometric, python-captum,
python-torchmetrics, python-pyro-ppl)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/mastodon.scm (python-mastodon-py)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/messaging.scm (zulip-term)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/package-management.scm (python-conda-package-handling):
[native-inputs]: Remove python-pytest-cov.

* gnu/packages/patchutils.scm (pwclient)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/python-check.scm (python-testfixtures, python-vcrpy,
python-pytest-filter-subpackage, python-atpublic, python-sybil,
python-vulture)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/python-crypto.scm (python-trustme)[native-inputs]:
Remove python-pytest-cov.
(python-certauth)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.

* gnu/packages/python-science.scm (python-scipy, python-trimesh,
python-pandaparallel, python-pyts, python-usetplot, python-pingouin,
python-opt-einsum, python-salib)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/python-web.scm (python-apiron, python-huggingface-hub,
python-portend, python-aiosignal, python-aiostream, python-ovh,
python-cbor2, python-httplib2, python-cheroot, parfive, python-jose,
python-pyscss, python-mechanicalsoup, python-priority, hypercorn,
python-aioftp, python-oauthlib, python-tinycss, python-cssselect2,
python-httpcore, python-wsgiprox, python-venusian, python-cloud-init,
python-siosocks, python-zeep, gunicorn)[native-inputs]: Remove
python-pytest-cov.
(python-warcio)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.

* gnu/packages/python-xyz.scm (python-apprise, python-janus,
python-logbook, python-affine, python-mdit-py-plugins, python-pint,
python-rasterio, python-bidict, python-can, dosage, python-contourpy,
python-portalocker, python-extension-helpers, python-mizani,
python-cligj, python-ddlparse, python-robotframework-pythonlibcore,
python-lsp-server, python-sparse, python-pikepdf, python-imageio,
python-manimpango, python-importlib-resources, python-jaraco-classes,
python-jaraco-collections, python-jaraco-context,
python-jaraco-functools, python-jaraco-test, python-jaraco-text,
python-ipyparallel, python-three-merge, python-seaborn,
python-sentry-sdk, python-sniffio, python-get-version,
python-legacy-api-wrap, python-path, python-pip-run, python-debugpy,
python-notebook, python-ipywidgets, python-qstylizer,
python-cookiecutter, python-pyqtgraph, python-codespell,
python-inflect, python-lazy-loader, python-pymemcache, python-natsort,
python-mwclient, python-flasgger, python-tempora, python-outcome,
python-trio, python-apscheduler, python-iocapture, python-argh,
python-flit, python-watchdog, python-watchgod, python-cmd2,
python-inform, python-qtsass, python-scikit-build, python-minikanren,
python-tablib, nikola, python-ansicolors, python-shtab, python-scooby,
dynaconf, python-pyan3, python-numpydoc, python-loguru,
python-multidict)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/sphinx.scm (python-sphinx-gallery)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/statistics.scm (python-pymc, python-emcee,
python-rpy2)[native-inputs]: Remove python-pytest-cov.

* gnu/packages/task-management.scm (todoman)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/time.scm (python-arrow, python-tzlocal)[native-inputs]:
Remove python-pytest-cov.

* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/web.scm (anonip, python-tibanna)[native-inputs]: Remove
python-pytest-cov.

* gnu/packages/wm.scm (qtile)[native-inputs]: Remove
python-pytest-cov. Add python-coverage.

Change-Id: Ia8c96b18a60b6ceb00b345ef06351eae1a68e070
---
gnu/packages/astronomy.scm | 10 +--
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 9 +--
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 8 +-
gnu/packages/cpp.scm | 1 -
gnu/packages/databases.scm | 2 +-
gnu/packages/dav.scm | 2 -
gnu/packages/django.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 3 +-
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 2 -
gnu/packages/jupyter.scm | 7 +-
gnu/packages/machine-learning.scm | 19 ++---
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 4 +-
gnu/packages/package-management.scm | 1 -
gnu/packages/patchutils.scm | 2 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 11 +--
gnu/packages/python-compression.scm | 9 +--
gnu/packages/python-crypto.scm | 3 +-
gnu/packages/python-science.scm | 16 ++--
gnu/packages/python-web.scm | 59 ++++----------
gnu/packages/python-xyz.scm | 121 +++++++---------------------
gnu/packages/sphinx.scm | 1 -
gnu/packages/statistics.scm | 6 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/time.scm | 2 -
gnu/packages/vpn.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/wm.scm | 1 -
37 files changed, 84 insertions(+), 234 deletions(-)

Toggle diff (294 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 77bf41b68b9..1510ecab6de 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -601,7 +601,7 @@ (define-public python-astroml
(setenv "HOME" "/tmp"))))))
(propagated-inputs (list python-astropy python-matplotlib python-numpy
python-scikit-learn python-scipy))
- (native-inputs (list python-pytest-astropy-header python-pytest-cov
+ (native-inputs (list python-pytest-astropy-header python-pytest
python-pytest-doctestplus python-pytest-remotedata
python-setuptools python-wheel))
(home-page "https://astroml.org")
@@ -2041,7 +2041,6 @@ (define-public python-casa-formats-io
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-openfiles
python-setuptools))
(propagated-inputs
@@ -2113,7 +2112,6 @@ (define-public python-cdflib
(list python-astropy
python-hypothesis
python-pytest
- python-pytest-cov
python-pytest-remotedata
python-setuptools-scm
python-xarray
@@ -2230,7 +2228,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-cov
python-pytest-mypy
python-setuptools
python-wheel))
@@ -2608,7 +2605,6 @@ (define-public python-poliastro
(list python-hypothesis
python-flit-core
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-mpl
python-pytest-mypy))
@@ -3388,7 +3384,6 @@ (define-public python-stcal
(list python-cython-3
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -4607,7 +4602,6 @@ (define-public python-tweakwcs
python-stsci-stimage))
(native-inputs
(list python-pytest
- python-pytest-cov
python-scipy
python-setuptools
python-setuptools-scm))
@@ -5272,7 +5266,7 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-pytest python-pytest-cov python-wheel
+ (native-inputs (list python-pytest python-wheel
python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e6d16211fd4..724430dae36 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6197,7 +6197,7 @@ (define-public python-pysox
(propagated-inputs
(list python-numpy python-typing-extensions))
(native-inputs
- (list sox python-pytest python-pytest-cov python-soundfile))
+ (list sox python-pytest python-soundfile))
(home-page "https://github.com/rabitt/pysox")
(synopsis "Python wrapper around SoX")
(description "@code{python-pysox} is a wrapper around the @command{sox}
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 663eb2568fe..566ea06338b 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1357,7 +1357,7 @@ (define-public borgmatic
python-jsonschema
python-requests
python-ruamel.yaml))
- (native-inputs (list python-flexmock python-pytest python-pytest-cov))
+ (native-inputs (list python-flexmock python-pytest))
(home-page "https://torsion.org/borgmatic/")
(synopsis "Simple, configuration-driven backup software")
(description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 366caec31fd..84e03a65e1f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3011,7 +3011,7 @@ (define-public python-biom-format
;;python-scikit-bio ;mutually recursive dependency
python-scipy))
(native-inputs
- (list python-cython python-pytest python-pytest-cov python-nose))
+ (list python-cython python-pytest python-nose))
(home-page "https://www.biom-format.org")
(synopsis "Biological Observation Matrix (BIOM) format utilities")
(description
@@ -10188,7 +10188,7 @@ (define-public python-screed
(base32 "0slva743xn93h4sl5zg2as4ricnnj5pp6nw9dm4qclk4i9xglkvk"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest-cov
+ (list python-pytest
python-pytest-runner
python-setuptools
python-wheel))
@@ -17921,7 +17921,6 @@ (define-public python-pyfaidx
python-mock
python-numpy
python-pytest
- python-pytest-cov
python-wheel))
(propagated-inputs (list python-setuptools))
(home-page "http://mattshirley.com")
@@ -17971,9 +17970,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-hatchling
- python-pytest
- python-pytest-cov))
+ (list python-hatchling python-pytest))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
(home-page "https://github.com/open2c/cooler")
(synopsis "Sparse binary format for genomic interaction matrices")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 8fec2f8e2f2..29974dfd8b6 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -376,7 +376,6 @@ (define-public meson-python
python-cython
python-gitpython
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/mesonbuild/meson-python")
(synopsis "Meson-based build backend for Python")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6042f763f15..6b16ec7711b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1530,7 +1530,7 @@ (define-public python-pytest-nunit
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;no tests included
(propagated-inputs (list python-attrs python-pytest))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
+ (native-inputs (list python-pytest python-setuptools
python-wheel python-xmlschema))
(home-page "https://github.com/pytest-dev/pytest-nunit")
(synopsis "Pytest plugin for generating NUnit3 test result XML output")
@@ -1796,7 +1796,7 @@ (define-public python-pytest-timeout
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(propagated-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(native-inputs
(list python-pexpect))
(home-page "https://github.com/pytest-dev/pytest-timeout")
@@ -2493,7 +2493,6 @@ (define-public python-pytest-enabler
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -2667,7 +2666,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -3242,7 +3240,7 @@ (define-public python-pyhamcrest
(base32
"05kdzlhs2kvj82pfca13qszszcj6dyrk4b9pbr46x06sq2s4qyls"))))
(native-inputs ;all native inputs are for tests
- (list python-pytest-cov python-mock python-pytest python-hypothesis))
+ (list python-mock python-pytest python-hypothesis))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ba2698056da..9c693fb16c3 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1190,7 +1190,6 @@ (define-public cpplint
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-runner
python-testfixtures))
(home-page "https://github.com/cpplint/cpplint")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9ec7855109c..8abea7ec385 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3763,7 +3763,7 @@ (define-public python-alembic
(base32 "0lxi2g2025lz5k7k5dd5fc1lfijqi2yw6qqyjzp073z6laa8cckw"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-mock python-pytest-cov))
+ (list python-mock python-pytest))
(propagated-inputs
(list python-dateutil python-sqlalchemy python-mako python-editor))
(home-page "https://bitbucket.org/zzzeek/alembic")
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index b30b1ef5a59..0612a72c831 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-flake8
python-pytest-isort
python-pytest-runner
@@ -146,7 +145,6 @@ (define-public vdirsyncer
python-trustme
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpserver
radicale))
(inputs
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 48b1b38a97f..3ab2bc139d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -261,7 +261,6 @@ (define-public python-django-extensions
(list python-mock
python-factory-boy
python-pytest
- python-pytest-cov
python-pytest-django
python-shortuuid))
(home-page
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 1da41415194..542895c8779 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1798,7 +1798,6 @@ (define-public mbed-tools
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-factory-boy
python-requests-mock
python-semver))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index af79172e53b..eaff8546dc4 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2681,7 +2681,6 @@ (define-public python-scikit-rf
(native-inputs (list python-nbval
python-networkx
python-pytest
- python-pytest-cov
python-pytest-mock
python-pyvisa))
(home-page "https://scikit-rf.org/")
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 84eb33d19bf..46b06765f0c 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -856,7 +856,6 @@ (define-public psautohint
(native-inputs
(list psautohint-font-data
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setuptools-scm
python-setuptools
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 73644ab2bb4..a33de4bd669 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 1 Jun 17:36 +0200
[PATCH python-team v2 27/32] build-system/pyproject: Remove python-pytest-black native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-28-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-perf, python-pytest-enabler)
[native-inputs]: Remove python-pytest-black.

* gnu/packages/python-web.scm (python-portend)[native-inputs]:
Remove python-pytest-black.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-legacy-api-wrap, python-path,
python-pip-run, python-inflect, python-isort, python-tempora,
python-sparse)[native-inputs]: Remove python-pytest-black.

Change-Id: Ib46f1c4a3cc33821cda3d7b2172d36158aa812c9
---
gnu/packages/check.scm | 2 --
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 21 ++++-----------------
3 files changed, 4 insertions(+), 20 deletions(-)

Toggle diff (164 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6b16ec7711b..f8ead8df4e4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2491,7 +2491,6 @@ (define-public python-pytest-enabler
python-jaraco-functools
python-toml))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -2664,7 +2663,6 @@ (define-public python-pytest-perf
"and not upstream_url"))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0b794590620..98dc11a9e48 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -311,7 +311,6 @@ (define-public python-portend
(propagated-inputs (list python-tempora))
;; TODO: Add python-pytest-ruff to native-inputs once it has been packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c8766db819b..8dd5bf2e9e3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8691,7 +8691,6 @@ (define-public python-sparse
(list python-dask
python-importlib-metadata
python-pytest
- python-pytest-black
python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
@@ -11532,7 +11531,6 @@ (define-public python-importlib-resources
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11662,7 +11660,6 @@ (define-public python-jaraco-classes
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11695,7 +11692,6 @@ (define-public python-jaraco-collections
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -11755,7 +11751,6 @@ (define-public python-jaraco-context
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11789,7 +11784,6 @@ (define-public python-jaraco-functools
(native-inputs
(list python-jaraco-classes
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11849,7 +11843,6 @@ (define-public python-jaraco-test
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11882,7 +11875,6 @@ (define-public python-jaraco-text
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -16260,8 +16252,7 @@ (define-public python-legacy-api-wrap
"06qhp0g543dy98vpa41hwdalvdbsjfc3ldk474yr9sd75mhl8jh3"))))
(build-system python-build-system)
(propagated-inputs
- (list python-get-version python-pytest python-pytest-black
- python-setuptools))
+ (list python-get-version python-pytest python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16521,7 +16512,6 @@ (define-public python-path
python-packaging
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -16626,7 +16616,6 @@ (define-public python-pip-run
(append python-nbformat
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -21062,7 +21051,6 @@ (define-public python-inflect
(propagated-inputs (list python-pydantic))
(native-inputs (list python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -24092,7 +24080,8 @@ (define-public python-isort
(arguments
(list
#:test-flags '(list "tests/unit/" "-k" "not test_gitignore"
- "--ignore=tests/unit/test_deprecated_finders.py")
+ "--ignore=tests/unit/test_deprecated_finders.py"
+ "--ignore=tests/unit/profiles/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-example-plugins
@@ -24110,8 +24099,7 @@ (define-public python-isort
(apply invoke "pip" "--no-cache-dir" "--no-input"
"install" "--user" "--no-deps" example-whls)))))))
(native-inputs
- (list python-black
- python-colorama
+ (list python-colorama
python-hypothesmith
python-libcst-minimal
python-natsort
@@ -25911,7 +25899,6 @@ (define-public python-tempora
(native-inputs
(list python-freezegun
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:37 +0200
[PATCH python-team v2 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-29-ngraves@ngraves.fr
* gnu/packages/check.scm (python-pytest-enabler, python-pytest-perf):
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/dav.scm (radicale)[native-inputs]: Remove
python-pytest-flake8.

* gnu/packages/jupyter.scm (python-nbstripout)[native-inputs]:
Remove python-pytest-flake8.

* gnu/packages/python-check.scm (python-pytest-csv):
[arguments]<#:test-flags>: Ignore flake8 test.
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/python-web.scm (python-mechanicalsoup,
python-tinycss2)[native-inputs]: Remove python-pytest-flake8.
(python-tinycss):
[arguments]<#:test-flags>: Ignore flake8 tests.
[native-inputs]: Remove python-pytest-flake8.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-context, python-jaraco-functools,
python-jaraco-packaging, python-jaraco-test, python-path,
python-pip-run, python-inflect, python-tempora, python-cairosvg)
[native-inputs]: Remove python-pytest-flake8.

Change-Id: I60ad04391d1c4b081e3293d50b3ac93c6430c7bf
---
gnu/packages/check.scm | 2 --
gnu/packages/dav.scm | 1 -
gnu/packages/jupyter.scm | 1 -
gnu/packages/python-check.scm | 5 +++--
gnu/packages/python-web.scm | 10 ++++------
gnu/packages/python-xyz.scm | 13 +------------
6 files changed, 8 insertions(+), 24 deletions(-)

Toggle diff (193 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f8ead8df4e4..e8f121e9fe9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2492,7 +2492,6 @@ (define-public python-pytest-enabler
python-toml))
(native-inputs (list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -2665,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 99284220846..b5a1ba749d8 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-flake8
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 1745cd1f491..18b9c8db522 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -849,7 +849,6 @@ (define-public python-nbstripout
(native-inputs
(list python-pytest
python-pytest-cram
- python-pytest-flake8
python-pytest-runner
python-setuptools
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 4643ce91e2e..e9903c89166 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -214,9 +214,10 @@ (define-public python-pytest-csv
(base32
"17518f2fn5l98lyk9p8r7215c1whi61imzrh6ahrmcksr8w0zz04"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags '(list "--ignore=tests/test_flake8.py")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-xdist
+ (list python-pytest-xdist
python-setuptools
python-tabulate
python-wheel))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 98dc11a9e48..93f8394ee98 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1579,8 +1579,7 @@ (define-public python-mechanicalsoup
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-flake8
- python-pytest-httpbin
+ (list python-pytest-httpbin
python-pytest-mock
python-pytest-runner
python-requests-mock
@@ -5860,10 +5859,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not ISORT and not test_speedups")))
+ '(list "-k" "not ISORT and not FLAKE8 and not test_speedups")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-runner
+ (list python-pytest-runner
python-setuptools
python-wheel))
(home-page "https://tinycss.readthedocs.io/")
@@ -5906,7 +5904,7 @@ (define-public python-tinycss2
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8dd5bf2e9e3..88bea23d3b3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11533,7 +11533,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
@@ -11661,7 +11660,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11752,7 +11750,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11785,7 +11782,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11815,7 +11811,6 @@ (define-public python-jaraco-packaging
(propagated-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-rst.linker
python-setuptools
python-setuptools-scm
@@ -11845,7 +11840,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
@@ -16514,7 +16508,6 @@ (define-public python-path
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden?
(package-properties
@@ -16618,7 +16611,6 @@ (define-public python-pip-run
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21053,7 +21045,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
;; For the version number
python-setuptools-scm
@@ -25901,7 +25892,6 @@ (define-public python-tempora
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-freezegun
python-pytest-mypy
python-setuptools-scm
@@ -29574,8 +29564,7 @@ (define-public python-cairosvg
(list python-cairocffi python-cssselect2 python-defusedxml
python-pillow python-tinycss2))
(native-inputs
- (list python-pytest-flake8
- python-pytest-isort
+ (list python-pytest-isort
python-pytest-runner
python-setuptools
python-wheel))
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:37 +0200
[PATCH python-team v2 29/32] build-system/pyproject: Remove python-pytest-mypy inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-30-ngraves@ngraves.fr
* gnu/packages/astronomy.scm (python-czml3, python-poliastro)
[native-inputs]: Remove python-pytest-mypy.

* gnu/packages/check.scm (python-pytest-perf)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/python-web.scm (python-portend)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-path, python-pip-run, python-inflect,
python-tempora, python-loguru, python-portalocker)[native-inputs]: Remove
python-pytest-mypy.

* gnu/packages/sphinx.scm (python-sphinx, python-sphinx-5):
[propagated-inputs]: Remove python-mypy.

Change-Id: Ia36ca82e0327a886f9c5317e9ef4ffc35dc8ac9d
---
gnu/packages/astronomy.scm | 4 +---
gnu/packages/check.scm | 1 -
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 17 ++---------------
gnu/packages/sphinx.scm | 2 --
5 files changed, 3 insertions(+), 22 deletions(-)

Toggle diff (180 lines)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 1510ecab6de..a670f3b12d9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2228,7 +2228,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/poliastro/czml3")
@@ -2606,8 +2605,7 @@ (define-public python-poliastro
python-flit-core
python-pytest
python-pytest-doctestplus
- python-pytest-mpl
- python-pytest-mypy))
+ python-pytest-mpl))
(propagated-inputs
(list python-astropy
python-astroquery
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e8f121e9fe9..8eac2b13563 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2664,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93f8394ee98..f956ad5b0c2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -313,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/portend")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 88bea23d3b3..1069f6292f8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4928,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-mypy
python-pytest-timeout
python-redis
python-setuptools
@@ -11533,7 +11532,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
(propagated-inputs
@@ -11660,7 +11658,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11692,7 +11689,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.collections")
@@ -11750,7 +11746,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11782,7 +11777,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11840,7 +11834,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.test")
@@ -11871,7 +11864,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.text")
@@ -16507,8 +16499,7 @@ (define-public python-path
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden?
(package-properties
python-path-bootstrap)))))
@@ -16610,8 +16601,7 @@ (define-public python-pip-run
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21045,7 +21035,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
;; For the version number
python-setuptools-scm
python-setuptools
@@ -25893,7 +25882,6 @@ (define-public python-tempora
python-pytest-checkdocs
python-pytest-enabler
python-pytest-freezegun
- python-pytest-mypy
python-setuptools-scm
python-types-freezegun
python-types-pytz
@@ -32835,7 +32823,6 @@ (define-public python-loguru
(propagated-inputs (list python-colorama))
(native-inputs (list python-colorama
python-freezegun
- python-mypy
python-pre-commit
python-pytest
python-pytest-mypy-plugins
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b977367ee35..3dbcce04b32 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -94,7 +94,6 @@ (define-public python-sphinx
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
@@ -196,7 +195,6 @@ (define-public python-sphinx-5
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:37 +0200
[PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-31-ngraves@ngraves.fr
* gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]
<#:test-flags>: Remove arguments hiding coverage options.

* gnu/packages/python-crypto.scm (python-keyring)
[arguments]<#:test-flags>: Remove arguments hiding coverage options.

* gnu/packages/python-web.scm (python-asgi-csrf, python-asgi-lifespan,
python-openapi-schema-validator, python-openapi-spec-validator,
python-openapi-core)[arguments]<#:test-flags>: Remove arguments hiding
coverage options.
(python-openapi-schema-validator, python-openapi-spec-validator)
[arguments]<#:phases>: Remove 'remove-coverage-pytest-options phase.
(python-cssselect2, python-tinycss2)[arguments]: Remove uneeded field.
(python-jsonpickle)[arguments]<#:test-flags>: Remove uneeded
test-flags.

* gnu/packages/python-xyz.scm (python-cattrs)
[arguments]<#:phases>: Remove arguments hiding coverage options.

Change-Id: Ibe08ecfebf8a24259c8658918d98fe9e5a8925b7
---
gnu/packages/pdf.scm | 6 +---
gnu/packages/python-crypto.scm | 1 -
gnu/packages/python-web.scm | 51 ++++------------------------------
gnu/packages/python-xyz.scm | 4 +--
4 files changed, 7 insertions(+), 55 deletions(-)

Toggle diff (164 lines)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4e260d614de..16d4d9336e3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -816,9 +816,6 @@ (define-public python-pydyf
(sha256
(base32 "18q43g5d9455msipcgd5fvnh8m4a2rz189slzfg80yycjw66rshs"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags #~'("-c" "/dev/null")))
(propagated-inputs (list python-pillow))
(native-inputs
(list ghostscript
@@ -1635,8 +1632,7 @@ (define-public weasyprint
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags #~(list "-c" "/dev/null"
- "-n" (number->string (parallel-job-count)))
+ #:test-flags #~(list "-n" (number->string (parallel-job-count)))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-library-paths
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6965a330624..6139856a906 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -288,7 +288,6 @@ (define-public python-keyring
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list "-c" "/dev/null") ;avoid extra test dependencies
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'workaround-test-failure
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f956ad5b0c2..ef786e59308 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -738,10 +738,7 @@ (define-public python-asgi-csrf
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- ;; Provide a null config to avoid the extraneous dependency on
- ;; python-pytest-coverage.
- #~(list "-c" "/dev/null"
- ;; Disable two failing tests (see:
+ #~(list ;; Disable two failing tests (see:
;; https://github.com/simonw/asgi-csrf/issues/24).
"-k" (string-append
"not (test_multipart "
@@ -780,8 +777,7 @@ (define-public python-asgi-lifespan
(arguments
(list
#:test-flags
- '(list "-c" "/dev/null" ;ignore coverage-related options
- "-k"
+ '(list "-k"
(string-append
;; XXX: Some tests fail because of a 'lifespan.shutdown.failed'
;; extra event, perhaps because our version of trio is older.
@@ -1529,10 +1525,7 @@ (define-public python-jsonpickle
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags
- ;; Prevent running the flake8 and black pytest plugins, which only tests
- ;; style and frequently causes harmless failures.
- '(list "-o" "addopts=''" "tests")
+ #:test-flags '(list "tests")
#:phases
'(modify-phases %standard-phases
(add-before 'check 'pre-check
@@ -2175,13 +2168,7 @@ (define-public python-openapi-schema-validator
(list
#:test-flags
;; This one returns 5 instead of 4 elements
- '(list "-k" "not test_array_prefixitems_invalid")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ '(list "-k" "not test_array_prefixitems_invalid")))
(native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-isodate
@@ -2219,13 +2206,7 @@ (define-public python-openapi-spec-validator
(list
;; These tests attempt to fetch resources from the Internet
#:test-flags '(list "--ignore-glob=tests/integration/validation/**"
- "-k" "not example")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ "-k" "not example")))
(native-inputs
(list python-poetry-core
python-pytest))
@@ -2264,9 +2245,6 @@ (define-public python-openapi-core
(list
#:test-flags
'(list "tests/unit"
- ;; Ignore Pytest configuration in setup.cfg that adds
- ;; unwanted flake8 and coverage options.
- "-c" "/dev/null"
"-k" (string-append
;; Type mismatches
"not TestFlaskOpenAPIRequest"
@@ -5892,14 +5870,6 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'remove-unwanted-dependencies
- (lambda _
- (substitute* "pyproject.toml"
- (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
@@ -5926,17 +5896,6 @@ (define-public python-cssselect2
(sha256
(base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
(build-system pyproject-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-linters
- ;; Their check fails; none of our business.
- (lambda _
- (substitute* '("setup.py" "pyproject.toml")
- (("'pytest-flake8',") "")
- (("'pytest-isort',") "")
- (("--flake8") "")
- (("--isort") "")))))))
(propagated-inputs
(list python-tinycss2))
(native-inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1069f6292f8..7bcd4c299c3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21318,9 +21318,7 @@ (define-public python-cattrs
(substitute* "pyproject.toml"
;; Fix version string
(("dynamic = \\[\"version\"\\]")
- (string-append "version = \"" #$version "\""))
- ;; Just run pytest with no frills
- (("addopts = \"-l.*") "")))))))
+ (string-append "version = \"" #$version "\""))))))))
(native-inputs
(list python-hatchling
python-hatch-vcs
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:37 +0200
[PATCH python-team v2 31/32] gnu: python-linear-operator: Remove python-flake8-print native-input
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-32-ngraves@ngraves.fr
* gnu/packages/machine-learning.scm (python-linear-operator):
[native-inputs]: Remove pytest-flake8-print.

Change-Id: Iba2670b47e479c20a3f4ae1c703ad9fe815e3764
---
gnu/packages/machine-learning.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index a3c598ba1c8..cc33a3e9762 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5082,8 +5082,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8-print
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools
python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:37 +0200
[PATCH python-team v2 32/32] gnu: abjad-ext-ipython: Remove uneeded inputs.
(address . 70858@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20240601153854.30805-33-ngraves@ngraves.fr
* gnu/packages/music.scm (abjad-ext-ipython):
[arguments]<#:phases>: Remove unwanted dev dependencies in phase
losen-requirements.
[native-inputs]: Remove python-black, python-flake8, python-isort,
python-mypy, python-pytest-cov, python-iniconfig,
python-pytest-helpers-namespace.
[propagated-inputs]: Remove python-sphinx-autodoc-typehints.

Change-Id: Id337da7731bc04d69831096b31f52e0e4c6a13c0
---
gnu/packages/music.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index fb9ff038de5..b87e6390f90 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1790,7 +1790,9 @@ (define-public abjad-ext-ipython
(substitute* "setup.py"
;; Don't require a specific version of abjad.
(("abjad==")
- "abjad>="))))
+ "abjad>=")
+ ;; XXX: Remove unwanted dev dependencies.
+ (("\"(black|flake8|isort|mypy|pytest)[^,]*,") ""))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
@@ -1800,17 +1802,9 @@ (define-public abjad-ext-ipython
(invoke "jupyter" "nbconvert" "--to=html"
"--ExecutePreprocessor.enabled=True" "tests/test.ipynb")))))))
(native-inputs
- (list lilypond
- python-black
- python-flake8
- python-iniconfig
- python-isort
- python-mypy
- python-pytest
- python-pytest-cov
- python-pytest-helpers-namespace))
+ (list lilypond python-pytest))
(propagated-inputs
- (list abjad jupyter python-sphinx-autodoc-typehints))
+ (list abjad jupyter))
(home-page "https://abjad.github.io")
(synopsis "Abjad IPython Extension")
(description
--
2.41.0
N
N
Nicolas Graves wrote on 1 Jun 17:41 +0200
control message for bug #70858
(address . control@debbugs.gnu.org)
871q5gbrgg.fsf@ngraves.fr
block 70858 by 69980
quit


--
Best regards,
Nicolas Graves
N
N
Nicolas Graves wrote on 5 Jun 18:53 +0200
Re: [bug#70858] [PATCH python-team v2 00/32] Remove unwanted native-inputs.
87jzj3nxfd.fsf@ngraves.fr
Hi python-team,

Just to let you know, ci.guix seems to have proceeded the current
python-team mostly. There are a lot of failures due to urllib's
update, I can try and update those, though I would also love a review of
those patches now that they are done.

It can actually be split in two series, one about python-pytest-*
patches, the other about other removed native-inputs. Tell me if that's
more convenient.

Nicolas

On 2024-06-01 17:36, Nicolas Graves via Guix-patches via wrote:

Toggle quote (101 lines)
> Simply rebased the v1, ontop of 69980.
>
> Nicolas Graves (32):
> guix: import: pypi: Ignore pypi-ignored-inputs.
> build-system/pyproject: Ignore unwanted pytest flags.
> build-system/pyproject: Remove python-black input.
> build-system/pyproject: Remove python-pylint native-input.
> build-system/pyproject: Remove python-flake8 inputs.
> build-system/pyproject: Remove python-coverage input.
> gnu: python-cram: Remove python-coverage native-input.
> gnu: u-boot-tools: Remove python-coverage native-input.
> gnu: python-aiosqlite: Remove python-coverage native-input.
> gnu: python-openid: Remove python-coverage native-input.
> build-system/pyproject: Remove python-coveralls native-input.
> build-system/pyproject: Remove python-pycodestyle native-input.
> gnu: python-versioneer: Remove python-pycodestyle native-input.
> gnu: python-versioneer: Remove python-pyflakes native-input.
> gnu: python-re-assert: Remove python-covdefaults native-input.
> build-system/pyproject: Remove python-codecov native-input.
> build-system/pyproject: Remove python-tox native-input.
> build-system/pyproject: Remove python-mypy native-input.
> gnu: python-immutables: Remove python-mypy native-input.
> build-system/pyproject: Remove python-isort native-input.
> build-system/pyproject: Remove python-twine native-input.
> build-system/pyproject: Remove python-pytest-cov native-input.
> gnu: python-tinycss2: Remove python-pytest-cov native-input.
> gnu: python-django-contact-form: Remove python-pytest-cov
> native-input.
> gnu: python-dateutil: Remove python-pytest-cov native-input.
> build-system/pyproject: Remove python-pytest-isort native-input.
> build-system/pyproject: Remove python-pytest-black native-input.
> build-system/pyproject: Remove python-pytest-flake8 native-input.
> build-system/pyproject: Remove python-pytest-mypy inputs.
> build-system/pyproject: Stop hiding options.
> gnu: python-linear-operator: Remove python-flake8-print native-input
> gnu: abjad-ext-ipython: Remove uneeded inputs.
>
> gnu/packages/android.scm | 6 +-
> gnu/packages/astronomy.scm | 31 +-
> gnu/packages/audio.scm | 2 +-
> gnu/packages/backup.scm | 2 +-
> gnu/packages/bioinformatics.scm | 31 +-
> gnu/packages/bootloaders.scm | 17 +-
> gnu/packages/build-tools.scm | 1 -
> gnu/packages/check.scm | 21 +-
> gnu/packages/cpp.scm | 4 +-
> gnu/packages/databases.scm | 17 +-
> gnu/packages/dav.scm | 4 -
> gnu/packages/diffoscope.scm | 2 -
> gnu/packages/django.scm | 12 +-
> gnu/packages/ebook.scm | 1 -
> gnu/packages/embedded.scm | 1 -
> gnu/packages/engineering.scm | 7 +-
> gnu/packages/finance.scm | 6 +-
> gnu/packages/fontutils.scm | 1 -
> gnu/packages/geo.scm | 9 +-
> gnu/packages/gettext.scm | 4 -
> gnu/packages/gpodder.scm | 3 +-
> gnu/packages/graph.scm | 6 +-
> gnu/packages/graphviz.scm | 5 -
> gnu/packages/jupyter.scm | 8 +-
> gnu/packages/logging.scm | 2 +-
> gnu/packages/machine-learning.scm | 64 +---
> gnu/packages/mail.scm | 3 +-
> gnu/packages/mastodon.scm | 1 -
> gnu/packages/messaging.scm | 6 +-
> gnu/packages/music.scm | 23 +-
> gnu/packages/package-management.scm | 7 +-
> gnu/packages/patchutils.scm | 2 +-
> gnu/packages/pdf.scm | 6 +-
> gnu/packages/potassco.scm | 3 +-
> gnu/packages/protobuf.scm | 4 +-
> gnu/packages/python-check.scm | 29 +-
> gnu/packages/python-compression.scm | 21 +-
> gnu/packages/python-crypto.scm | 4 +-
> gnu/packages/python-science.scm | 21 +-
> gnu/packages/python-web.scm | 175 +++--------
> gnu/packages/python-xyz.scm | 414 +++++++-------------------
> gnu/packages/radio.scm | 3 +-
> gnu/packages/serialization.scm | 1 -
> gnu/packages/simulation.scm | 2 -
> gnu/packages/sphinx.scm | 7 -
> gnu/packages/statistics.scm | 14 +-
> gnu/packages/syndication.scm | 8 +-
> gnu/packages/task-management.scm | 1 -
> gnu/packages/telegram.scm | 3 +-
> gnu/packages/terminals.scm | 12 +-
> gnu/packages/textutils.scm | 3 -
> gnu/packages/time.scm | 20 +-
> gnu/packages/version-control.scm | 1 -
> gnu/packages/virtualization.scm | 6 +-
> gnu/packages/vpn.scm | 2 -
> gnu/packages/web.scm | 6 +-
> gnu/packages/wm.scm | 2 -
> gnu/packages/xml.scm | 2 +-
> guix/build/pyproject-build-system.scm | 99 +++++-
> guix/import/pypi.scm | 21 +-
> guix/lint.scm | 12 +-
> tests/pypi.scm | 3 +-
> 62 files changed, 405 insertions(+), 809 deletions(-)

--
Best regards,
Nicolas Graves
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 70858@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70858
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch