Remove dependency on sphinx-contrib-napoleon now that sphinx is at version >= 1.3

- Tighten versioned dependencies
This commit is contained in:
Michele Baldessari 2015-11-26 23:40:08 +01:00
parent 1e4e94355d
commit 9a9045b98f
2 changed files with 9 additions and 15 deletions

View File

@ -9,15 +9,6 @@ diff -up oauth2client-1.5.0/docs/conf.py.doc oauth2client-1.5.0/docs/conf.py
import sys
# If extensions (or modules to document with autodoc) are in another directory,
@@ -18,7 +17,7 @@ sys.path.insert(0, os.path.abspath('..')
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.coverage',
- 'sphinx.ext.napoleon',
+ 'sphinxcontrib.napoleon',
'sphinx.ext.viewcode',
]
templates_path = ['_templates']
@@ -30,9 +29,8 @@ project = u'oauth2client'
copyright = u'2014, Google, Inc'

View File

@ -29,13 +29,13 @@ BuildRequires: pyOpenSSL
BuildRequires: python-django
BuildRequires: python-flask
BuildRequires: python-gflags
BuildRequires: python-httplib2
BuildRequires: python-httplib2 >= 0.9.1
BuildRequires: python-keyring
BuildRequires: python-pyasn1
BuildRequires: python-pyasn1-modules
BuildRequires: python-rsa
BuildRequires: python-six
BuildRequires: python-sphinxcontrib-napoleon
BuildRequires: python-pyasn1 >= 0.1.7
BuildRequires: python-pyasn1-modules >= 0.0.5
BuildRequires: python-rsa >= 3.1.4
BuildRequires: python-six >= 1.6.1
BuildRequires: python-sphinx > 1.3
BuildRequires: python-sphinx_rtd_theme
%if %{with python3}
BuildRequires: python3-setuptools
@ -140,6 +140,9 @@ popd
%endif
%changelog
* Thu Nov 26 2015 Michele Baldessari <michele@acksyn.org> - 1.5.2-2
- Remove dependency on sphinx-contrib-napoleon now that sphinx is at version >= 1.3
- Tighten versioned dependencies
* Thu Nov 19 2015 Michele Baldessari <michele@acksyn.org> - 1.5.2-1
- New upstream (BZ 1283443)
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-3