diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2019-05-21 10:38:16 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2019-05-22 08:35:34 +0000 |
| commit | dd680367c53079433897b3eb7a7d15102ac10a14 (patch) | |
| tree | 6413cfbc87f8961c1309fe0b293c9117f42fd165 | |
| parent | db52e05649b12fb1d763ac18e5eb9431066c2dd1 (diff) | |
| download | taskflow-dd680367c53079433897b3eb7a7d15102ac10a14.tar.gz | |
Update Sphinx requirement
Sphinx 2.0 no longer works on python 2.7, so we need to start capping it
there. We remove Sphinx and doc8 from the 'test-requirements.txt' file
and '[extra] test' section in 'setup.cfg' since none of our tests
actually use this. Finally, we remove a number of dependencies from
'doc/requirements.txt' since these were already specified in
'test-requirements.txt' and we install these as part of the tox target.
Change-Id: I3981f47f4278f726e3c078723f90d4b9ba1699a6
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
| -rw-r--r-- | doc/requirements.txt | 20 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 7229b2a..007ec97 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,24 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 - doc8>=0.6.0 # Apache-2.0 - -# This copies requirements from [extra] section of setup.cfg. -# These need to be installed for some code analysis done -# via "inheritance-diagram" directive. - -kombu!=4.0.2,>=4.0.0 # BSD -kazoo>=2.2 # Apache-2.0 -zake>=0.1.6 # Apache-2.0 -redis>=2.10.0 # MIT - -eventlet!=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2 # MIT -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -alembic>=0.8.10 # MIT -SQLAlchemy-Utils>=0.30.11 # BSD License -PyMySQL>=0.7.6 # MIT License -psycopg2>=2.6.2 # LGPL/ZPL @@ -80,8 +80,6 @@ test = mock>=2.0.0 # BSD testtools>=2.2.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD - doc8>=0.6.0 # Apache-2.0 - sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD stestr>=2.0.0 # Apache-2.0 [nosetests] diff --git a/test-requirements.txt b/test-requirements.txt index e15ffb9..09ee1f4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -30,5 +30,3 @@ mock>=2.0.0 # BSD testtools>=2.2.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD stestr>=2.0.0 # Apache-2.0 -doc8>=0.6.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD |