From 802a3b7ba33562925dbd02ae742b6ea4dfd36910 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 14 Apr 2023 21:50:13 -0400 Subject: gnu: python-pytest-7.1: Deprecate package. The source was adjusted using the following command: $ git grep -rl python-pytest-7.1 | xargs sed -i 's/python-pytest-7.1/python-pytest/g' * gnu/packages/check.scm (python-pytest-7.1): Delete variable. --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/check.scm | 26 ++------------------------ gnu/packages/databases.scm | 2 +- gnu/packages/engineering.scm | 4 ++-- gnu/packages/python-check.scm | 2 +- gnu/packages/python-crypto.scm | 2 +- gnu/packages/python-xyz.scm | 8 ++++---- 7 files changed, 13 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index db290f5987..1800bb141c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1196,7 +1196,7 @@ (define-public python-astropy python-ipython python-jplephem python-objgraph - python-pytest-7.1 + python-pytest python-pytest-astropy python-pytest-xdist python-setuptools-scm @@ -2717,7 +2717,7 @@ (define-public python-asdf-standard (native-inputs (list python-astropy python-jsonschema-next python-pypa-build - python-pytest-7.1 + python-pytest python-packaging python-setuptools-scm)) (propagated-inputs (list python-importlib-resources)) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 90a6fba2b9..f388eb82a7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1305,30 +1305,8 @@ (define-public python-pytest (define-deprecated python-pytest-6 python-pytest) (export python-pytest-6) -;; Astropy started using hard dependencies for Pytest 7+, which might -;; happen for some other projects. It could be set as default in staging. -(define-public python-pytest-7.1 - (package - (inherit python-pytest) - (version "7.1.3") - (name "python-pytest") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "0f8c31v5r2kgjixvy267n0nhc4xsy65g3n9lz1i1377z5pn5ydjg")))) - (arguments - (substitute-keyword-arguments (package-arguments python-pytest) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (add-before 'build 'pretend-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))) - (propagated-inputs - (modify-inputs (package-propagated-inputs python-pytest) - (replace "python-toml" python-tomli))))) +(define-deprecated python-pytest-7 python-pytest) +(export python-pytest-7) (define-public python-pytest-bootstrap (package diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cd3562bb8c..c55d23aeb0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5173,7 +5173,7 @@ (define-public datasette (list python-beautifulsoup4 python-black python-cogapp - python-pytest-7.1 + python-pytest python-pytest-asyncio python-pytest-runner python-pytest-timeout diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9952c0443b..f7afa1c067 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2463,7 +2463,7 @@ (define-public python-pyvisa (substitute* "pyvisa/shell.py" (("from .thirdparty import prettytable") "import prettytable"))))))) - (native-inputs (list python-pytest-7.1)) + (native-inputs (list python-pytest)) (propagated-inputs (list python-dataclasses python-prettytable python-typing-extensions)) (home-page "https://pyvisa.readthedocs.io/en/latest/") @@ -2500,7 +2500,7 @@ (define-public python-scikit-rf python-flake8 python-nbval python-networkx - python-pytest-7.1 + python-pytest python-pytest-cov python-pyvisa)) (home-page "https://scikit-rf.org/") diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 8cf9e74f68..0c03b8a8a9 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -961,7 +961,7 @@ (define-public python-pytest-subtests (when tests? (add-installed-pythonpath inputs outputs) (invoke "python" "-m" "pytest"))))))) - (native-inputs (list python-pytest-7.1 python-setuptools-scm)) + (native-inputs (list python-pytest python-setuptools-scm)) (home-page "https://github.com/pytest-dev/pytest-subtests") (synopsis "Unittest subTest() support and subtests fixture") (description "This Pytest plugin provides unittest @code{subTest()} diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9cf5914337..e1609a463d 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -521,7 +521,7 @@ (define-public python-cryptography python-hypothesis python-iso8601 python-pretend - python-pytest-7.1 ;for subtests + python-pytest ;for subtests python-pytest-benchmark python-pytest-subtests)) (inputs (list python-cryptography-rust)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cfefc93b2..99f3c62353 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -968,7 +968,7 @@ (define-public python-pint "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q")))) (build-system python-build-system) (native-inputs - (list python-pytest-7.1 ;for pytest-subtests + (list python-pytest ;for pytest-subtests python-pytest-cov python-pytest-mpl python-pytest-subtests @@ -15329,7 +15329,7 @@ (define-public python-hy " and not test_macro_require" " and not test_requires_pollutes_core")))))))) (native-inputs - (list python-pytest-7.1 python-wheel)) + (list python-pytest python-wheel)) (propagated-inputs (list python-funcparserlib)) (home-page "https://docs.hylang.org/en/stable/") @@ -16407,7 +16407,7 @@ (define-public python-celery python-iniconfig python-moto python-msgpack - python-pytest-7.1 ;for pytest-subtests + python-pytest ;for pytest-subtests python-pytest-celery python-pytest-subtests python-pytest-timeout @@ -16501,7 +16501,7 @@ (define-public python-pyqtgraph (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen")))))) (native-inputs - (list python-pytest-7.1 python-pytest-cov python-pytest-xdist)) + (list python-pytest python-pytest-cov python-pytest-xdist)) (inputs (list qtbase-5)) (propagated-inputs -- cgit v1.2.3