Browse Source

Sync with global requirements

Change-Id: I8333e17d8edaa5853ac47f9d53de8c44d1c5d5cb
Monty Taylor 5 years ago
parent
commit
ec5861644c
4 changed files with 18 additions and 21 deletions
  1. 4
    5
      requirements.txt
  2. 8
    10
      setup.py
  3. 5
    5
      test-requirements.txt
  4. 1
    1
      tox.ini

+ 4
- 5
requirements.txt View File

@@ -1,8 +1,7 @@
1
-d2to1>=0.2.10,<0.3
2
-pbr>=0.5,<0.6
1
+pbr>=0.5.16,<0.6
3 2
 argparse
4 3
 iso8601>=0.1.4
5
-prettytable>=0.6,<0.8
6
-requests>=0.8
7
-simplejson
4
+PrettyTable>=0.6,<0.8
5
+requests>=1.1,<1.2.3
6
+simplejson>=2.0.9
8 7
 six

+ 8
- 10
setup.py View File

@@ -1,24 +1,22 @@
1
-# Copyright 2011 OpenStack Foundation
1
+#!/usr/bin/env python
2
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
2 3
 #
3 4
 # Licensed under the Apache License, Version 2.0 (the "License");
4 5
 # you may not use this file except in compliance with the License.
5 6
 # You may obtain a copy of the License at
6 7
 #
7
-# http://www.apache.org/licenses/LICENSE-2.0
8
+#    http://www.apache.org/licenses/LICENSE-2.0
8 9
 #
9 10
 # Unless required by applicable law or agreed to in writing, software
10 11
 # distributed under the License is distributed on an "AS IS" BASIS,
11
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13
+# implied.
12 14
 # See the License for the specific language governing permissions and
13 15
 # limitations under the License.
14 16
 
17
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
15 18
 import setuptools
16 19
 
17
-
18 20
 setuptools.setup(
19
-    setup_requires=[
20
-        'd2to1>=0.2.10,<0.3',
21
-        'pbr>=0.5,<0.6'
22
-    ],
23
-    d2to1=True
24
-)
21
+    setup_requires=['pbr>=0.5.20'],
22
+    pbr=True)

+ 5
- 5
test-requirements.txt View File

@@ -2,13 +2,13 @@
2 2
 pep8==1.4.5
3 3
 pyflakes==0.7.2
4 4
 flake8==2.0
5
-hacking>=0.5.3,<0.6
5
+hacking>=0.5.6,<0.7
6 6
 
7
-coverage
7
+coverage>=3.6
8 8
 discover
9 9
 fixtures>=0.3.12
10 10
 keyring
11
-mock
11
+mock>=0.8.0
12 12
 sphinx>=1.1.2
13
-testrepository>=0.0.13
14
-testtools>=0.9.26
13
+testrepository>=0.0.17
14
+testtools>=0.9.32

+ 1
- 1
tox.ini View File

@@ -24,6 +24,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
24 24
 downloadcache = ~/cache/pip
25 25
 
26 26
 [flake8]
27
-ignore = E12,E711,E721,E712,F841,F811,F821,H302,H306,H403,H404
27
+ignore = E12,E711,E721,E712,F841,F811,F821,H102,H302,H306,H403,H404,H501
28 28
 show-source = True
29 29
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build

Loading…
Cancel
Save