Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 12c3de4bd6 | |||
| 1f61c2034c | |||
| 50327b0679 |
@@ -0,0 +1 @@
|
|||||||
|
Sphinx-0.3.tar.gz
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
/Sphinx-1.2.3.tar.gz
|
|
||||||
/Sphinx-1.3.1.tar.gz
|
|
||||||
/Sphinx-1.4.4.tar.gz
|
|
||||||
/Sphinx-1.4.5.tar.gz
|
|
||||||
/Sphinx-1.4.6.tar.gz
|
|
||||||
/Sphinx-1.4.8.tar.gz
|
|
||||||
/Sphinx-1.4.9.tar.gz
|
|
||||||
/Sphinx-1.5.1.tar.gz
|
|
||||||
/Sphinx-1.5.2.tar.gz
|
|
||||||
/Sphinx-1.6.3.tar.gz
|
|
||||||
/Sphinx-1.6.4.tar.gz
|
|
||||||
/Sphinx-1.6.5.tar.gz
|
|
||||||
/Sphinx-1.6.6.tar.gz
|
|
||||||
/Sphinx-1.7.1.tar.gz
|
|
||||||
/Sphinx-1.7.2.tar.gz
|
|
||||||
/Sphinx-1.7.5.tar.gz
|
|
||||||
/Sphinx-1.7.6.tar.gz
|
|
||||||
/Sphinx-1.8.4.tar.gz
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Makefile for source rpm: python-sphinx
|
||||||
|
# $Id$
|
||||||
|
NAME := python-sphinx
|
||||||
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
|
||||||
|
define find-makefile-common
|
||||||
|
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
|
|
||||||
|
ifeq ($(MAKEFILE_COMMON),)
|
||||||
|
# attept a checkout
|
||||||
|
define checkout-makefile-common
|
||||||
|
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(MAKEFILE_COMMON)
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
Sphinx with autodoc is sensitive to whether it is run via Python2 or Python3
|
|
||||||
as it uses the Python version that it is invoked with to parse the source
|
|
||||||
files for docstrings. Unfortunately, there's no logic to detect this within
|
|
||||||
the sphinx commands and the standard Makefiles generated by sphinx-quickstart
|
|
||||||
don't give the user any hint that it might be a problem.
|
|
||||||
|
|
||||||
The Fedora package tries to mitigate this problem by allowing the user to
|
|
||||||
switch between the Python2 and Python3 versions using environment-modules. To
|
|
||||||
switch to the Python3 commands, use::
|
|
||||||
|
|
||||||
module swap python-sphinx/python3-sphinx
|
|
||||||
|
|
||||||
To switch to the Python2 version, use::
|
|
||||||
|
|
||||||
module swap python-sphinx/python2-sphinx
|
|
||||||
|
|
||||||
The default install uses the python2 version of the modules.
|
|
||||||
If the system administrator wishes to change the default, edit the
|
|
||||||
/etc/profile.d/zz-modules-python-sphinx.sh and
|
|
||||||
/etc/profile.d/zz-modules-python-sphinx.csh files to specify a specific
|
|
||||||
alternative to use. For instance, to make the python3 version the default,
|
|
||||||
modify it like so::
|
|
||||||
|
|
||||||
@@ -1,2 +1,2 @@
|
|
||||||
# Add path to the default python-sphinx scripts on this version of Fedora
|
|
||||||
-module load python-sphinx
|
|
||||||
+module load python-sphinx/python3-sphinx
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
#%Module1.0
|
|
||||||
set ModuleVersion "python@PYTHONVER@-sphinx"
|
|
||||||
+42
-918
File diff suppressed because it is too large
Load Diff
@@ -1,6 +0,0 @@
|
|||||||
#%Module 1.0
|
|
||||||
#
|
|
||||||
# python2-sphinx module for use with 'environment modules' package
|
|
||||||
#
|
|
||||||
conflict python-sphinx
|
|
||||||
prepend-path PATH @python2_sphinx_dir@
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
#%Module 1.0
|
|
||||||
#
|
|
||||||
# python2-sphinx module for use with 'environment modules' package
|
|
||||||
#
|
|
||||||
conflict python-sphinx
|
|
||||||
prepend-path PATH @python3_sphinx_dir@
|
|
||||||
@@ -1 +1 @@
|
|||||||
SHA512 (Sphinx-1.8.4.tar.gz) = 6821bb56c30b52f357ae55f5db45f056883c457eae62a0751a2b654519a07bca9edccb7678b29fa380379f059c9d8899d9e7b06ceccca5ec26962e6f83bb8578
|
98550d222aec91a029c0921819c4c49f Sphinx-0.3.tar.gz
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
|
|
||||||
--- Sphinx-1.7.6/tests/test_theming.py 2018-07-16 11:24:40.000000000 +0200
|
|
||||||
+++ Sphinx-1.7.6_patched/tests/test_theming.py 2018-07-20 15:17:35.049263077 +0200
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
themes.append('alabaster')
|
|
||||||
|
|
||||||
# test Theme class API
|
|
||||||
- assert set(app.html_themes.keys()) == set(themes)
|
|
||||||
+ assert set(app.html_themes.keys()) >= set(themes)
|
|
||||||
assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
|
|
||||||
assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
|
|
||||||
assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
|
|
||||||
index 55f48cd..78ccecd 100644
|
|
||||||
--- a/tests/test_build_latex.py
|
|
||||||
+++ b/tests/test_build_latex.py
|
|
||||||
@@ -1009,7 +1009,7 @@ def test_latex_raw_directive(app, status, warning):
|
|
||||||
assert 'HTML: abc ghi' in result
|
|
||||||
assert 'LaTeX: abc def ghi' in result
|
|
||||||
|
|
||||||
-
|
|
||||||
+@pytest.mark.xfail(reason="this test requires internet connection")
|
|
||||||
@pytest.mark.sphinx('latex', testroot='images')
|
|
||||||
def test_latex_remote_images(app, status, warning):
|
|
||||||
app.builder.build_all()
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# Add path to the default python-sphinx scripts on this version of Fedora
|
|
||||||
module load python-sphinx >& /dev/null
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# Add path to the default python-sphinx scripts on this version of Fedora
|
|
||||||
module load python-sphinx 2> /dev/null
|
|
||||||
Reference in New Issue
Block a user