From 7eaa3b45ac63b824c9a98d022f717c217ad021ed Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 14:18:21 -0500 Subject: gnu: python-stevedore: Update to 3.2.2. * gnu/packages/openstack.scm (python-stevedore): Update to 3.2.2. [tests?]: Disable tests. [propagated-inputs]: Remove field. Move python-pbr to... [native-inputs]: ...here. Remove python-mock, python-sphinx and python-testrepository. --- gnu/packages/openstack.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index d0294cdef30..1cd7654e1ff 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -310,22 +310,21 @@ to docs.openstack.org and developer.openstack.org.") (define-public python-stevedore (package (name "python-stevedore") - (version "1.28.0") + (version "3.2.2") (source (origin (method url-fetch) (uri (pypi-uri "stevedore" version)) (sha256 (base32 - "02ynfgwma84g59834dmvzr39mcppy5s229zf1w23c0qngf753izi")))) + "1w11lm293afzb73iq0ba9wnmr2rjwymnhr92km4a4xrs7a5qcigq")))) (build-system python-build-system) - (propagated-inputs - `(("python-pbr" ,python-pbr) - ("python-six" ,python-six))) + (arguments + ;; The tests are disabled to avoid a circular dependency with + ;; python-stestr. + `(#:tests? #f)) (native-inputs - `(("python-mock" ,python-mock) - ("python-sphinx" ,python-sphinx) - ("python-testrepository" ,python-testrepository))) + `(("python-pbr" ,python-pbr))) (home-page "https://github.com/dreamhost/stevedore") (synopsis "Manage dynamic plugins for Python applications") (description -- cgit v1.3 From 0b5f73ce212c442ba896584a2397658b211d9ada Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 14:35:45 -0500 Subject: gnu: python-oslotest: Re-indent. * gnu/packages/openstack.scm (python-oslotest): Fix indentation. --- gnu/packages/openstack.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 1cd7654e1ff..791dba5f986 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -639,30 +639,29 @@ from the OpenStack project.") (name "python-oslotest") (version "3.4.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "oslotest" version)) - (sha256 - (base32 - "1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h")))) + (origin + (method url-fetch) + (uri (pypi-uri "oslotest" version)) + (sha256 + (base32 + "1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h")))) (build-system python-build-system) (propagated-inputs - `(("python-fixtures" ,python-fixtures) - ("python-mock" ,python-mock) - ("python-mox3" ,python-mox3) - ("python-os-client-config" ,python-os-client-config) - ("python-six" ,python-six) - ("python-subunit" ,python-subunit) - ("python-testrepository" ,python-testrepository) - ("python-testtools" ,python-testtools))) + `(("python-fixtures" ,python-fixtures) + ("python-mock" ,python-mock) + ("python-mox3" ,python-mox3) + ("python-os-client-config" ,python-os-client-config) + ("python-six" ,python-six) + ("python-subunit" ,python-subunit) + ("python-testrepository" ,python-testrepository) + ("python-testtools" ,python-testtools))) (native-inputs - `(("python-pbr" ,python-pbr) - ("python-testscenarios" ,python-testscenarios))) + `(("python-pbr" ,python-pbr) + ("python-testscenarios" ,python-testscenarios))) (home-page "https://launchpad.net/oslo") (synopsis "Oslo test framework") - (description - "The Oslo Test framework provides common fixtures, support for debugging, -and better support for mocking results.") + (description "The Oslo Test framework provides common fixtures, support +for debugging, and better support for mocking results.") (license asl2.0))) (define-public python2-oslotest -- cgit v1.3 From 21b78681f4b36993f82c64075f1c461fb4f51836 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 15:00:05 -0500 Subject: gnu: python-oslotest: Update to 4.4.1. * gnu/packages/openstack.scm (python-oslotest): Update to 4.4.1. [tests?]: Disable test suite. [propagated-inputs]: Remove python-mock, python-mox3, python-os-client-config and python-testrepository. [native-inputs]: Remove field. --- gnu/packages/openstack.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 791dba5f986..e0c0bc39fb6 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -637,27 +637,23 @@ from the OpenStack project.") (define-public python-oslotest (package (name "python-oslotest") - (version "3.4.0") + (version "4.4.1") (source (origin (method url-fetch) (uri (pypi-uri "oslotest" version)) (sha256 (base32 - "1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h")))) + "0r50sz55m8ljv2vk1k7sp88iz1iqq4p9w6kb8hn8g8c50r9zdi5i")))) (build-system python-build-system) + (arguments + ;; The tests are disabled to avoid a circular dependency with oslo.config. + `(#:tests? #f)) (propagated-inputs `(("python-fixtures" ,python-fixtures) - ("python-mock" ,python-mock) - ("python-mox3" ,python-mox3) - ("python-os-client-config" ,python-os-client-config) ("python-six" ,python-six) ("python-subunit" ,python-subunit) - ("python-testrepository" ,python-testrepository) ("python-testtools" ,python-testtools))) - (native-inputs - `(("python-pbr" ,python-pbr) - ("python-testscenarios" ,python-testscenarios))) (home-page "https://launchpad.net/oslo") (synopsis "Oslo test framework") (description "The Oslo Test framework provides common fixtures, support -- cgit v1.3 From a2ec24c65cbfae9e65699c7962b3b8d62b7cd3c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 15:32:56 -0500 Subject: gnu: python-bandit: Update to 1.6.2. * gnu/packages/openstack.scm (python-bandit): Update to 1.6.2. [phases]: Remove argument. [tests?]: Disable test suite. [native-inputs]: Remove python-beautifulsoup4, python-fixtures, python-mock, python-subunit, python-testrepository, python-testscenarios and python-testtools. Add python-pbr. --- gnu/packages/openstack.scm | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index e0c0bc39fb6..1c1fe66071e 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -45,40 +45,26 @@ (define-public python-bandit (package (name "python-bandit") - (version "1.4.0") + (version "1.6.2") (source (origin (method url-fetch) (uri (pypi-uri "bandit" version)) (sha256 (base32 - "1m5bm42120zyazky4k0lp3d9r0jwhjmp6sb108xfr0vz952p15yb")))) + "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tests require the 'bandit' executable in PATH. - ;; It's only built during install time. - (add-installed-pythonpath inputs outputs) - (setenv "PATH" (string-append (assoc-ref outputs "out") - "/bin:" (getenv "PATH"))) - (invoke "python" "setup.py" "testr")))))) + ;; The tests are disabled to avoid a circular dependency with + ;; python-stestr. + `(#:tests? #f)) (propagated-inputs `(("python-gitpython" ,python-gitpython) ("python-pyyaml" ,python-pyyaml) ("python-six" ,python-six) ("python-stevedore" ,python-stevedore))) (native-inputs - `(;; Tests. - ("python-beautifulsoup4" ,python-beautifulsoup4) - ("python-fixtures" ,python-fixtures) - ("python-mock" ,python-mock) - ("python-subunit" ,python-subunit) - ("python-testrepository" ,python-testrepository) - ("python-testscenarios" ,python-testscenarios) - ("python-testtools" ,python-testtools))) + `(("python-pbr" ,python-pbr))) (home-page "https://github.com/PyCQA/bandit") (synopsis "Security oriented static analyser for python code") (description -- cgit v1.3 From 2cafbf4147d31b0018583618204746424e0c2449 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 16:41:51 -0500 Subject: gnu: python-bandit: Fix indentation. * gnu/packages/openstack.scm (python-bandit): Fix indentation. --- gnu/packages/openstack.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 1c1fe66071e..57f193702a5 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -59,19 +59,18 @@ ;; python-stestr. `(#:tests? #f)) (propagated-inputs - `(("python-gitpython" ,python-gitpython) - ("python-pyyaml" ,python-pyyaml) - ("python-six" ,python-six) - ("python-stevedore" ,python-stevedore))) + `(("python-gitpython" ,python-gitpython) + ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) + ("python-stevedore" ,python-stevedore))) (native-inputs - `(("python-pbr" ,python-pbr))) + `(("python-pbr" ,python-pbr))) (home-page "https://github.com/PyCQA/bandit") (synopsis "Security oriented static analyser for python code") - (description - "Bandit is a tool designed to find common security issues in Python code. -To do this Bandit processes each file, builds an AST from it, and runs -appropriate plugins against the AST nodes. Once Bandit has finished scanning -all the files it generates a report.") + (description "Bandit is a tool designed to find common security issues in +Python code. To do this Bandit processes each file, builds an AST from it, +and runs appropriate plugins against the AST nodes. Once Bandit has finished +scanning all the files it generates a report.") (license asl2.0))) (define-public python-debtcollector -- cgit v1.3 From 762238c4d3210b5102dbe0b03238f74d580e1c68 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 15:35:02 -0500 Subject: gnu: Add python-cliff. * gnu/packages/openstack.scm (python-cliff): New variable. --- gnu/packages/openstack.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 57f193702a5..2239c211a75 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -73,6 +73,38 @@ and runs appropriate plugins against the AST nodes. Once Bandit has finished scanning all the files it generates a report.") (license asl2.0))) +(define-public python-cliff + (package + (name "python-cliff") + (version "3.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cliff" version)) + (sha256 + (base32 + "0n8pzr0mnn9lq2mykds69ij2xrn0fsirh4ndmkx0mzydbx5niysv")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-pbr" ,python-pbr))) + (propagated-inputs + `(("python-cmd2" ,python-cmd2) + ("python-prettytable" ,python-prettytable) + ("python-pyparsing" ,python-pyparsing) + ("python-pyyaml" ,python-pyyaml) + ("python-bandit" ,python-bandit) + ("python-stevedore" ,python-stevedore))) + (home-page "https://opendev.org/openstack/cliff") + (synopsis "Framework for building command line programs") + (description "The @code{cliff} framework allows creating multi-level +commands such as those of @command{subversion} and @command{git}, where the +main program handles some basic argument parsing and then invokes a +sub-command to do the work. It uses plugins to define sub-commands, output +formatters, and other extensions.") + (license asl2.0))) + (define-public python-debtcollector (package (name "python-debtcollector") -- cgit v1.3 From 226b2af51a4fa936ccb4f6d35505f893808b7b31 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 16:14:15 -0500 Subject: gnu: python-hacking: Update to 4.0.0. Fixes . * gnu/packages/openstack.scm (python-hacking): Update to 4.0.0. [arguments]: Remove field. [propagated-inputs]: Remove python-flake8-2.6, python-mccabe-0.2.1, python-pbr, python-pep8-1.5.7, python-pyflakes-1.2, python-six. Add python-flake8. [native-inputs]: Remove python-reno and python-testrepository. Add python-coverage, python-ddt, python-dnspython, python-fixtures, python-monotonic, python-subunit, python-stestr and python-testtools. (python2-hacking): Remove variable. * gnu/packages/python-xyz.scm (python-pyflakes-1.2) (python-mccabe-0.2.1, python2-mccabe-0.2.1) (python-pep8-1.5.7, python2-pep8-1.5.7) (python-flake8-2.6): Delete variables. --- gnu/packages/openstack.scm | 40 ++++++++------------- gnu/packages/python-xyz.scm | 88 --------------------------------------------- 2 files changed, 15 insertions(+), 113 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 2239c211a75..5fa5a7928cd 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -148,39 +150,30 @@ manner.") (define-public python-hacking (package (name "python-hacking") - (version "1.1.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (pypi-uri "hacking" version)) (sha256 (base32 - "1vlgh81v4vsw3q3cf7qggsp043vq16knp203lrll82h7l7rhd8r3")))) + "062rvbkvbavqqz55f7q00ikwipkn5j0rdls1rrajdbfwgckjcrsm")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-broken-test - (lambda _ - ;; TODO: Just one test fails: - ;; hacking.tests.test_doctest.HackingTestCase.test_pycodestyle - ;; (H403-hacking_docstring_multiline_end-line-5) - (delete-file "hacking/tests/test_doctest.py") - #t))))) - (propagated-inputs - `(("python-flake8" ,python-flake8-2.6) - ("python-mccabe-0.2.1" ,python-mccabe-0.2.1) - ("python-pbr" ,python-pbr) - ("python-pep8-1.5.7" ,python-pep8-1.5.7) - ("python-pyflakes-1.2" ,python-pyflakes-1.2) - ("python-six" ,python-six))) + (propagated-inputs + `(("python-flake8" ,python-flake8))) (native-inputs `( ;; Tests + ("python-coverage" ,python-coverage) + ("python-ddt" ,python-ddt) + ("python-dnspython" ,python-dnspython) + ("python-fixtures" ,python-fixtures) ("python-eventlet" ,python-eventlet) ("python-mock" ,python-mock) - ("python-reno" ,python-reno) - ("python-testrepository" ,python-testrepository) - ("python-testscenarios" ,python-testscenarios))) + ("python-monotonic" ,python-monotonic) + ("python-subunit" ,python-subunit) + ("python-stestr" ,python-stestr) + ("python-testscenarios" ,python-testscenarios) + ("python-testtools" ,python-testtools))) (home-page "https://github.com/openstack-dev/hacking") (synopsis "OpenStack hacking guideline enforcement") (description @@ -189,9 +182,6 @@ manner.") guidelines}.") (license asl2.0))) -(define-public python2-hacking - (package-with-python2 python-hacking)) - (define-public python-mox3 (package (name "python-mox3") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b9c20ca4158..53fbb7d31b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8137,27 +8137,6 @@ PEP 8.") (define-public python2-pyflakes (package-with-python2 python-pyflakes)) -;; Flake8 2.6 requires an older version of pyflakes. -;; This should be removed ASAP. -(define-public python-pyflakes-1.2 - (package (inherit python-pyflakes) - (version "1.2.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyflakes" version)) - (sha256 - (base32 - "17hkw8yd44cr8fz13phy4aih3r5j2p7ild4zlvqdh2c8dmiinjif")))) - (arguments - '(#:phases - (modify-phases %standard-phases - ;; This one test fails. - (replace 'check - (lambda _ (invoke "pytest" "-vv" "-k" "not test_f_string")))))) - (native-inputs - `(("python-pytest" ,python-pytest))))) - (define-public python-mccabe (package (name "python-mccabe") @@ -8183,39 +8162,6 @@ complexity of Python source code.") (define-public python2-mccabe (package-with-python2 python-mccabe)) -(define-public python-mccabe-0.2.1 - (package (inherit python-mccabe) - (version "0.2.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mccabe" version)) - (sha256 - (base32 - "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))))) - -(define-public python2-mccabe-0.2.1 - (package-with-python2 python-mccabe-0.2.1)) - -;; Flake8 2.4.1 requires an older version of pep8. -;; This should be removed ASAP. -(define-public python-pep8-1.5.7 - (package (inherit python-pep8) - (version "1.5.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pep8" version)) - (sha256 - (base32 - "12b9bbdbwnspxgak14xg58c130x2n0blxzlms5jn2dszn8qj3d0m")))) - (arguments - ;; XXX Tests not compatible with Python 3.5. - '(#:tests? #f)))) - -(define-public python2-pep8-1.5.7 - (package-with-python2 python-pep8-1.5.7)) - (define-public python-flake8 (package (name "python-flake8") @@ -8262,40 +8208,6 @@ complexity of Python source code.") ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) -;; python-hacking requires flake8 <2.7.0. -(define-public python-flake8-2.6 - (package - (inherit python-flake8) - (version "2.6.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-later-pycodestyles - (lambda __ - (substitute* '("flake8.egg-info/requires.txt" - "setup.py") - (("pycodestyle >= 2.0, < 2.1") - "pycodestyle >= 2.0")) - #t)) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v") - #t))))) - (propagated-inputs - `(("python-pep8" ,python-pep8) - ("python-pycodestyle" ,python-pycodestyle) - ("python-entrypoints" ,python-entrypoints) - ("python-pyflakes" ,python-pyflakes-1.2) - ("python-mccabe" ,python-mccabe))))) - (define-public python-flake8-bugbear (package (name "python-flake8-bugbear") -- cgit v1.3 From 9b1315a4adc9cbea6af7b0bfe045032af8aa81c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 22:24:31 -0500 Subject: gnu: python-oslo: Update to 3.1.1. * gnu/packages/openstack.scm (python-oslo): Update to 3.1.1. [phases]: Add new 'relax-requirements phase. [propagated-inputs]: Move python-pbr... [native-inputs]: ...here. Add python-bandit, python-coverage and python-stestr. --- gnu/packages/openstack.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 5fa5a7928cd..4ed2948290d 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -433,22 +433,33 @@ common features used in Tempest.") (define-public python-oslo.context (package (name "python-oslo.context") - (version "2.20.0") + (version "3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "oslo.context" version)) (sha256 (base32 - "0iiq9rpwg6wrdqnhf3d8z8g0g7fjhs5zn6qw6igvxplz2c3rbvvx")))) + "1l2z186rkd9acrb2ygf53yrdc1lgf7cy1akbhm21kgkzind4p2r6")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "test-requirements.txt" + (("hacking>=3.0.1,<3.1.0") + "hacking>=3.0.1")) + #t))))) (propagated-inputs - `(("python-debtcollector" ,python-debtcollector) - ("python-pbr" ,python-pbr))) + `(("python-debtcollector" ,python-debtcollector))) (native-inputs - `(("python-fixtures" ,python-fixtures) + `(("python-bandit" ,python-bandit) + ("python-coverage" ,python-coverage) + ("python-fixtures" ,python-fixtures) ("python-hacking" ,python-hacking) - ("python-oslotest" ,python-oslotest))) + ("python-oslotest" ,python-oslotest) + ("python-pbr" ,python-pbr) + ("python-stestr" ,python-stestr))) (home-page "https://launchpad.net/oslo") (synopsis "Oslo context library") (description -- cgit v1.3 From 5c6c3fbd8c3685274bd557e04207f04686e3d3a4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 23:03:24 -0500 Subject: gnu: python-oslosphinx: Fix indentation. * gnu/packages/openstack.scm (python-oslosphinx): Fix indentation. --- gnu/packages/openstack.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 4ed2948290d..eb32d904511 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -636,17 +636,16 @@ and building documentation from them.") ;; Therefore, we don't do it here. (invoke "python" "setup.py" "build_sphinx")))))) (propagated-inputs - `(("python-requests" ,python-requests))) + `(("python-requests" ,python-requests))) (native-inputs - `(("python-pbr" ,python-pbr) - ("python-docutils" ,python-docutils) - ("python-hacking" ,python-hacking) - ("python-sphinx" ,python-sphinx))) + `(("python-pbr" ,python-pbr) + ("python-docutils" ,python-docutils) + ("python-hacking" ,python-hacking) + ("python-sphinx" ,python-sphinx))) (home-page "https://www.openstack.org/") (synopsis "OpenStack sphinx extensions and theme") - (description - "This package provides themes and extensions for Sphinx documentation -from the OpenStack project.") + (description "This package provides themes and extensions for Sphinx +documentation from the OpenStack project.") (license asl2.0))) (define-public python2-oslosphinx -- cgit v1.3 From b5b548efc51432563ea2d4fbda7b896a76c6eb95 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Nov 2020 22:59:33 -0500 Subject: gnu: python-oslosphinx: Update to 4.18.0. * gnu/packages/openstack.scm (python-oslosphinx): Update to 4.18.0. [phases]: Delete 'check replacement. Add a 'relax-requirements phase. [native-inputs]: Remove python-docutils. Add python-openstackdocstheme and python-reno. (python2-oslosphinx): Remove variable. --- gnu/packages/openstack.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index eb32d904511..13b92936d08 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -617,30 +617,31 @@ and building documentation from them.") (define-public python-oslosphinx (package (name "python-oslosphinx") - (version "4.10.0") + (version "4.18.0") (source (origin (method url-fetch) (uri (pypi-uri "oslosphinx" version)) (sha256 (base32 - "09mxqyabi68f3s3arvdhlhq0mn38vf74jbsfcg84151hcj6czhnl")))) + "1xm41857vzrzjmnyi6bqirg4i5qa61v7wxcsdc4q1nzgr3ndgz5k")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'check + (add-after 'unpack 'relax-requirements (lambda _ - ;; Note: Upstream tests would have also built the release notes. - ;; That only would work if we were in a git checkout. - ;; Therefore, we don't do it here. - (invoke "python" "setup.py" "build_sphinx")))))) + (substitute* "test-requirements.txt" + (("hacking!=0.13.0,<0.14,>=0.12.0") + "hacking!=0.13.0,>=0.12.0")) + #t))))) (propagated-inputs `(("python-requests" ,python-requests))) (native-inputs - `(("python-pbr" ,python-pbr) - ("python-docutils" ,python-docutils) - ("python-hacking" ,python-hacking) + `(("python-hacking" ,python-hacking) + ("python-openstackdocstheme" ,python-openstackdocstheme) + ("python-pbr" ,python-pbr) + ("python-reno" ,python-reno) ("python-sphinx" ,python-sphinx))) (home-page "https://www.openstack.org/") (synopsis "OpenStack sphinx extensions and theme") @@ -648,9 +649,6 @@ and building documentation from them.") documentation from the OpenStack project.") (license asl2.0))) -(define-public python2-oslosphinx - (package-with-python2 python-oslosphinx)) - (define-public python-oslotest (package (name "python-oslotest") -- cgit v1.3