diff options
author | Steve Baker <sbaker@redhat.com> | 2013-08-07 12:54:08 +1200 |
---|---|---|
committer | Steve Baker <sbaker@redhat.com> | 2013-08-07 13:29:13 +1200 |
commit | 01705b8b33ce944276e85969e769fa293c8689e3 (patch) | |
tree | c19f7fba9f4d923b56c519024a4b746303ff4876 | |
parent | 28e9aac8d97df945bc7fcfed1f70e3a35d47498d (diff) | |
download | heat-cfntools-01705b8b33ce944276e85969e769fa293c8689e3.tar.gz |
Sync with global requirements1.2.5
After requirements/update.py was run, the boto entry was
manually restored to:
boto==2.5.2
Change-Id: Icd43ee5e1fee473ab21d59b1a17235317f5d751c
-rw-r--r-- | requirements.txt | 3 | ||||
-rwxr-xr-x | setup.py | 5 | ||||
-rw-r--r-- | test-requirements.txt | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt index d0b3081..c43c1a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5.10,<0.6 +pbr>=0.5.16,<0.6 boto==2.5.2 psutil<1.0 @@ -14,8 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# 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 4dd4210..eb0eabb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,9 +2,9 @@ pep8==1.4.5 pyflakes==0.7.2 flake8==2.0 -hacking>=0.5.3,<0.6 +hacking>=0.5.6,<0.7 -mox==0.5.3 +mox>=0.5.3 discover -testrepository>=0.0.13 -testtools>=0.9.29 +testrepository>=0.0.17 +testtools>=0.9.32 |