From eddb9dacd2943301c7d1bc3cbad8df6ddab09c5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 03:05:58 +0100 Subject: gnu: behave: Update to 1.2.6. * gnu/packages/check.scm (behave): Update to 1.2.6. [source](uri): Adjust file extension. [native-inputs]: Add PYTHON-PATHPY and PYTHON-PYTEST. --- gnu/packages/check.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8e1eb127b2..fbd2ac4f80 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1629,18 +1629,20 @@ (define-public python2-discover (define-public behave (package (name "behave") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) - (uri (pypi-uri "behave" version ".tar.bz2")) + (uri (pypi-uri "behave" version)) (sha256 (base32 - "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) + "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-pyhamcrest" ,python-pyhamcrest))) + ("python-pathpy" ,python-pathpy) + ("python-pyhamcrest" ,python-pyhamcrest) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse) -- cgit v1.2.3 From 335c9e39024302476edb35b139ba2350a5d76437 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 16:21:12 +0100 Subject: gnu: python-fixtures: Propagate python-pbr. * gnu/packages/check.scm (python-fixtures-bootstrap, python2-fixtures-bootstrap, python-testrepository-bootstrap, python2-testrepository-bootstrap): New public variables. (python-fixtures): Adjust accordingly. (python-testrepository): Likewise. [native-inputs]: Remove PYTHON-PBR-MINIMAL. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-FIXTURES and PYTHON-TESTREPOSITORY WITH PYTHON-FIXTURES-BOOTSTRAP and PYTHON-TESTREPOSITORY-BOOTSTRAP. --- gnu/packages/check.scm | 81 ++++++++++++++++++++++++++++++++++--------------- gnu/packages/python.scm | 4 +-- 2 files changed, 59 insertions(+), 26 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fbd2ac4f80..20845f82f6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -962,18 +962,37 @@ (define-public python-subunit (define-public python2-subunit (package-with-python2 python-subunit)) -(define-public python-fixtures +;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its +;; own tests. Hence this bootstrap variant. +(define-public python-fixtures-bootstrap (package - (name "python-fixtures") + (name "python-fixtures-bootstrap") (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "fixtures" version)) - (sha256 - (base32 - "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "fixtures" version)) + (sha256 + (base32 + "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) (build-system python-build-system) + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-pbr-minimal" ,python-pbr-minimal) + ("python-six" ,python-six))) + (home-page "https://launchpad.net/python-fixtures") + (synopsis "Python test fixture library") + (description + "This package is only used for bootstrapping. Use the regular +python-fixtures package instead.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option + +(define-public python2-fixtures-bootstrap + (package-with-python2 python-fixtures-bootstrap)) + +(define-public python-fixtures + (package + (inherit python-fixtures-bootstrap) + (name "python-fixtures") (arguments '(#:phases (modify-phases %standard-phases @@ -982,25 +1001,23 @@ (define-public python-fixtures (zero? (system* "python" "-m" "testtools.run" "fixtures.test_suite"))))))) (propagated-inputs - `(("python-six" ,python-six))) + ;; Fixtures uses pbr at runtime to check versions, etc. + `(("python-pbr" ,python-pbr) + ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-pbr-minimal" ,python-pbr-minimal) ("python-testtools" ,python-testtools))) - (home-page "https://launchpad.net/python-fixtures") - (synopsis "Python test fixture library") (description "Fixtures provides a way to create reusable state, useful when writing -Python tests.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option +Python tests."))) (define-public python2-fixtures (package-with-python2 python-fixtures)) -(define-public python-testrepository +(define-public python-testrepository-bootstrap (package - (name "python-testrepository") - (version "0.0.20") + (name "python-testrepository-bootstrap") + (version "0.0.20") (source (origin (method url-fetch) @@ -1011,6 +1028,26 @@ (define-public python-testrepository (base32 "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) (build-system python-build-system) + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-fixtures" ,python-fixtures-bootstrap) + ("python-subunit" ,python-subunit) + ("python-testtools" ,python-testtools))) + (native-inputs + `(("python-mimeparse" ,python-mimeparse))) + (home-page "https://launchpad.net/testrepository") + (synopsis "Database for Python test results") + (description + "Bootstrap package for python-testrepository. Don't use this.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option + +(define-public python2-testrepository-bootstrap + (package-with-python2 python-testrepository-bootstrap)) + +(define-public python-testrepository + (package + (inherit python-testrepository-bootstrap) + (name "python-testrepository") (arguments ;; FIXME: Many tests are failing. '(#:tests? #f)) @@ -1019,14 +1056,10 @@ (define-public python-testrepository ("python-subunit" ,python-subunit) ("python-testtools" ,python-testtools))) (native-inputs - `(("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building fixture - ("python-mimeparse" ,python-mimeparse))) - (home-page "https://launchpad.net/testrepository") - (synopsis "Database for Python test results") + `(("python-mimeparse" ,python-mimeparse))) (description "Testrepository provides a database of test results which can be used as part of a developer's workflow to check things such as what tests -have failed since the last commit or what tests are currently failing.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option +have failed since the last commit or what tests are currently failing."))) (define-public python2-testrepository (package-with-python2 python-testrepository)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ccd6a7359..efe8e8c638 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1689,12 +1689,12 @@ (define-public python-pbr (propagated-inputs `(("git" ,git))) ;; pbr actually uses the "git" binary. (native-inputs - `(("python-fixtures" ,python-fixtures) + `(("python-fixtures" ,python-fixtures-bootstrap) ;; discover, coverage, hacking, subunit ("python-mock" ,python-mock) ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) - ("python-testrepository" ,python-testrepository) + ("python-testrepository" ,python-testrepository-bootstrap) ("python-testresources" ,python-testresources) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools) -- cgit v1.2.3 From 151f32a74bb50461f701fce8b4ac233ca311fdc4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 16:37:38 +0100 Subject: gnu: python-subunit: Update to 1.2.0. * gnu/packages/check.scm (python-subunit): Update to 1.2.0. [source](uri): Use PYPI-URI. [propagated-inputs]: Remove PYTHON-MIMEPARSE. Add PYTHON-TESTTOOLS. [native-inputs]: Add PYTHON-FIXTURES and PYTHON-TESTSCENARIOS. --- gnu/packages/check.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 20845f82f6..fbb89ce496 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -936,22 +936,22 @@ (define-public python2-testresources (define-public python-subunit (package (name "python-subunit") - (version "0.0.21") + (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-" - version ".tar.gz")) + (uri (pypi-uri name version)) (sha256 (base32 - "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) + "1yii2gx3z6323as3iraj1yphj76dy7i3h6kj63pnc5y0hwjs5sgx")))) (build-system python-build-system) (propagated-inputs `(("python-extras" ,python-extras) - ("python-mimeparse" ,python-mimeparse))) + ("python-testtools" ,python-testtools))) (native-inputs - `(("python-testscenarios" ,python-testscenarios))) + `(("python-fixtures" ,python-fixtures-bootstrap) + ("python-hypothesis" ,python-hypothesis) + ("python-testscenarios" ,python-testscenarios))) (home-page "http://launchpad.net/subunit") (synopsis "Python implementation of the subunit protocol") (description -- cgit v1.2.3 From bc69104a442e1dd2338397a54a3a80eff170e78f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 17:09:43 +0100 Subject: gnu: python-testresources: Update to 2.0.1. * gnu/packages/check.scm (python-testresources-bootstrap, python2-testresources-bootstrap): New public variables. (python-testresources): Adjust accordingly. [propagated-inputs]: Add PYTHON-PBR. [native-inputs]: Add PYTHON-FIXTURES and PYTHON-TESTTOOLS. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-TESTRESOURCES with PYTHON-TESTRESOURCES-BOOTSTRAP. --- gnu/packages/check.scm | 47 +++++++++++++++++++++++++++++++++-------------- gnu/packages/python.scm | 2 +- 2 files changed, 34 insertions(+), 15 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fbb89ce496..0a7d888d46 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -908,28 +908,47 @@ (define-public python-testscenarios (define-public python2-testscenarios (package-with-python2 python-testscenarios)) -(define-public python-testresources +;; Testresources requires python-pbr at runtime, but pbr needs it for its +;; own tests. Hence this bootstrap variant. +(define-public python-testresources-bootstrap (package - (name "python-testresources") - (version "0.2.7") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testresources/testresources-" - version ".tar.gz")) - (sha256 - (base32 - "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md")))) + (name "python-testresources-bootstrap") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "testresources" version)) + (sha256 + (base32 + "05s4dsli9g17m1r3b1gvwicbbgq011hnpb2b9qnj27ja2n11k7gf")))) (build-system python-build-system) + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-pbr" ,python-pbr-minimal))) (home-page "https://launchpad.net/testresources") (synopsis "Pyunit extension for managing test resources") (description - "Testresources is an extension to Python's unittest to allow declarative -use of resources by test cases.") + "This package is only here for bootstrapping purposes. Use the regular +testresources package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-testresources-bootstrap + (package-with-python2 python-testresources-bootstrap)) + +(define-public python-testresources + (package + (inherit python-testresources-bootstrap) + (name "python-testresources") + (propagated-inputs + `(("python-pbr" ,python-pbr))) + (arguments '()) + (native-inputs + `(("python-fixtures" ,python-fixtures) + ("python-testtols" ,python-testtools))) + (description + "Testresources is an extension to Python's unittest to allow declarative +use of resources by test cases."))) + (define-public python2-testresources (package-with-python2 python-testresources)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index efe8e8c638..22160bcfaa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1695,7 +1695,7 @@ (define-public python-pbr ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository-bootstrap) - ("python-testresources" ,python-testresources) + ("python-testresources" ,python-testresources-bootstrap) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools) ("python-virtualenv" ,python-virtualenv))) -- cgit v1.2.3 From 8b93f7e4371ac53d56314f8a6a4061566b92e28c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 18:33:09 +0100 Subject: gnu: python-testtools: Update to 2.3.0. * gnu/packages/check.scm (python-testtools-bootstrap, python2-testtools-bootstrap): New public variables. (python-testtools): Inherit. [arguments]: Remove old. Replace CHECK-PHASE with custom command. [propagated-inputs]: Add PYTHON-FIXTURES, PYTHON-PBR, PYTHON-SIX, PYTHON-TRACEBACK2 and PYTHON-UNITTEST2. [native-inputs]: Add PYTHON-TESTSCENARIOS-BOOTSTRAP. (python-testscenarios-bootstrap, python2-testscenarios-bootstrap): New public variables. (python-testscenarios): Adjust accordingly. [propagated-inputs]: Replace PYTHON-TESTTOOLS with PYTHON-TESTTOOLS-BOOTSTRAP. (python-subunit-bootstrap, python2-subunit-bootstrap): New public variables. (python-subunit): Inherit. (python-fixtures-bootstrap)[native-inputs]: Replace PYTHON-TESTTOOLS with PYTHON-TESTTOOLS-BOOTSTRAP. (python-testrepository-bootstrap)[native-inputs]: Replace PYTHON-SUBUNIT and PYTHON-TESTTOOLS with PYTHON-SUBUNIT-BOOTSTRAP and PYTHON-TESTTOOLS-BOOTSTRAP. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-TESTSCENARIOS and PYTHON-TESTTOOLS with PYTHON-TESTSCENARIOS-BOOTSTRAP and PYTHON-TESTTOOLS-BOOTSTRAP. --- gnu/packages/check.scm | 129 +++++++++++++++++++++++++++++++----------------- gnu/packages/python.scm | 4 +- 2 files changed, 87 insertions(+), 46 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0a7d888d46..6b6d0376e8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -834,57 +834,68 @@ (define-public python-scripttest (define-public python2-scripttest (package-with-python2 python-scripttest)) -(define-public python-testtools +(define-public python-testtools-bootstrap (package - (name "python-testtools") - (version "1.4.0") + (name "python-testtools-bootstrap") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "testtools" version)) (sha256 (base32 - "1vw8yljnd75d396hhw6s2hrf4cclzy845ifd5am0lxsl235z3i8c")))) + "0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-module-imports - (lambda _ - (substitute* "setup.py" - (("'unittest2>=0.8.0',") "")) - (substitute* '("testtools/testcase.py" - "testtools/testsuite.py" - "testtools/run.py" - "testtools/tests/test_run.py" - "testtools/tests/test_testsuite.py" - "testtools/tests/test_deferredruntest.py") - ;; unittest2 is a backport of Python2.7 features to Python 2.4. - (("import unittest2 as unittest") "import unittest") - (("import unittest2") "import unittest as unittest2") - (("from unittest2 import") "from unittest import")) - (substitute* "testtools/tests/test_testresult.py" - ;; NUL in source code is not allowed (raises ValueError). - (("\\x00\\x04") "\\x04")) - #t))))) + (arguments '(#:tests? #f)) (propagated-inputs - `(("python-mimeparse" ,python-mimeparse) - ("python-extras" ,python-extras))) + `(("python-extras" ,python-extras) + ("python-fixtures" ,python-fixtures-bootstrap) + ("python-mimeparse" ,python-mimeparse) + ("python-pbr" ,python-pbr-minimal) + ("python-six" ,python-six) + ("python-traceback2" ,python-traceback2) + ("python-unittest2" ,python-unittest2))) (home-page "https://github.com/testing-cabal/testtools") (synopsis "Extensions to the Python standard library unit testing framework") + (description + "This package is only for bootstrapping. Do not use this.") + (license license:psfl))) + +(define-public python2-testtools-bootstrap + (package-with-python2 python-testtools-bootstrap)) + +(define-public python-testtools + (package + (inherit python-testtools-bootstrap) + (name "python-testtools") + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-m" "testtools.run" + "testtools.tests.test_suite")))))) + (propagated-inputs + `(("python-extras" ,python-extras) + ("python-fixtures" ,python-fixtures) + ("python-mimeparse" ,python-mimeparse) + ("python-pbr" ,python-pbr) + ("python-six" ,python-six) + ("python-traceback2" ,python-traceback2) + ("python-unittest2" ,python-unittest2))) + (native-inputs + `(("python-testscenarios" ,python-testscenarios-bootstrap))) (description "Testtools extends the Python standard library unit testing framework to provide matchers, more debugging information, and cross-Python -compatibility.") - (license license:psfl))) +compatibility."))) (define-public python2-testtools (package-with-python2 python-testtools)) -(define-public python-testscenarios +(define-public python-testscenarios-bootstrap (package - (name "python-testscenarios") + (name "python-testscenarios-bootstrap") (version "0.4") (source (origin @@ -897,14 +908,26 @@ (define-public python-testscenarios "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) (build-system python-build-system) (propagated-inputs - `(("python-testtools" ,python-testtools))) + `(("python-testtools" ,python-testtools-bootstrap))) (home-page "https://launchpad.net/testscenarios") (synopsis "Pyunit extension for dependency injection") (description - "Testscenarios provides clean dependency injection for Python unittest -style tests.") + "This package is only for bootstrapping. Don't use this.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-testscenarios-bootstrap + (package-with-python2 python-testscenarios-bootstrap)) + +(define-public python-testscenarios + (package + (inherit python-testscenarios-bootstrap) + (name "python-testscenarios") + (propagated-inputs + `(("python-testtools" ,python-testtools))) + (description + "Testscenarios provides clean dependency injection for Python unittest +style tests."))) + (define-public python2-testscenarios (package-with-python2 python-testscenarios)) @@ -952,32 +975,50 @@ (define-public python-testresources (define-public python2-testresources (package-with-python2 python-testresources)) -(define-public python-subunit +(define-public python-subunit-bootstrap (package - (name "python-subunit") + (name "python-subunit-bootstrap") (version "1.2.0") (source (origin (method url-fetch) - (uri (pypi-uri name version)) + (uri (pypi-uri "python-subunit" version)) (sha256 (base32 "1yii2gx3z6323as3iraj1yphj76dy7i3h6kj63pnc5y0hwjs5sgx")))) (build-system python-build-system) (propagated-inputs `(("python-extras" ,python-extras) - ("python-testtools" ,python-testtools))) + ("python-testtools" ,python-testtools-bootstrap))) (native-inputs `(("python-fixtures" ,python-fixtures-bootstrap) ("python-hypothesis" ,python-hypothesis) - ("python-testscenarios" ,python-testscenarios))) + ("python-testscenarios" ,python-testscenarios-bootstrap))) (home-page "http://launchpad.net/subunit") (synopsis "Python implementation of the subunit protocol") (description - "Python-subunit is a Python implementation of the subunit test streaming -protocol.") + "This package is here for bootstrapping purposes only. Use the regular +python-subunit package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-subunit-bootstrap + (package-with-python2 python-subunit-bootstrap)) + +(define-public python-subunit + (package + (inherit python-subunit-bootstrap) + (name "python-subunit") + (propagated-inputs + `(("python-extras" ,python-extras) + ("python-testtools" ,python-testtools))) + (native-inputs + `(("python-fixtures" ,python-fixtures) + ("python-hypothesis" ,python-hypothesis) + ("python-testscenarios" ,python-testscenarios))) + (description + "Python-subunit is a Python implementation of the subunit test streaming +protocol."))) + (define-public python2-subunit (package-with-python2 python-subunit)) @@ -1025,7 +1066,7 @@ (define-public python-fixtures ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-testtools" ,python-testtools))) + ("python-testtools" ,python-testtools-bootstrap))) (description "Fixtures provides a way to create reusable state, useful when writing Python tests."))) @@ -1050,8 +1091,8 @@ (define-public python-testrepository-bootstrap (arguments '(#:tests? #f)) (propagated-inputs `(("python-fixtures" ,python-fixtures-bootstrap) - ("python-subunit" ,python-subunit) - ("python-testtools" ,python-testtools))) + ("python-subunit" ,python-subunit-bootstrap) + ("python-testtools" ,python-testtools-bootstrap))) (native-inputs `(("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f08d93dc78..8285a4ea3c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1694,8 +1694,8 @@ (define-public python-pbr ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository-bootstrap) ("python-testresources" ,python-testresources-bootstrap) - ("python-testscenarios" ,python-testscenarios) - ("python-testtools" ,python-testtools) + ("python-testscenarios" ,python-testscenarios-bootstrap) + ("python-testtools" ,python-testtools-bootstrap) ("python-virtualenv" ,python-virtualenv))) (synopsis "Enhance the default behavior of Python’s setuptools") (description -- cgit v1.2.3 From ae565a9a6d3329a0be11fa021f046260b35a4958 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 18:51:44 +0100 Subject: gnu: python-testscenarios: Update to 0.5.0. * gnu/packages/check.scm (python-testscenarios-bootstrap): Update to 0.5.0. [source](uri): Use PYPI-URI. [arguments]: Replace CHECK-PHASE. [propagated-inputs]: Add PYTHON-PBR-MINIMAL. (python-testscenarios)[propagated-inputs]: Add PYTHON-PBR. --- gnu/packages/check.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6b6d0376e8..19d7dec393 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -896,19 +896,24 @@ (define-public python2-testtools (define-public python-testscenarios-bootstrap (package (name "python-testscenarios-bootstrap") - (version "0.4") + (version "0.5.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testscenarios/testscenarios-" - version ".tar.gz")) + (uri (pypi-uri "testscenarios" version)) (sha256 (base32 - "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) + "1dm2aydqpv76vnsk1pw7k8n42hq58cfi4n1ixy7nyzpaj1mwnmy2")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-m" "testtools.run" + "testscenarios.test_suite")))))) (propagated-inputs - `(("python-testtools" ,python-testtools-bootstrap))) + `(("python-pbr" ,python-pbr-minimal) + ("python-testtools" ,python-testtools-bootstrap))) (home-page "https://launchpad.net/testscenarios") (synopsis "Pyunit extension for dependency injection") (description @@ -923,7 +928,8 @@ (define-public python-testscenarios (inherit python-testscenarios-bootstrap) (name "python-testscenarios") (propagated-inputs - `(("python-testtools" ,python-testtools))) + `(("python-pbr" ,python-pbr) + ("python-testtools" ,python-testtools))) (description "Testscenarios provides clean dependency injection for Python unittest style tests."))) -- cgit v1.2.3 From 9c77852e1948f21b62932e073bad49c7bc65b614 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 20:22:36 +0100 Subject: gnu: python-fixtures: Update to 3.0.0. * gnu/packages/check.scm (python-fixtures-bootstrap): Update to 3.0.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 19d7dec393..50b4afcaf0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1033,13 +1033,13 @@ (define-public python2-subunit (define-public python-fixtures-bootstrap (package (name "python-fixtures-bootstrap") - (version "1.4.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (pypi-uri "fixtures" version)) (sha256 (base32 - "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) + "1vxj29bzz3rd4pcy51d05wng9q9dh4jq6wx92yklsm7i6h1ddw7w")))) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs -- cgit v1.2.3 From d4f5e68e55d15f851ad4d820a5384123d9b51441 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Mar 2018 02:49:23 +0100 Subject: gnu: cmdtest: Update to 0.32. * gnu/packages/check.scm (cmdtest): Update to 0.32. --- 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 50b4afcaf0..686c2e2b27 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, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Arun Isaac @@ -202,14 +202,14 @@ (define-public catch-framework (define-public cmdtest (package (name "cmdtest") - (version "0.29") + (version "0.32") (source (origin (method url-fetch) (uri (string-append "http://git.liw.fi/cmdtest/snapshot/" name "-" version ".tar.gz")) (sha256 (base32 - "1i6gi4yp4qqx1liax098c7nwdb24pghh11xqlrcs7lnhh079rqhb")))) + "1jmfiyrrqmpvwdb273bkb8hjaf4rwx9njblx29pmr7giyahskwi5")))) (build-system python-build-system) (arguments `(#:python ,python-2 -- cgit v1.2.3 From 925102bb98f3b501d5168a42ed0d7646f311257c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Mar 2018 03:23:38 +0100 Subject: gnu: cppcheck: Update to 1.82. * gnu/packages/check.scm (cppcheck): Update to 1.82. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 686c2e2b27..73d3efd9e1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -271,13 +271,13 @@ (define-public cmocka (define-public cppcheck (package (name "cppcheck") - (version "1.81") + (version "1.82") (source (origin (method url-fetch) (uri (string-append "https://github.com/danmar/cppcheck/archive/" version ".tar.gz")) (sha256 - (base32 "0miamqk7pa2dzmnmi5wb6hjp2a3zya1x8afnlcxby8jb6gp6wf8j")) + (base32 "0zywpd9hbsx23aj33pk5mbr0fz1ijhqzxlnqgwjfwgg6g2k48i2j")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (home-page "http://cppcheck.sourceforge.net") -- cgit v1.2.3