diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-12-18 19:36:29 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-12-18 19:36:29 +0000 |
commit | 1e778dbfb84bf870d7b82ab6c408dd7630e29625 (patch) | |
tree | 329d38ba42fe911d9dbb3b3022e7d2f894e203c7 | |
parent | 1226474abb7ae0ba7965eb1ae0a7e7477b3744a1 (diff) | |
parent | 9cfe5db9cca2d65ad4749f88d915fe0b0ed74e02 (diff) | |
download | tooz-1e778dbfb84bf870d7b82ab6c408dd7630e29625.tar.gz |
Merge "Sync requirements to global requirements"
-rw-r--r-- | requirements-py3.txt | 6 | ||||
-rw-r--r-- | requirements.txt | 10 | ||||
-rw-r--r-- | test-requirements.txt | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt index 532f460..5b14e3c 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -1,12 +1,12 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 -stevedore>=0.14 +stevedore>=1.1.0 six>=1.7.0 iso8601 kazoo>=1.3.1 pymemcache>=1.2 zake>=0.1.6 -msgpack-python -retrying!=1.3.0 +msgpack-python>=0.4.0 +retrying>=1.2.3,!=1.3.0 oslo.utils>=1.0.0 redis diff --git a/requirements.txt b/requirements.txt index b6d0716..5f7325e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 -stevedore>=0.14 +stevedore>=1.1.0 six>=1.7.0 -iso8601 +iso8601>=0.1.9 kazoo>=1.3.1 pymemcache>=1.2 -zake>=0.1.6 -msgpack-python -retrying!=1.3.0 +zake>=0.1 +msgpack-python>=0.4.0 +retrying>=1.2.3,!=1.3.0 futures>=2.1.6 oslo.utils>=1.0.0 redis>=2.10.0 diff --git a/test-requirements.txt b/test-requirements.txt index 835a7e3..9839287 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,15 +1,15 @@ -pep8>=1.4.5 -pyflakes>=0.7.2,<0.7.4 -flake8>=2.1.0 +pep8==1.5.7 +pyflakes==0.8.1 +flake8==2.2.4 discover mock>=1.0 # only needed on < python 3.3 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 oslosphinx>=2.2.0 # Apache-2.0 -python-subunit -testrepository>=0.0.17 -testtools>=0.9.32 +python-subunit>=0.0.18 +testrepository>=0.0.18 +testtools>=0.9.36,!=1.2.0 testscenarios>=0.4 coverage>=3.6 -sysv_ipc>=0.6.8 psycopg2 -pymysql +PyMySQL>=0.6.2 +sysv_ipc>=0.6.8 |