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
This commit is contained in:
Monty Taylor 2013-08-05 18:03:18 -03:00
parent 0278998398
commit 66e8c5a384
3 changed files with 10 additions and 13 deletions

View File

@ -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

View File

@ -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)

View File

@ -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