summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaoyuan <cao.yuan@99cloud.net>2019-07-07 02:41:35 +0800
committercaoyuan <cao.yuan@99cloud.net>2019-07-07 11:59:49 +0800
commit8955b48620ba796c2692bf62cd95bff7c1e6ea12 (patch)
tree54569a71507a0aa8b779aca2c57a5d34ae2048cb
parentdea9af2fe91e3abe6ca88ea8739cff023191abb9 (diff)
downloadoslo-config-8955b48620ba796c2692bf62cd95bff7c1e6ea12.tar.gz
Clean up the unnecessary sphinx from test-requirements.txt
1. Clean up the unnecessary sphinx from test-requirements.txt 2. when run `tox -e docs` in localhost, some files will be created, it not belong to the code, shoule be ignore by the git Change-Id: I2bae30fedfdc64fbbafbe0e96794597b564c2d54
-rw-r--r--.gitignore3
-rw-r--r--test-requirements.txt7
-rw-r--r--tox.ini2
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index a60789b..9216c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,8 +56,11 @@ doc/source/api/
# pbr generates these
AUTHORS
ChangeLog
+doc/source/reference/api
# Files created by releasenotes build
releasenotes/build
+releasenotes/notes/reno.cache
+RELEASENOTES.rst
*.log
diff --git a/test-requirements.txt b/test-requirements.txt
index ce22df6..b6e4dda 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,7 @@
# 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.
+
hacking>=1.1.0,<1.2.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
@@ -19,15 +20,9 @@ oslo.log>=3.36.0 # Apache-2.0
# deps = {[testenv]deps} coverage
coverage!=4.4,>=4.0 # Apache-2.0
-# this is required for the sphinx extension
-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
-
# mocking framework
mock>=3.0.0 # BSD
requests_mock>=1.5.0 # Apache-2.0
# Bandit security code scanner
bandit>=1.1.0,<1.6.0 # Apache-2.0
-
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 7e6ba9f..3799f4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
+ -r{toxinidir}/doc/requirements.txt
commands =
find . -type f -name "*.pyc" -delete
stestr run --suppress-attachments {posargs}
@@ -26,6 +27,7 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
+ -r{toxinidir}/doc/requirements.txt
[testenv:py27]
basepython = python2.7