diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-09 18:49:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-09 18:49:13 +0000 |
| commit | 52106bfa5869bc68d5cdf9a32f7fbdc993826b08 (patch) | |
| tree | e1fbdccef5290204d16527203746f95be5de8822 | |
| parent | 2b8c6cac22b810683a4eef0a74481e1ee4215c86 (diff) | |
| parent | 1dcd1f83d265bfeeda7c99a3c0bb1a170d27e291 (diff) | |
| download | python-neutronclient-52106bfa5869bc68d5cdf9a32f7fbdc993826b08.tar.gz | |
Merge "Follow the new PTI for document build"
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rw-r--r-- | setup.cfg | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..d959d44 --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,6 @@ +# 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. +openstackdocstheme>=1.18.1 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD @@ -452,12 +452,6 @@ neutron.cli.v2 = vpn-ikepolicy-update = neutronclient.neutron.v2_0.vpn.ikepolicy:UpdateIKEPolicy vpn-ikepolicy-delete = neutronclient.neutron.v2_0.vpn.ikepolicy:DeleteIKEPolicy -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source -warning-is-error = 1 - [wheel] universal = 1 diff --git a/test-requirements.txt b/test-requirements.txt index 98ded3e..58c378a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,14 +7,11 @@ coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD flake8-import-order==0.12 # LGPLv3 mock>=2.0.0 # BSD -openstackdocstheme>=1.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD -reno>=2.5.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD @@ -47,9 +47,11 @@ commands = coverage report [testenv:docs] +deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] +deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [flake8] |