summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--requirements.txt5
-rw-r--r--setup.py7
-rw-r--r--test-requirements.txt10
-rw-r--r--tox.ini3
4 files changed, 12 insertions, 13 deletions
diff --git a/requirements.txt b/requirements.txt
index 117e980..fd898c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
-d2to1>=0.2.10,<0.3
pbr>=0.5.16,<0.6
argparse
cliff>=1.4
httplib2
-iso8601
-simplejson
+iso8601>=0.1.4
+simplejson>=2.0.9
diff --git a/setup.py b/setup.py
index 80b6834..15f4e9d 100644
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,10 @@
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
setuptools.setup(
- setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
- d2to1=True)
+ setup_requires=['pbr>=0.5.20'],
+ pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 34b353c..1089218 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,14 @@
pep8==1.4.5
pyflakes==0.7.2
flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.7
cliff-tablib>=1.0
-coverage
+coverage>=3.6
discover
fixtures>=0.3.12
-mox
+mox>=0.5.3
python-subunit
sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.22
+testrepository>=0.0.17
+testtools>=0.9.32
diff --git a/tox.ini b/tox.ini
index 71ade02..4154f33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,8 @@ downloadcache = ~/cache/pip
[flake8]
# E125 continuation line does not distinguish itself from next logical line
+# H233 Python 3.x incompatible use of print operator
# H302 import only modules
-ignore = E125,H302
+ignore = E125,H233,H302
show-source = true
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools