From 7f71e2579aca806be2fd30211fddeea69cafe31e Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:32 +0300 Subject: gnu: Add python-pytest@3.0.7 * gnu/packages/python.scm (python-pytest-3.0.7): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3e4a3795f..e804da9025 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1843,6 +1843,24 @@ and many external plugins.") line))) #t))))))) +;; This package is used by Sphinx version 1.5.2 and up +(define-public python-pytest-3.0.7 + (package + (inherit python-pytest-2.9.2) + (name "python-pytest") + (version "3.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest" version)) + (sha256 + (base32 + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-mock" ,python-mock) + ("python-hypothesis" ,python-hypothesis))))) + (define-public python-pytest-cov (package (name "python-pytest-cov") -- cgit v1.3 From 3061b33190b0e9b979255d70cbe3bc92a2e1e38d Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Tue, 28 Mar 2017 15:32:17 -0400 Subject: gnu: Add python-sphinx@1.5.3. * gnu/packages/python.scm (python-sphinx-1.5.3): New variable. --- gnu/packages/python.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e804da9025..ebb61f19b3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3102,6 +3102,22 @@ sources.") (license license:bsd-3) (properties `((python2-variant . ,(delay python2-sphinx)))))) +(define-public python-sphinx-1.5.3 + (package + (inherit python-sphinx) + (name "python-sphinx") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Sphinx" version)) + (sha256 + (base32 + "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) + (native-inputs + `(("python-pytest" ,python-pytest-3.0.7) + ,@(package-native-inputs python-sphinx))))) + (define-public python2-sphinx (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (package -- cgit v1.3 From 5d0c3ba856e39be207debdf5091b4431dd726273 Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:34 +0300 Subject: gnu: Add python-paramunittest * gnu/packages/python.scm (python-paramunittest, python2-paramunittest): New variables. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ebb61f19b3..de459e5b31 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13914,3 +13914,29 @@ possible to write plugins to add your own checks.") ,python2-backports-functools-lru-cache) ("python2-configparser" ,python2-configparser) ,@(package-propagated-inputs pylint)))))) + +(define-public python-paramunittest + (package + (name "python-paramunittest") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ParamUnittest" version)) + (sha256 + (base32 + "0kp793hws5xv1wvycxq7jw2pwy36f35k39jg8hx5qikij5a0jid1")))) + (build-system python-build-system) + (home-page + "https://github.com/rik0/ParamUnittest") + (synopsis + "Simple extension to have parametrized unit tests") + (description + "This package allows to create parametrized unit-tests that work with the standard +unittest package. A parametrized test case is automatically converted to multiple test +cases. Since they are TestCase subclasses, they work with other test suites that +recognize TestCases.") + (license license:bsd-2))) + +(define-public python2-python-paramunittest + (package-with-python2 python-paramunittest)) -- cgit v1.3 From eec21d4be7f200d227d8ed9dfb2168bdff2d43d2 Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:35 +0300 Subject: gnu: Add python-mando * gnu/packages/python.scm (python-mando, python2-mando): New variables. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index de459e5b31..ec80cf13ca 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13940,3 +13940,31 @@ recognize TestCases.") (define-public python2-python-paramunittest (package-with-python2 python-paramunittest)) + +(define-public python-mando + (package + (name "python-mando") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mando" version)) + (sha256 + (base32 + "0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-rst2ansi" ,python-rst2ansi))) + (native-inputs + `(("python-sphinx" ,python-sphinx-1.5.3) + ("python-paramunittest" ,python-paramunittest))) + (home-page "https://mando.readthedocs.org/") + (synopsis + "Wrapper around argparse, allowing creation of complete CLI applications") + (description + "This package is a wrapper around argparse, allowing you to write complete CLI + applications in seconds while maintaining all the flexibility.") + (license license:expat))) + +(define-public python2-mando + (package-with-python2 python-mando)) -- cgit v1.3 From 23b9168dcdb0bdd47f74a81dc9653e1e05142a14 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Mar 2017 15:40:37 -0400 Subject: gnu: python-pytest-2.9.2: Replace with python-pytest-3.0. * gnu/packages/python.scm (python-pytest-2.9.2): Replace with ... (python-pytest-3.0): ... new variable. (python2-pytest-3.0): New variable. (python-cryptography, python2-cryptography, python-sphinx-1.5.3)[native-inputs]: Replace python-pytest-2.9.2 with python-pytest-3.0. * gnu/packages/backup.scm (borg)[native-inputs]: Likewise. gnu/packages/calendar.scm (khal)[native-inputs]: Likewise. --- gnu/packages/backup.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/python.scm | 40 +++++++++++++++++----------------------- 3 files changed, 19 insertions(+), 25 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7e9ae18f30..8e1f195158 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -529,7 +529,7 @@ detection, and lossless compression.") ("python-setuptools-scm" ,python-setuptools-scm) ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in ;; pytest 2.8. - ("python-pytest" ,python-pytest-2.9.2) + ("python-pytest" ,python-pytest-3.0) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 1e9a93ca93..977111bfe1 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -113,7 +113,7 @@ data units.") (zero? (system* "py.test" "tests"))))))) (native-inputs ;; XXX Uses tmpdir_factory, introduced in pytest 2.8. - `(("python-pytest" ,python-pytest-2.9.2) + `(("python-pytest" ,python-pytest-3.0) ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm) ;; Required for tests diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ec80cf13ca..f989338683 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1818,19 +1818,18 @@ and many external plugins.") (define-public python2-pytest (package-with-python2 python-pytest)) -;; This package is used by Borg until we can upgrade all our Python packages to -;; use a more recent pytest. -(define-public python-pytest-2.9.2 +;; Some packages require a newer pytest. +(define-public python-pytest-3.0 (package (inherit python-pytest) (name "python-pytest") - (version "2.9.2") + (version "3.0.7") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1841,25 +1840,20 @@ and many external plugins.") (string-append "@pytest.mark.skip" "(reason=\"Assumes that /usr exists.\")\n " line))) - #t))))))) - -;; This package is used by Sphinx version 1.5.2 and up -(define-public python-pytest-3.0.7 - (package - (inherit python-pytest-2.9.2) - (name "python-pytest") - (version "3.0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + #t))))) (native-inputs `(("python-nose" ,python-nose) ("python-mock" ,python-mock) - ("python-hypothesis" ,python-hypothesis))))) + ("python-hypothesis" ,python-hypothesis))) + (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) + +(define-public python2-pytest-3.0 + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-3.0)))) + (package (inherit base) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) (define-public python-pytest-cov (package @@ -3115,7 +3109,7 @@ sources.") (base32 "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) (native-inputs - `(("python-pytest" ,python-pytest-3.0.7) + `(("python-pytest" ,python-pytest-3.0) ,@(package-native-inputs python-sphinx))))) (define-public python2-sphinx @@ -7315,7 +7309,7 @@ responses, rather than doing any computation.") ("python-pyasn1" ,python-pyasn1) ("python-pyasn1-modules" ,python-pyasn1-modules) ("python-pytz" ,python-pytz) - ("python-pytest" ,python-pytest-2.9.2))) + ("python-pytest" ,python-pytest-3.0))) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description -- cgit v1.3 From 3ee9355e2fd2d0fcee1076ca1160ba5881b73da8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 02:31:59 +0200 Subject: gnu: python-pexpect: Add verbose test output. Fixes . * gnu/packages/python.scm (python-pexpect, python2-pexpect)[arguments]: Add "-v" to "nosetests" command. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f989338683..4818f86d42 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4917,7 +4917,7 @@ cluster without needing to write any wrapper code yourself.") ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") #t)) - (replace 'check (lambda _ (zero? (system* "nosetests"))))))) + (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) (native-inputs `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest) -- cgit v1.3 From 5e923414715e7bc2e8a0e8a12c30ba2dcff0513a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Mar 2017 14:41:26 -0400 Subject: gnu: python-enum34: Update to 1.1.6. * gnu/packages/python.scm (python-enum34, python2-enum34): Update to 1.1.6. [arguments]: Remove custom test phase. --- gnu/packages/python.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4818f86d42..7dfe4babb5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1461,21 +1461,15 @@ bug tracker.") (define-public python-enum34 (package (name "python-enum34") - (version "1.1.0") + (version "1.1.6") (source (origin (method url-fetch) (uri (pypi-uri "enum34" version)) (sha256 (base32 - "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp")))) + "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a")))) (build-system python-build-system) - (arguments - `(#:phases - (alist-replace - 'check - (lambda _ (zero? (system* "python" "enum/test_enum.py"))) - %standard-phases))) (home-page "https://pypi.python.org/pypi/enum34") (synopsis "Backported Python 3.4 Enum") (description -- cgit v1.3