me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python-sphinx: Update to 1.7.7.

Browse source 
* gnu/packages/openstack.scm (python-mox3, python-openstackdocstheme,
  python-stevedore, python-oslo.config)[native-inputs]: Change
PYTHON-SPHINX-1.6 to PYTHON-SPHINX.
* gnu/packages/python.scm (python-sphinx): Update to 1.7.7.
[arguments]: Incorporate changes from the 1.6 variant.  Disable two tests.
[propagated-inputs]: Add PYTHON-PACKAGING and PYTHON-SPHINXCONTRIB-WEBSUPPORT.
[native-inputs]: Add IMAGEMAGICK and PYTHON-PYTEST.
(python2-sphinx)[propagated-inputs]: Add PYTHON2-TYPING.
(python-sphinx-1.6, python2-sphinx-1.6, python-sphinx-1.5.3): Remove variables.
(python-matplotlib-documentation)[native-inputs]: Change from
PYTHON-SPHINX-1.6 to PYTHON-SPHINX.
This commit is contained in:
Marius Bakke 2018-08-21 15:41:29 +02:00
parent f70785a4c0
commit 3bbfc451ed
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 39 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/openstack.scm
View file

@ -182,7 +182,7 @@ guidelines}.")
("python-pbr" ,python-pbr))) ("python-pbr" ,python-pbr)))
(native-inputs (native-inputs
`(("python-openstackdocstheme" ,python-openstackdocstheme) `(("python-openstackdocstheme" ,python-openstackdocstheme)
("python-sphinx" ,python-sphinx-1.6) ("python-sphinx" ,python-sphinx)
("python-subunit" ,python-subunit) ("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository) ("python-testrepository" ,python-testrepository)
("python-testtools" ,python-testtools))) ("python-testtools" ,python-testtools)))
@ -216,7 +216,7 @@ with mox as possible, but small enhancements have been made.")
`(("python-dulwich" ,python-dulwich) `(("python-dulwich" ,python-dulwich)
("python-pbr" ,python-pbr))) ("python-pbr" ,python-pbr)))
(native-inputs (native-inputs
`(("python-sphinx" ,python-sphinx-1.6))) `(("python-sphinx" ,python-sphinx)))
(home-page "https://docs.openstack.org/openstackdocstheme/latest/") (home-page "https://docs.openstack.org/openstackdocstheme/latest/")
(synopsis "OpenStack Docs Theme") (synopsis "OpenStack Docs Theme")
(description (description
@ -313,7 +313,7 @@ to docs.openstack.org and developer.openstack.org.")
("python-six" ,python-six))) ("python-six" ,python-six)))
(native-inputs (native-inputs
`(("python-mock" ,python-mock) `(("python-mock" ,python-mock)
("python-sphinx" ,python-sphinx-1.6) ("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository))) ("python-testrepository" ,python-testrepository)))
(home-page "https://github.com/dreamhost/stevedore") (home-page "https://github.com/dreamhost/stevedore")
(synopsis "Manage dynamic plugins for Python applications") (synopsis "Manage dynamic plugins for Python applications")
@ -405,7 +405,7 @@ common features used in Tempest.")
("python-openstackdocstheme" ,python-openstackdocstheme) ("python-openstackdocstheme" ,python-openstackdocstheme)
("python-oslotest" ,python-oslotest) ("python-oslotest" ,python-oslotest)
("python-reno" ,python-reno) ("python-reno" ,python-reno)
("python-sphinx" ,python-sphinx-1.6) ("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository) ("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios) ("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools))) ("python-testtools" ,python-testtools)))

113
gnu/packages/python.scm
View file

@ -2410,57 +2410,15 @@ integrate Sphinx documents in web templates and to handle searches.")
(define-public python-sphinx (define-public python-sphinx
(package (package
(name "python-sphinx") (name "python-sphinx")
(version "1.5.1") (version "1.7.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Sphinx" version)) (uri (pypi-uri "Sphinx" version))
(sha256 (sha256
(base32 (base32
"1i8p9idnli4gr0y4x67yakbdk5w6a0xjzhrg6bg51y9d1fi7fslf")))) "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
;; Requires Internet access.
(delete-file "tests/test_build_linkcheck.py")
(zero? (system* "make" "test")))))))
(propagated-inputs
`(("python-imagesize" ,python-imagesize)
("python-sphinx-alabaster-theme"
,python-sphinx-alabaster-theme)
("python-babel" ,python-babel)
("python-snowballstemmer" ,python-snowballstemmer)
("python-docutils" ,python-docutils)
("python-jinja2" ,python-jinja2)
("python-pygments" ,python-pygments)
("python-requests" ,python-requests)
("python-six" ,python-six)))
(native-inputs
`(("graphviz" ,graphviz)
("python-html5lib" ,python-html5lib)
("python-mock" ,python-mock)
("python-nose" ,python-nose)))
(home-page "http://sphinx-doc.org/")
(synopsis "Python documentation generator")
(description "Sphinx is a tool that makes it easy to create documentation
for Python projects or other documents consisting of multiple reStructuredText
sources.")
(license license:bsd-3)
(properties `((python2-variant . ,(delay python2-sphinx))))))
(define-public python-sphinx-1.6
(package (inherit python-sphinx)
(name "python-sphinx")
(version "1.6.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
"0gjakw9fv5pwqb5yyclxycs36sapxizk1vx6mkcdizmzgzcfy0gi"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -2471,41 +2429,39 @@ sources.")
(substitute* "tests/test_build_latex.py" (substitute* "tests/test_build_latex.py"
(("@pytest.mark.sphinx\\('latex', testroot='images'\\)") (("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
"@pytest.mark.skip()")) "@pytest.mark.skip()"))
(zero? (system* "make" "test"))))))) (when (which "python")
;; XXX: These tests are broken when using Python2:
;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
(delete-file "tests/test_api_translator.py")
(delete-file "tests/test_setup_command.py"))
(invoke "make" "test"))))))
(propagated-inputs (propagated-inputs
`(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport) `(("python-imagesize" ,python-imagesize)
,@(package-propagated-inputs python-sphinx))) ("python-sphinx-alabaster-theme"
,python-sphinx-alabaster-theme)
("python-babel" ,python-babel)
("python-snowballstemmer" ,python-snowballstemmer)
("python-docutils" ,python-docutils)
("python-jinja2" ,python-jinja2)
("python-packaging" ,python-packaging)
("python-pygments" ,python-pygments)
("python-requests" ,python-requests)
("python-six" ,python-six)
("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("graphviz" ,graphviz)
("imagemagick" ,imagemagick) ; for "convert" ("imagemagick" ,imagemagick) ;for "convert"
,@(package-native-inputs python-sphinx))) ("python-html5lib" ,python-html5lib)
(properties `((python2-variant . ,(delay python2-sphinx-1.6)))))) ("python-mock" ,python-mock)
("python-nose" ,python-nose)
(define-public python2-sphinx-1.6 ("python-pytest" ,python-pytest)))
(let ((base (package-with-python2 (strip-python2-variant python-sphinx-1.6)))) (home-page "http://sphinx-doc.org/")
(package (synopsis "Python documentation generator")
(inherit base) (description "Sphinx is a tool that makes it easy to create documentation
(propagated-inputs for Python projects or other documents consisting of multiple reStructuredText
`(("python2-typing" ,python2-typing) sources.")
,@(package-propagated-inputs base))) (license license:bsd-3)
(native-inputs `(("python2-enum34" ,python2-enum34) (properties `((python2-variant . ,(delay python2-sphinx))))))
,@(package-native-inputs base))))))
(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)
,@(package-native-inputs python-sphinx)))))
(define-public python2-sphinx (define-public python2-sphinx
(let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
@ -2515,6 +2471,7 @@ sources.")
("python2-enum34" ,python2-enum34) ("python2-enum34" ,python2-enum34)
,@(package-native-inputs base))) ,@(package-native-inputs base)))
(propagated-inputs `(("python2-pytz" ,python2-pytz) (propagated-inputs `(("python2-pytz" ,python2-pytz)
("python2-typing" ,python2-typing)
,@(package-propagated-inputs base)))))) ,@(package-propagated-inputs base))))))
(define-public python-sphinx-gallery (define-public python-sphinx-gallery
@ -3502,7 +3459,7 @@ toolkits.")
(native-inputs (native-inputs
`(("python-matplotlib" ,python-matplotlib) `(("python-matplotlib" ,python-matplotlib)
("python-colorspacious" ,python-colorspacious) ("python-colorspacious" ,python-colorspacious)
("python-sphinx" ,python-sphinx-1.6) ("python-sphinx" ,python-sphinx)
("python-sphinx-gallery" ,python-sphinx-gallery) ("python-sphinx-gallery" ,python-sphinx-gallery)
("python-numpydoc" ,python-numpydoc) ("python-numpydoc" ,python-numpydoc)
("python-ipython" ,python-ipython) ("python-ipython" ,python-ipython)