Update to 1.5.6

as the new version breaks too many packages.

.gitignore

@@ -5,3 +5,7 @@
 /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.5.5.tar.gz
+/Sphinx-1.5.6.tar.gz

README.fedora

@@ -0,0 +1,27 @@
+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

default-sphinx-command.in

@@ -0,0 +1,2 @@
+#%Module1.0
+set ModuleVersion  "python@PYTHONVER@-sphinx"

fix-crash-on-parallel-build.patch

@@ -0,0 +1,12 @@
+diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py
+index ce51ac0..64f9bc1 100644
+--- a/sphinx/util/parallel.py
++++ b/sphinx/util/parallel.py
+@@ -100,6 +100,7 @@ class ParallelTasks(object):
+                     raise SphinxParallelError(*result)
+                 self._result_funcs.pop(tid)(self._args.pop(tid), result)
+                 self._procs[tid].join()
++                self._precvs.pop(tid)
+                 self._pworking -= 1
+                 break
+         else:

python-sphinx-xapian.patch

@@ -0,0 +1,34 @@
+From cf795894b9290c5ab2035ae21535f0a7f4b7107a Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Fri, 16 Dec 2016 19:44:27 +0900
+Subject: [PATCH] Fix #3246: xapian search adapter crashes
+
+---
+ CHANGES                                  | 2 ++
+ sphinx/websupport/search/xapiansearch.py | 6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py
+index 1e43dcb..aa7cff8 100644
+--- a/sphinx/websupport/search/xapiansearch.py
++++ b/sphinx/websupport/search/xapiansearch.py
+@@ -39,16 +39,16 @@ def finish_indexing(self):
+         # Ensure the db lock is removed.
+         del self.database
+ 
+-    def add_document(self, path, title, text):
++    def add_document(self, pagename, filename, title, text):
+         self.database.begin_transaction()
+         # sphinx_page_path is used to easily retrieve documents by path.
+-        sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_')
++        sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_')
+         # Delete the old document if it exists.
+         self.database.delete_document(sphinx_page_path)
+ 
+         doc = xapian.Document()
+         doc.set_data(text)
+-        doc.add_value(self.DOC_PATH, path)
++        doc.add_value(self.DOC_PATH, pagename)
+         doc.add_value(self.DOC_TITLE, title)
+         self.indexer.set_document(doc)
+         self.indexer.index_text(text)

python-sphinx.spec

@@ -4,18 +4,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
-# At some point, RHEL will need to be in here too
-%if 0%{?fedora} && 0%{?fedora} > 24
-%global py3_default 1
-%else
+# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
+%if 1
 %global py3_default 0
+%else
+%global py3_default 1
 %endif
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.4.9
-Release:    2%{?dist}
+Version:    1.5.6
+Release:    1%{?dist}
+Epoch:      1
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -31,7 +32,17 @@ Source1:    python2-sphinx
 Source2:    python3-sphinx
 Source3:    zz-modules-python-sphinx.sh
 Source4:    zz-modules-python-sphinx.csh
-#Patch0:     Sphinx-1.2.1-mantarget.patch
+Source5:    README.fedora
+# environment-modules file to select whether the py2 or py3 version of
+# python-sphinx execuitables is default
+Source6:    default-sphinx-command.in
+
+# Backport of a bugfix from the 1.6 upstream branch of sphinx
+# to address a crash with parallel building.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1494276
+# Upstream commit:
+# https://github.com/sphinx-doc/sphinx/pull/4039/commits/0cb57f19a099be2809a8fb5dc9274f7411e1caac
+Patch0: fix-crash-on-parallel-build.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
@@ -44,6 +55,7 @@ BuildRequires: python-six
 BuildRequires: python2-sphinx_rtd_theme
 BuildRequires: python2-sphinx-theme-alabaster
 BuildRequires: python2-imagesize
+BuildRequires: python2-requests
 BuildRequires: environment(modules)
 
 # for fixes
@@ -51,13 +63,18 @@ BuildRequires: dos2unix
 
 # for testing
 BuildRequires: python-nose
+BuildRequires: python2-pytest
+BuildRequires: python-pytest-cov
 BuildRequires: gettext
 BuildRequires: texinfo
 BuildRequires: graphviz
 BuildRequires: python-sqlalchemy
 BuildRequires: python2-mock
+BuildRequires: python2-simplejson
+BuildRequires: python-html5lib
 BuildRequires: python-whoosh
 BuildRequires: python2-snowballstemmer
+BuildRequires: python-enum34
 # note: no Python3 xapian binding yet
 BuildRequires: xapian-bindings-python
 BuildRequires: texlive-collection-fontsrecommended
@@ -67,7 +84,6 @@ BuildRequires: texlive-dvisvgm
 BuildRequires: texlive-ucs
 BuildRequires: tex(cmap.sty)
 BuildRequires: tex(ecrm1000.tfm)
-BuildRequires: tex(fancybox.sty)
 BuildRequires: tex(footnote.sty)
 BuildRequires: tex(framed.sty)
 BuildRequires: tex(multirow.sty)
@@ -90,6 +106,10 @@ BuildRequires: tex(eqparbox.sty)
 BuildRequires: tex(atbegshi.sty)
 BuildRequires: tex(anyfontsize.sty)
 BuildRequires: tex(luatex85.sty)
+BuildRequires: tex(fncychap.sty)
+BuildRequires: tex(tabulary.sty)
+BuildRequires: tex(polyglossia.sty)
+BuildRequires: tex(eu1enc.def)
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -99,14 +119,19 @@ BuildRequires: python3-docutils
 BuildRequires: python3-jinja2
 BuildRequires: python3-pygments
 BuildRequires: python3-nose
+BuildRequires: python3-pytest
+BuildRequires: python3-pytest-cov
 BuildRequires: python3-sqlalchemy
 BuildRequires: python3-mock
+BuildRequires: python3-simplejson
+BuildRequires: python3-html5lib
 BuildRequires: python3-whoosh
 BuildRequires: python3-snowballstemmer
 BuildRequires: python3-six
 BuildRequires: python3-sphinx_rtd_theme
 BuildRequires: python3-sphinx-theme-alabaster
 BuildRequires: python3-imagesize
+BuildRequires: python3-requests
 %endif # with_python3
 
 
@@ -141,7 +166,7 @@ the Python docs:
 
 %package -n    python2-sphinx
 Summary:       Python documentation generator
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python2-babel
 Requires:      python-docutils
 Requires:      python-jinja2
@@ -152,19 +177,20 @@ Requires:      python2-sphinx_rtd_theme
 Requires:      python2-six
 Requires:      python2-sphinx-theme-alabaster
 Requires:      python2-imagesize
-Requires(posttrans): Lmod
+Requires:      python2-requests
+Requires: environment(modules)
 # Needed to get rid of the alternatives config installed in f24 and f25
 # versions of the package
-Requires(posttrans): /usr/sbin/alternatives
+Requires(pre): /usr/sbin/alternatives
 Recommends:    graphviz
 Obsoletes:     python-sphinx <= 1.2.3
 Obsoletes:     python-sphinxcontrib-napoleon < 0.5
-Provides:      python-sphinxcontrib-napoleon = %{version}-%{release}
+Provides:      python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
 Obsoletes:     python2-Sphinx <= 1.3.1-4
-Provides:      python2-Sphinx = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python2-Sphinx = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python2-sphinx}
-Conflicts:     python3-sphinx < %{version}-%{release}
+Conflicts:     python3-sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python2-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -197,7 +223,7 @@ the Python docs:
 
 %package latex
 Summary:       LaTeX builder dependencies for %{name}
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -205,7 +231,6 @@ Requires:      texlive-dvisvgm
 Requires:      texlive-ucs
 Requires:      tex(cmap.sty)
 Requires:      tex(ecrm1000.tfm)
-Requires:      tex(fancybox.sty)
 Requires:      tex(footnote.sty)
 Requires:      tex(framed.sty)
 Requires:      tex(multirow.sty)
@@ -228,6 +253,10 @@ Requires:      tex(eqparbox.sty)
 Requires:      tex(atbegshi.sty)
 Requires:      tex(anyfontsize.sty)
 Requires:      tex(luatex85.sty)
+Requires:      tex(fncychap.sty)
+Requires:      tex(tabulary.sty)
+Requires:      tex(polyglossia.sty)
+Requires:      tex(eu1enc.def)
 Obsoletes:     python3-sphinx-latex < 1.4.4-2
 
 %description latex
@@ -246,7 +275,7 @@ builder.
 %package -n python3-sphinx
 Summary:       Python documentation generator
 Group:         Development/Tools
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python3-babel
 Requires:      python3-docutils
 Requires:      python3-jinja2
@@ -256,18 +285,18 @@ Requires:      python3-snowballstemmer
 Requires:      python3-sphinx_rtd_theme
 Requires:      python3-sphinx-theme-alabaster
 Requires:      python3-imagesize
+Requires:      python3-requests
 Requires:      python3-six
 Recommends:    graphviz
-Requires(posttrans): Lmod
+Requires: environment(modules)
 # Needed to get rid of the alternatives config installed in f24 and f25
 # versions of the package
-Requires(posttrans): /usr/sbin/alternatives
+Requires(pre): /usr/sbin/alternatives
 Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python3-sphinx}
-Conflicts:     python2-Sphinx < %{version}-%{release}
-Conflicts:     python2-sphinx < %{version}-%{release}
+Conflicts:     python2-Sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -303,7 +332,7 @@ the Python docs:
 Summary:       Documentation for %{name}
 Group:         Documentation
 License:       BSD
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -334,6 +363,8 @@ This package contains locale files for Sphinx
 %prep
 %autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
 
+cp %{SOURCE5} .
+
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 # fix line encoding of bundled jquery.js
@@ -368,6 +399,12 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do
     ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
     ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
 done
+
+# These appear to be incomplete C extensions to speed up parsing.  They are not
+# built by setup.py yet.  Removing them in %%install so that if sphinx does
+# make use of them, and we don't notice, we only remove these source files
+# after the build has created the .so's
+rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
 %endif # with_python3
 
 %py2_install
@@ -378,6 +415,12 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do
     ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
 done
 
+# These appear to be incomplete C extensions to speed up parsing.  They are not
+# built by setup.py yet.  Removing them in %%install so that if sphinx does
+# make use of them, and we don't notice, we only remove these source files
+# after the build has created the .so's
+rm %{buildroot}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
+
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
@@ -395,6 +438,12 @@ done
 find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 popd
 
+# Clean up non-python files
+rm -f %{buildroot}%{python2_sitelib}/sphinx/locale/.DS_Store
+rm -rf %{buildroot}%{python2_sitelib}/sphinx/locale/.tx
+rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
+rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
+
 # Deliver rst files
 rm -rf doc/_build
 sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
@@ -426,23 +475,23 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-pytho
 install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %if %{py3_default}
-ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
+sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
 
 # These symlinks establish a default for when a package is first installed (and
 # therefore, environment modules is not loaded).  The user can immediately
 # switch them by using module swap python-sphinx/python2-sphinx
 for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
+  ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
 done
 
 %else
-ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
+sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
 
 # These symlinks establish a default for when a package is first installed (and
 # therefore, environment modules is not loaded).  The user can immediately
 # switch them by using module swap python-sphinx/python3-sphinx
 for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
+  ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
 done
 
 %endif
@@ -457,9 +506,15 @@ done
 
 
 %check
+# Currently, all linkcheck tests hit external websites.  Since network access
+# is disabled in koji, we have to disable these.
+rm tests/test_build_linkcheck.py
 LANG=en_US.UTF-8 make test
 %if 0%{?with_python3}
 pushd %{py3dir}
+# Currently, all linkcheck tests hit external websites.  Since network access
+# is disabled in koji, we have to disable these.
+rm tests/test_build_linkcheck.py
 LANG=en_US.UTF-8 PYTHON=python3 make test
 popd
 %endif # with_python3
@@ -489,8 +544,12 @@ popd
 
 %files -n python2-sphinx
 %license LICENSE
-%doc AUTHORS CHANGES EXAMPLES README.rst
+%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
 %{_bindir}/sphinx-*-2*
+%{_bindir}/sphinx-build
+%{_bindir}/sphinx-apidoc
+%{_bindir}/sphinx-autogen
+%{_bindir}/sphinx-quickstart
 %{python2_sitelib}/sphinx/
 %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
 %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
@@ -498,31 +557,27 @@ popd
 %{_libexecdir}/python2-sphinx/
 %{_modulesdir}/python-sphinx/python2-sphinx
 %if !%{py3_default}
-%{_modulesdir}/python-sphinx/default
+%{_modulesdir}/python-sphinx/.version
 %endif
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %if 0%{?with_python3}
 
 %files -n python3-sphinx
 %license LICENSE
-%doc AUTHORS CHANGES EXAMPLES README.rst
+%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
 %{_bindir}/sphinx-*-3*
-%{_bindir}/sphinx-build
-%{_bindir}/sphinx-apidoc
-%{_bindir}/sphinx-autogen
-%{_bindir}/sphinx-quickstart
 %{python3_sitelib}/sphinx/
 %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
 %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_libexecdir}/python3-sphinx/
 %{_modulesdir}/python-sphinx/python3-sphinx
 %if %{py3_default}
-%{_modulesdir}/python-sphinx/default
+%{_modulesdir}/python-sphinx/.version
 %endif
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %endif # with_python3
 
@@ -531,6 +586,54 @@ popd
 
 
 %changelog
+* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.6-1
+- Update to 1.5.6
+
+* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.5-1
+- Update to 1.5.5
+
+* Fri Sep 22 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.2-4
+- Fix a crash on parallel build.
+
+* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.5.2-3
+- Provide the epoch tag in order to downgrade at Fedora 26
+
+* Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
+- Cleanup source files that should not be installed
+- Fix the __init__.pyc that was byte compiled for the wrong python
+
+* Fri Feb 17 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-1
+- Update to 1.5.2
+- Remove a few latex dependencies that are no longer needed
+- Remove xapian patch; now in upstream tarball
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jan 31 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-5
+- environment-modules is less featureful than Lmod.
+  - Select the default version in a different way since environment-modules
+    didn't understand the symlink
+  - Ignore error messsages in the shell startup script as environment-modules
+    prints an error message if a module has already been loaded.  The command
+    is doing the right thing for this case except that it's also printing an
+    error message.
+
+* Thu Jan 26 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-4
+- Add recipe for setting the system default to the README.fedora
+
+* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-3
+- Move the unversioned executables into the python2 package as they are now
+  using python2 to run
+
+* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-2
+- Add README.fedora so people know how to use environment-modules to switch.
+- Change the default to be the python2 version to match with the guidelines
+- Switch to generic environment(modules) instead of Lmod specifically.
+
+* Fri Dec 30 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
+- Update to 1.5.1
+
 * Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
 - Remove alternatives.  Alternatives should only be used for a very small
   number of packages (system daemons which also have a compatible command line

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156
+SHA512 (Sphinx-1.5.6.tar.gz) = 4190124d093fca3633a40187731d4284fa041c5d1159af1087ceec507eb398f693dcc655cbce779b63c25e4c925a07dfbfaae5f27c36e42df97226d335be951f

zz-modules-python-sphinx.csh

@@ -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 >& /dev/null

zz-modules-python-sphinx.sh

@@ -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 2> /dev/null