diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-08-05 18:03:18 -0300 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-09-13 11:02:05 -0500 |
| commit | 66e8c5a384582c4d4ebe0c8a8bfac17f0f41d9aa (patch) | |
| tree | a64b723f259fa4d62d786079a0cff1513dea5485 | |
| parent | 0278998398cbe0caeb5237b30e316c0a59669c87 (diff) | |
| download | python-swiftclient-66e8c5a384582c4d4ebe0c8a8bfac17f0f41d9aa.tar.gz | |
Sync with global requirements
Specifically, removing d2to1 is the important part. While we're at it
though, use hacking to get the pyflakes/pep8 pins.
Change-Id: Ic4a43955526fcde313ad2f2afec8fafeb87f37a6
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | test-requirements.txt | 15 |
3 files changed, 10 insertions, 13 deletions
diff --git a/requirements.txt b/requirements.txt index 21115e0..42104ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 +pbr>=0.5.21,<1.0 simplejson>=2.0.9 @@ -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', 'pbr'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 223dcf4..5b78b5f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,12 +1,9 @@ -# Install bounded pep8/pyflakes first, then let flake8 install -pep8==1.4.5 -pyflakes==0.7.2 -flake8==2.0 +hacking>=0.5.6,<0.8 -coverage +coverage>=3.6 discover -mock>=0.8.0 -python-keystoneclient +mock>=1.0 +python-keystoneclient>=0.3.2 sphinx>=1.1.2 -testrepository>=0.0.13 -testtools>=0.9.22 +testrepository>=0.0.17 +testtools>=0.9.32 |