diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-04 22:52:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-04 22:52:11 +0000 |
| commit | bd9ae5ad80cf29c9b7c7c36df73a9165f04233cc (patch) | |
| tree | a729794070971dd8684e38b0adc885edf1ba21fe | |
| parent | 2636e2c5cd8024f0c93af443f8ac6a3f3d440136 (diff) | |
| parent | a314b8e34e81239006ca22250ef802ce4e154a22 (diff) | |
| download | designate-bd9ae5ad80cf29c9b7c7c36df73a9165f04233cc.tar.gz | |
Merge "Standardize doc requirements"
| -rw-r--r-- | doc/requirements.txt | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt deleted file mode 100644 index 53b9db0c..00000000 --- a/doc/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -sphinx>=1.1.2 -sphinxcontrib-httpdomain --r ../requirements.txt --r ../test-requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt index 48e98a22..4cae08ce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,6 +6,8 @@ fixtures>=0.3.14 mock>=1.0 mox>=0.5.3 python-subunit>=0.0.18 +sphinx>=1.1.2,<1.2 +sphinxcontrib-httpdomain testtools>=0.9.34 testrepository>=0.0.17 testscenarios>=0.4 |