From b4caea953aaf1d79166b9ebb8e0badc6c4877f90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: python-aiounittest: Update to 1.4.1. * gnu/packages/check.scm (python-aiounittest): Update to 1.4.1. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8c161a4a4f..8df5d87476 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Arun Isaac @@ -3314,7 +3314,7 @@ system. The code under test requires no modification to work with pyfakefs.") (define-public python-aiounittest (package (name "python-aiounittest") - (version "1.4.0") + (version "1.4.1") ;; Pypi package lacks tests. (source (origin (method git-fetch) @@ -3324,7 +3324,7 @@ system. The code under test requires no modification to work with pyfakefs.") (file-name (git-file-name name version)) (sha256 (base32 - "0hql5mw62lclrpblbh7xvinwjfcdcfvhhlvl7xlq2hi9isjq1c8r")))) + "10x7ds09b9415r92f7g9714gxixvvq3bm5mnh29ml9aba8blcb0n")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 787a026f003fad544a81d3f13901603ee4e2469c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 12:56:49 -0400 Subject: gnu: Remove python-pytest-runner-2. * gnu/packages/check.scm (python-pytest-runner-2): Delete variable. (python2-pytest-runner): Likewise. --- gnu/packages/check.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8df5d87476..cb228c9200 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1347,22 +1347,6 @@ Python's @code{random.seed}.") (define-public python2-pytest-runner (package-with-python2 python-pytest-runner)) -;; python-bleach 3.1.0 requires this ancient version of pytest-runner. -;; Remove once no longer needed. -(define-public python-pytest-runner-2 - (package - (inherit python-pytest-runner) - (version "2.12.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-runner" version)) - (sha256 - (base32 - "11ivjj9hfphkv4yfb2g74av4yy86y8gcbf7gbif0p1hcdfnxg3w6")))))) - -(define-public python2-pytest-runner-2 - (package-with-python2 python-pytest-runner-2)) - (define-public python-pytest-lazy-fixture (package (name "python-pytest-lazy-fixture") -- cgit v1.2.3 From 4746f9fc63ef9c3faeca19aa4c6c2791c55c4f29 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:36:24 -0400 Subject: gnu: Remove python2-nose-timer. * gnu/packages/check.scm (python2-nose-timer): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cb228c9200..0a64ee5adf 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2917,9 +2917,6 @@ create data based on random numbers and yet remain repeatable.") (description "Shows how much time was needed to run individual tests.") (license license:expat))) -(define-public python2-nose-timer - (package-with-python2 python-nose-timer)) - (define-public python-freezegun (package (name "python-freezegun") -- cgit v1.2.3 From dc612d54fd2ff437acabeeca3d238c43f6cd740b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:36:33 -0400 Subject: gnu: Remove python2-pytest-catchlog. * gnu/packages/check.scm (python2-pytest-catchlog): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0a64ee5adf..f8a6fde6b0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2691,9 +2691,6 @@ pytest report.") a fork of pytest-capturelog.") (license license:expat))) -(define-public python2-pytest-catchlog - (package-with-python2 python-pytest-catchlog)) - (define-public python-nosexcover (package (name "python-nosexcover") -- cgit v1.2.3 From dc0da7e56f9e8d8df23c4f551301011f261c2265 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:36:46 -0400 Subject: gnu: Remove python2-testlib. * gnu/packages/check.scm (python2-testlib): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f8a6fde6b0..2e9ecba26d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2048,9 +2048,6 @@ tools for mocking system commands and recording calls to those.") (home-page "https://github.com/trentm/testlib") (license license:expat))) -(define-public python2-testlib - (package-with-python2 python-testlib)) - ;;; The software provided by this package was integrated into pytest 2.8. (define-public python-pytest-cache (package -- cgit v1.2.3 From 94447313e875338ba59cbc417dc51ece11c949c9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:36:50 -0400 Subject: gnu: Remove python2-nose2. * gnu/packages/check.scm (python2-nose2): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2e9ecba26d..8c785fd7f2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -947,9 +947,6 @@ better plugin api, being easier for users to configure, and simplifying internal interfaces and processes.") (license license:bsd-2))) -(define-public python2-nose2 - (package-with-python2 python-nose2)) - (define-public python-unittest2 (package (name "python-unittest2") -- cgit v1.2.3 From 099c5a90e407fedeca3423c306687d8c9e73005c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:37:04 -0400 Subject: gnu: Remove python2-pytest-capturelog. * gnu/packages/check.scm (python2-pytest-capturelog): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8c785fd7f2..0cc5be8734 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2659,9 +2659,6 @@ pytest report.") "Python-pytest-catchlog is a pytest plugin to catch log messages.") (license license:expat))) -(define-public python2-pytest-capturelog - (package-with-python2 python-pytest-capturelog)) - (define-public python-pytest-catchlog (package (name "python-pytest-catchlog") -- cgit v1.2.3 From 4178b304abc667e11d398412df90b4c4b1de1bc4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:38:09 -0400 Subject: gnu: Remove python2-python-paramunittest. * gnu/packages/check.scm (python2-python-paramunittest): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0cc5be8734..476292d661 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2607,9 +2607,6 @@ cases. Since they are TestCase subclasses, they work with other test suites tha recognize TestCases.") (license license:bsd-2))) -(define-public python2-python-paramunittest - (package-with-python2 python-paramunittest)) - (define-public python-pytest-warnings (package (name "python-pytest-warnings") -- cgit v1.2.3 From 2af19eb9b5026fc96110ded4b7cb5c49343007bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:07 -0400 Subject: gnu: Remove python2-rednose. * gnu/packages/check.scm (python2-rednose): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 476292d661..70f3a05e02 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2828,9 +2828,6 @@ JSON APIs with Behave.") @command{nosetests} command of the Python Nose unit test framework.") (license license:bsd-3))) -(define-public python2-rednose - (package-with-python2 python-rednose)) - (define-public python-nose-random (package (name "python-nose-random") -- cgit v1.2.3 From ae2f3bed7616c42f3e3e4956e882832985f744e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:11 -0400 Subject: gnu: Remove python2-minimock. * gnu/packages/check.scm (python2-minimock): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 70f3a05e02..dbb131ffc7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -849,9 +849,6 @@ for every Python test framework. It supports nose, py.test, and unittest.") doctest.") (license license:expat))) -(define-public python2-minimock - (package-with-python2 python-minimock)) - (define-public python-mock (package (name "python-mock") -- cgit v1.2.3 From 359a0b6c2e99115f3dabbaeede0f322cf7e29b2d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:26 -0400 Subject: gnu: Remove python2-flexmock. * gnu/packages/check.scm (python2-flexmock): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index dbb131ffc7..d99be83c99 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2975,9 +2975,6 @@ time by mocking the datetime module.") mocks, stubs and fakes.") (license license:bsd-3))) -(define-public python2-flexmock - (package-with-python2 python-flexmock)) - (define-public python-flaky (package (name "python-flaky") -- cgit v1.2.3 From f9d31d90ec357e3ea3cdc6aa1b8123109937924c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:30 -0400 Subject: gnu: Remove python2-discover. * gnu/packages/check.scm (python2-discover): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d99be83c99..e21707b89e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2722,9 +2722,6 @@ especially -cover-package.") backported from Python 2.7 for Python 2.4+.") (license license:bsd-3))) -(define-public python2-discover - (package-with-python2 python-discover)) - (define-public behave (package (name "behave") -- cgit v1.2.3 From 2abde9b9270f822794921147631d3f48dd3498fb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:44 -0400 Subject: gnu: Remove python2-cov-core. * gnu/packages/check.scm (python2-cov-core): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e21707b89e..2369245982 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1951,9 +1951,6 @@ and @code{nose2-cov}. It is useful for developing coverage plugins for these testing frameworks.") (license license:expat))) -(define-public python2-cov-core - (package-with-python2 python-cov-core)) - (define-public python-codecov (package (name "python-codecov") -- cgit v1.2.3 From af6d88c803f2338cf199ec76f65e8fd25f774fe6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:50 -0400 Subject: gnu: Remove python2-pytest-flakes. * gnu/packages/check.scm (python2-pytest-flakes): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2369245982..2596b8aaa8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2494,9 +2494,6 @@ each of the environments.") (description "Pytest plugin for checking Python source code with pyflakes.") (license license:expat))) -(define-public python2-pytest-flakes - (package-with-python2 python-pytest-flakes)) - (define-public python-coverage-test-runner (package (name "python-coverage-test-runner") -- cgit v1.2.3 From 6e763df31c458db3fd628b80ef121a30d73ae286 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:41:57 -0400 Subject: gnu: Remove python2-pytest-subtesthack. * gnu/packages/check.scm (python2-pytest-subtesthack): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2596b8aaa8..a419e448ec 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2132,9 +2132,6 @@ normally the case.") (home-page "https://github.com/untitaker/pytest-subtesthack/") (license license:unlicense))) -(define-public python2-pytest-subtesthack - (package-with-python2 python-pytest-subtesthack)) - (define-public python-pytest-sugar (package (name "python-pytest-sugar") -- cgit v1.2.3 From be6740df96defb6f5c7f69a73e8382bac990bac8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:09 -0400 Subject: gnu: Remove python2-nose-randomly. * gnu/packages/check.scm (python2-nose-randomly): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index a419e448ec..ce5feca020 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2863,9 +2863,6 @@ by resetting it to a repeatable number for each test, enabling the tests to create data based on random numbers and yet remain repeatable.") (license license:bsd-3))) -(define-public python2-nose-randomly - (package-with-python2 python-nose-randomly)) - (define-public python-nose-timer (package (name "python-nose-timer") -- cgit v1.2.3 From dc514a51648afeae24d60d340e4c93934e807c5e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 14:06:36 -0400 Subject: gnu: Remove python2-pytest-pep8. * gnu/packages/check.scm (python2-pytest-pep8): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ce5feca020..9172888751 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2399,9 +2399,6 @@ a Pytest test execution.") (description "Pytest plugin for checking PEP8 compliance.") (license license:expat))) -(define-public python2-pytest-pep8 - (package-with-python2 python-pytest-pep8)) - (define-public python-pytest-perf (package (name "python-pytest-perf") -- cgit v1.2.3 From 7ebb6b7b2b0806c605c88f80811a633cf153c2e5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 14:45:22 -0400 Subject: gnu: Remove python2-pytest-cache. * gnu/packages/check.scm (python2-pytest-cache): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9172888751..69644aefec 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2059,9 +2059,6 @@ the last py.test invocation.") (home-page "https://bitbucket.org/hpk42/pytest-cache/") (license license:expat))) -(define-public python2-pytest-cache - (package-with-python2 python-pytest-cache)) - (define-public python-pytest-localserver (package (name "python-pytest-localserver") -- cgit v1.2.3 From 55fc0947d484f13dec89a4897b9313c8079b1d98 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:32:48 -0400 Subject: gnu: Remove python2-parameterized. * gnu/packages/check.scm (python2-parameterized): Delete variable. * gnu/packages/patches/python2-parameterized-docstring-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/check.scm | 11 ----------- .../patches/python2-parameterized-docstring-test.patch | 18 ------------------ 3 files changed, 30 deletions(-) delete mode 100644 gnu/packages/patches/python2-parameterized-docstring-test.patch (limited to 'gnu/packages/check.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 93b4902151..3452b75e3b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1705,7 +1705,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-typing-inspect-fix.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ - %D%/packages/patches/python2-parameterized-docstring-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python-pycrypto-time-clock.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 69644aefec..197205a47e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -818,19 +818,8 @@ but it works for any C/C++ project.") (description "Parameterized is a Python library that aims to fix parameterized testing for every Python test framework. It supports nose, py.test, and unittest.") - (properties `((python2-variant . ,(delay python2-parameterized)))) (license license:bsd-2))) -(define-public python2-parameterized - (let ((base (package-with-python2 (strip-python2-variant - python-parameterized)))) - (package/inherit - base - (source - (origin - (inherit (package-source base)) - (patches (search-patches "python2-parameterized-docstring-test.patch"))))))) - (define-public python-minimock (package (name "python-minimock") diff --git a/gnu/packages/patches/python2-parameterized-docstring-test.patch b/gnu/packages/patches/python2-parameterized-docstring-test.patch deleted file mode 100644 index 14691e1904..0000000000 --- a/gnu/packages/patches/python2-parameterized-docstring-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -Skip unicode docstring test, required when running on Python 2. - -See . - ---- a/parameterized/test.py -+++ b/parameterized/test.py -@@ -284,11 +284,6 @@ - " More" %(foo, ) - ) - -- @parameterized.expand([param("foo")]) -- def test_unicode_docstring(self, foo): -- u"""Döcumentation.""" -- self._assert_docstring(u"Döcumentation [with foo=%r]." %(foo, )) -- - @parameterized.expand([param("foo", )]) - def test_default_values_get_correct_value(self, foo, bar=12): - """Documentation""" -- cgit v1.2.3 From e7a41b15cee67739546d743670af266035d71036 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:32:52 -0400 Subject: gnu: Remove python2-pytest-warnings. * gnu/packages/check.scm (python2-pytest-warnings): Delete variable. --- gnu/packages/check.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 197205a47e..421b9bf202 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2598,14 +2598,7 @@ recognize TestCases.") "Python-pytest-warnings is a pytest plugin to list Python warnings in pytest report.") (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-warnings)) - ;; This package is part of pytest as of version 3.1.0. - (superseded . ,python-pytest))))) - -(define-public python2-pytest-warnings - (package (inherit (package-with-python2 - (strip-python2-variant python-pytest-warnings))) - (properties `((superseded . ,python2-pytest))))) + (properties `((superseded unquote python-pytest))))) (define-public python-pytest-capturelog (package -- cgit v1.2.3 From f7363b2479560961f66f2e1eaf055d681c19fce3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:18:09 -0400 Subject: gnu: Remove python2-nosexcover. * gnu/packages/check.scm (python2-nosexcover): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 421b9bf202..5ba71753dd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2666,9 +2666,6 @@ It will honor all the options you pass to the Nose coverage plugin, especially -cover-package.") (license license:expat))) -(define-public python2-nosexcover - (package-with-python2 python-nosexcover)) - (define-public python-discover (package (name "python-discover") -- cgit v1.2.3 From 1143a16830c2e0ee5d8f95835d25b68843513114 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:18:17 -0400 Subject: gnu: Remove python2-coverage-test-runner. * gnu/packages/check.scm (python2-coverage-test-runner): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5ba71753dd..40c90a03f9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2504,9 +2504,6 @@ unit tests and failing them if the unit test module does not exercise all statements in the module it tests.") (license license:gpl3+))) -(define-public python2-coverage-test-runner - (package-with-python2 python-coverage-test-runner)) - (define-public python-pylint (package (name "python-pylint") -- cgit v1.2.3 From 7ced2152d520e4858c31537e06ab2ba0a07a7569 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:52:22 -0400 Subject: gnu: Remove python2-pytest-xdist. * gnu/packages/check.scm (python2-pytest-xdist): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 40c90a03f9..224c7e62e7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1476,9 +1476,6 @@ program code to a remote location, executes there, and then syncs the result back.") (license license:expat))) -(define-public python2-pytest-xdist - (package-with-python2 python-pytest-xdist)) - (define-public python-pytest-xdist-next (package/inherit python-pytest-xdist (name "python-pytest-xdist") -- cgit v1.2.3 From 6c80abe0977907441df2603a00f0be2fcc4e04f0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 00:00:23 -0400 Subject: gnu: Remove python2-pytest-mock. * gnu/packages/check.scm (python2-pytest-mock): Delete variable. (python-pytest-mock)[properties]: Delete field. --- gnu/packages/check.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 224c7e62e7..8b77bf77ce 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1401,29 +1401,8 @@ around the patching API provided by the @code{mock} package, but with the benefit of not having to worry about undoing patches at the end of a test. The mocker fixture has the same API as @code{mock.patch}, supporting the same arguments.") - (properties `((python2-variant . ,(delay python2-pytest-mock)))) (license license:expat))) -(define-public python2-pytest-mock - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-mock)))) - (package/inherit base - (version "1.10.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-mock" version)) - (sha256 - (base32 - "1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad")))) - (arguments - `(#:python ,python-2)) - (native-inputs - `(("python2-setuptools-scm" ,python2-setuptools-scm))) - (propagated-inputs - `(("python2-mock" ,python2-mock) - ("python2-pytest" ,python2-pytest)))))) - (define-public python-pytest-xdist (package (name "python-pytest-xdist") -- cgit v1.2.3 From fa4800461458e44196d9399b7880a69730933966 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 01:39:47 -0400 Subject: gnu: Remove python2-pytest-runner. * gnu/packages/check.scm (python2-pytest-runner): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8b77bf77ce..a4e505d494 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1327,9 +1327,6 @@ Python's @code{random.seed}.") @file{setup.py} files can use to run tests.") (license license:expat))) -(define-public python2-pytest-runner - (package-with-python2 python-pytest-runner)) - (define-public python-pytest-lazy-fixture (package (name "python-pytest-lazy-fixture") -- cgit v1.2.3 From 4e7d6a2dbe74f32fc22bfb2e7a3bbaab7c18cc79 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:32:06 -0400 Subject: gnu: Remove python2-pytest. * gnu/packages/check.scm (python2-pytest): Delete variable. (python-pytest)[properties]: Delete field. (python-pytest-bootstrap): Do no strip python2-variant from parent. (python2-pytest-bootstrap): Delete variable. --- gnu/packages/check.scm | 66 +++----------------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index a4e505d494..0618ddbd03 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1026,77 +1026,17 @@ standard library.") "Pytest is a testing tool that provides auto-discovery of test modules and functions, detailed info on failing assert statements, modular fixtures, and many external plugins.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest)))))) + (license license:expat))) (define-public python-pytest-6 python-pytest) -;; Pytest 4.x are the last versions that support Python 2. -(define-public python2-pytest - (package - (inherit (strip-python2-variant python-pytest)) - (name "python2-pytest") - (version "4.6.11") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "0ls3pqr86xgif6bphsb6wrww9r2vc7p7a2naq8zcq8115wwq5yjh")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - ,@(package-arguments python-pytest))) - (propagated-inputs - `(("python-atomicwrites" ,python2-atomicwrites) - ("python-attrs" ,python2-attrs-bootstrap) - ("python-funcsigs" ,python2-funcsigs) - ("python-importlib-metadata" ,python2-importlib-metadata-bootstrap) - ("python-more-itertools" ,python2-more-itertools) - ("python-packaging" ,python2-packaging-bootstrap) - ("python-pathlib2" ,python2-pathlib2) - ("python-pluggy" ,python2-pluggy) - ("python-py" ,python2-py) - ("python-six" ,python2-six-bootstrap) - ("python-wcwidth" ,python2-wcwidth))) - (native-inputs - `(("bash" ,bash) ;tests require 'compgen' - ("python-hypothesis" ,python2-hypothesis) - ("python-nose" ,python2-nose) - ("python-mock" ,python2-mock) - ("python-pytest" ,python2-pytest-bootstrap) - ("python-setuptools-scm" ,python2-setuptools-scm))))) - (define-public python-pytest-bootstrap (package - (inherit (strip-python2-variant python-pytest)) + (inherit python-pytest) (name "python-pytest-bootstrap") (native-inputs (list python-iniconfig python-setuptools-scm python-toml)) - (arguments `(#:tests? #f)) - (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) - -(define-public python2-pytest-bootstrap - (hidden-package - (package/inherit - python2-pytest - (name "python2-pytest-bootstrap") - (arguments - (substitute-keyword-arguments (package-arguments python2-pytest) - ((#:tests? _ #f) #f))) - (native-inputs - `(("python-setuptools-scm" ,python2-setuptools-scm))) - (propagated-inputs - `(("python-atomicwrites" ,python2-atomicwrites) - ("python-attrs" ,python2-attrs-bootstrap) - ("python-funcsigs" ,python2-funcsigs-bootstrap) - ("python-importlib-metadata" ,python2-importlib-metadata-bootstrap) - ("python-more-itertools" ,python2-more-itertools) - ("python-packaging" ,python2-packaging-bootstrap) - ("python-pathlib2" ,python2-pathlib2-bootstrap) - ("python-pluggy" ,python2-pluggy-bootstrap) - ("python-py" ,python2-py) - ("python-wcwidth" ,python2-wcwidth)))))) + (arguments `(#:tests? #f)))) (define-public python-pytest-assume (package -- cgit v1.2.3 From d0d694355c2eacc66e0f89b3a4940d9a8c6694d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:06:34 -0400 Subject: gnu: Remove python2-freezegun. * gnu/packages/check.scm (python2-freezegun): Delete variable. --- gnu/packages/check.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0618ddbd03..be67b20d76 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2794,37 +2794,6 @@ create data based on random numbers and yet remain repeatable.") time by mocking the datetime module.") (license license:asl2.0))) -(define-public python2-freezegun - (package - (name "python2-freezegun") - (version "0.3.14") - (source - (origin - (method url-fetch) - (uri (pypi-uri "freezegun" version)) - (sha256 - (base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2")))) - (build-system python-build-system) - (native-inputs - (list python2-mock python2-pytest)) - (propagated-inputs - (list python2-six python2-dateutil)) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - ;; The tests are normally executed via `make test`, but the PyPi - ;; package does not include the Makefile. - (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) - (home-page "https://github.com/spulec/freezegun") - (synopsis "Test utility for mocking the datetime module") - (description - "FreezeGun is a library that allows your python tests to travel through -time by mocking the datetime module.") - (license license:asl2.0))) - (define-public python-flexmock (package (name "python-flexmock") -- cgit v1.2.3 From 5df79d1ea84a27afce5487eef888e7371739a519 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:14:17 -0400 Subject: gnu: Remove python2-flaky. * gnu/packages/check.scm (python2-flaky): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index be67b20d76..29388ffab6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2838,9 +2838,6 @@ those tests or marking them to @code{@@skip}, they can be automatically retried.") (license license:asl2.0))) -(define-public python2-flaky - (package-with-python2 python-flaky)) - (define-public python-pyhamcrest (package (name "python-pyhamcrest") -- cgit v1.2.3 From 1924d8237d7574c62042fa0f60bffcee84f0f580 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:19:17 -0400 Subject: gnu: Remove python2-coverage. * gnu/packages/check.scm (python2-coverage): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 29388ffab6..90b8349657 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1790,9 +1790,6 @@ library to determine which lines are executable, and which have been executed.") (license license:bsd-3))) -(define-public python2-coverage - (package-with-python2 python-coverage)) - (define-public python-pytest-asyncio (package (name "python-pytest-asyncio") -- cgit v1.2.3 From 0b85c365a2a569a6a87facc420fe8bee52652994 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:47:18 -0400 Subject: gnu: Remove python2-mock. * gnu/packages/check.scm (python2-mock): Delete variable. (python-mock)[properties]: Delete field. --- gnu/packages/check.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 90b8349657..0e2417c400 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -862,18 +862,8 @@ doctest.") of your system under test with mock objects and make assertions about how they have been used. This library is now part of Python (since Python 3.3), available via the @code{unittest.mock} module.") - (properties `((python2-variant . ,(delay python2-mock)))) (license license:expat))) -(define-public python2-mock - (let ((base (package-with-python2 - (strip-python2-variant python-mock)))) - (package/inherit base - (propagated-inputs - `(("python2-functools32" ,python2-functools32) - ("python2-funcsigs" ,python2-funcsigs) - ,@(package-propagated-inputs base)))))) - ;;; This package is unmaintained (see the note at the top of doc/index.rst). (define-public python-nose (package -- cgit v1.2.3 From fe136c39bf26599814fabcb87407f8f747ff73e4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:48:14 -0400 Subject: gnu: Remove python2-hypothesis. * gnu/packages/check.scm (python2-hypothesis): Delete variable. (python-hypothesis)[properties]: Delete field. --- gnu/packages/check.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0e2417c400..05192af76a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2062,8 +2062,7 @@ much larger range of examples than you would ever want to write by hand. It’s based on the Haskell library, Quickcheck, and is designed to integrate seamlessly into your existing Python unit testing work flow.") (home-page "https://github.com/HypothesisWorks/hypothesis") - (license license:mpl2.0) - (properties `((python2-variant . ,(delay python2-hypothesis)))))) + (license license:mpl2.0))) ;;; TODO: Make the default python-hypothesis in the next rebuild cycle. (define-public python-hypothesis-next @@ -2080,22 +2079,6 @@ seamlessly into your existing Python unit testing work flow.") (modify-inputs (package-propagated-inputs python-hypothesis) (append python-pytest))))) ;to satisfy the sanity-check phase -;; This is the last version of Hypothesis that supports Python 2. -(define-public python2-hypothesis - (let ((hypothesis (package-with-python2 - (strip-python2-variant python-hypothesis)))) - (package (inherit hypothesis) - (version "4.57.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "hypothesis" version)) - (sha256 - (base32 - "183gpxbfcdhdqzlahkji5a71n6lmvgqsbkcb0ihqad51n2j6jhrw")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs hypothesis) - (prepend python2-enum34)))))) - (define-public python-hypothesmith (package (name "python-hypothesmith") -- cgit v1.2.3 From f07cfa3c9ad1709be05216422672dbdb601c53d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:56:24 -0400 Subject: gnu: Remove python2-unittest2. * gnu/packages/check.scm (python2-unittest2): Delete variable. --- gnu/packages/check.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 05192af76a..471150c4df 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -953,9 +953,6 @@ interfaces and processes.") standard library.") (license license:psfl))) -(define-public python2-unittest2 - (package-with-python2 python-unittest2)) - (define-public python-pytest (package (name "python-pytest") -- cgit v1.2.3 From 38cb3572134c673460099a091a93abcb320e497f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 14:31:23 -0400 Subject: gnu: Remove python2-pyfakefs-bootstrap. * gnu/packages/check.scm (python2-pyfakefs-bootstrap): Delete variable. --- gnu/packages/check.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 471150c4df..fdf14f7cf2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3056,19 +3056,6 @@ under test to interact with a fake file system instead of the real file system. The code under test requires no modification to work with pyfakefs.") (license license:asl2.0))) -;; This minimal variant is used to avoid a circular dependency between -;; python2-importlib-metadata, which requires pyfakefs for its tests, and -;; python2-pytest, which requires python2-importlib-metadata. -(define-public python2-pyfakefs-bootstrap - (hidden-package - (package - (inherit (package-with-python2 python-pyfakefs)) - (name "python2-pyfakefs-bootstrap") - (native-inputs '()) - (arguments - `(#:python ,python-2 - #:tests? #f))))) - (define-public python-aiounittest (package (name "python-aiounittest") -- cgit v1.2.3 From 0fa989172df685170590e42b6eadc151cbd2acba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:07:07 -0400 Subject: gnu: Remove python2-nose. * gnu/packages/check.scm (python2-nose): Delete variable. (python-nose)[properties]: Delete field. --- gnu/packages/check.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fdf14f7cf2..66e7993996 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -887,17 +887,7 @@ available via the @code{unittest.mock} module.") (synopsis "Python testing library") (description "Nose extends the unittest library to make testing easier.") - (license license:lgpl2.0+) - (properties `((python2-variant . ,(delay python2-nose)))))) - -(define-public python2-nose - (let ((base (package-with-python2 - (strip-python2-variant python-nose)))) - (package/inherit base - (arguments (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (delete 'invoke-2to3)))))))) + (license license:lgpl2.0+))) (define-public python-nose2 (package -- cgit v1.2.3 From 962d02904fe907d3cb3d96bc220ce7c759ad4425 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 16 May 2022 10:01:57 -0400 Subject: gnu: Remove python2-pytest-cov. * gnu/packages/check.scm (python2-pytest-cov): Delete variable. --- gnu/packages/check.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 66e7993996..2340ef72d9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1078,38 +1078,6 @@ distributed testing in both @code{load} and @code{each} modes. It also supports coverage of subprocesses.") (license license:expat))) -(define-public python2-pytest-cov - (package - (name "python2-pytest-cov") - (version "2.8.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-cov" version)) - (sha256 - (base32 "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Options taken from tox.ini. - ;; TODO: make "--restructuredtext" tests pass. They currently fail - ;; with "Duplicate implicit target name". - (invoke "python" "./setup.py" "check" - "--strict" "--metadata")))))) - (propagated-inputs - (list python2-coverage python2-pytest)) - (home-page "https://github.com/pytest-dev/pytest-cov") - (synopsis "Pytest plugin for measuring coverage") - (description - "Pytest-cov produces coverage reports. It supports centralised testing and -distributed testing in both @code{load} and @code{each} modes. It also -supports coverage of subprocesses.") - (license license:expat))) - (define-public python-pytest-httpserver (package (name "python-pytest-httpserver") -- cgit v1.2.3