Update requirements
- current global requirements - merge py3 req files into markers The one eww moment is the -e line for glance store, which only got in because the infra check-requirements job wasn't checking -py3 files at all until recently. Change-Id: I748e9e1bb698085a19c5d8d6060f4d377695dc89
This commit is contained in:
parent
737be8dd51
commit
2c4b084a3c
|
@ -1,65 +0,0 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
|
|
||||||
pbr>=0.11,<2.0
|
|
||||||
#
|
|
||||||
# The greenlet package must be compiled with gcc and needs
|
|
||||||
# the Python.h headers. Make sure you install the python-dev
|
|
||||||
# package to get the right headers...
|
|
||||||
greenlet>=0.3.2
|
|
||||||
|
|
||||||
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
|
||||||
SQLAlchemy>=0.9.7,<=0.9.99
|
|
||||||
anyjson>=0.3.3
|
|
||||||
eventlet>=0.17.3
|
|
||||||
PasteDeploy>=1.5.0
|
|
||||||
Routes>=1.12.3,!=2.0
|
|
||||||
WebOb>=1.2.3
|
|
||||||
sqlalchemy-migrate>=0.9.5
|
|
||||||
httplib2>=0.7.5
|
|
||||||
kombu>=3.0.7
|
|
||||||
pycrypto>=2.6
|
|
||||||
iso8601>=0.1.9
|
|
||||||
oslo.config>=1.11.0 # Apache-2.0
|
|
||||||
oslo.concurrency>=1.8.0 # Apache-2.0
|
|
||||||
oslo.context>=0.2.0 # Apache-2.0
|
|
||||||
oslo.service>=0.1.0 # Apache-2.0
|
|
||||||
oslo.utils>=1.4.0 # Apache-2.0
|
|
||||||
stevedore>=1.3.0 # Apache-2.0
|
|
||||||
taskflow>=0.7.1
|
|
||||||
keystonemiddleware>=1.5.0
|
|
||||||
WSME>=0.6
|
|
||||||
# For openstack/common/lockutils
|
|
||||||
posix_ipc
|
|
||||||
|
|
||||||
# For Swift storage backend.
|
|
||||||
python-swiftclient>=2.2.0
|
|
||||||
|
|
||||||
# For VMware storage backed.
|
|
||||||
oslo.vmware>=0.11.1 # Apache-2.0
|
|
||||||
|
|
||||||
# For paste.util.template used in keystone.common.template
|
|
||||||
Paste
|
|
||||||
|
|
||||||
jsonschema>=2.0.0,<3.0.0
|
|
||||||
python-keystoneclient>=1.3.0
|
|
||||||
pyOpenSSL>=0.11
|
|
||||||
# Required by openstack.common libraries
|
|
||||||
six>=1.9.0
|
|
||||||
|
|
||||||
oslo.db>=1.7.0 # Apache-2.0
|
|
||||||
oslo.i18n>=1.5.0 # Apache-2.0
|
|
||||||
oslo.log>=1.0.0 # Apache-2.0
|
|
||||||
oslo.messaging>=1.8.0 # Apache-2.0
|
|
||||||
oslo.policy>=0.3.1 # Apache-2.0
|
|
||||||
oslo.serialization>=1.4.0 # Apache-2.0
|
|
||||||
|
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
|
||||||
osprofiler>=0.3.0 # Apache-2.0
|
|
||||||
|
|
||||||
# Glance Store
|
|
||||||
-e git+https://github.com/openstack/glance_store.git#egg=glance_store
|
|
||||||
|
|
||||||
# Artifact repository
|
|
||||||
semantic_version>=2.3.1
|
|
|
@ -2,7 +2,7 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr>=0.11,<2.0
|
pbr<2.0,>=0.11
|
||||||
#
|
#
|
||||||
# The greenlet package must be compiled with gcc and needs
|
# The greenlet package must be compiled with gcc and needs
|
||||||
# the Python.h headers. Make sure you install the python-dev
|
# the Python.h headers. Make sure you install the python-dev
|
||||||
|
@ -10,56 +10,56 @@ pbr>=0.11,<2.0
|
||||||
greenlet>=0.3.2
|
greenlet>=0.3.2
|
||||||
|
|
||||||
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
||||||
SQLAlchemy>=0.9.7,<=0.9.99
|
SQLAlchemy<1.1.0,>=0.9.7
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
eventlet>=0.17.3
|
eventlet>=0.17.4
|
||||||
PasteDeploy>=1.5.0
|
PasteDeploy>=1.5.0
|
||||||
Routes>=1.12.3,!=2.0
|
Routes!=2.0,!=2.1,>=1.12.3
|
||||||
WebOb>=1.2.3
|
WebOb>=1.2.3
|
||||||
sqlalchemy-migrate>=0.9.5
|
sqlalchemy-migrate>=0.9.6
|
||||||
httplib2>=0.7.5
|
httplib2>=0.7.5
|
||||||
kombu>=3.0.7
|
kombu>=3.0.7
|
||||||
pycrypto>=2.6
|
pycrypto>=2.6
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
oslo.config>=1.11.0 # Apache-2.0
|
oslo.config>=1.11.0 # Apache-2.0
|
||||||
oslo.concurrency>=1.8.0 # Apache-2.0
|
oslo.concurrency>=2.1.0 # Apache-2.0
|
||||||
oslo.context>=0.2.0 # Apache-2.0
|
oslo.context>=0.2.0 # Apache-2.0
|
||||||
oslo.service>=0.1.0 # Apache-2.0
|
oslo.service>=0.1.0 # Apache-2.0
|
||||||
oslo.utils>=1.4.0 # Apache-2.0
|
oslo.utils>=1.6.0 # Apache-2.0
|
||||||
stevedore>=1.3.0 # Apache-2.0
|
stevedore>=1.5.0 # Apache-2.0
|
||||||
taskflow>=0.7.1
|
taskflow>=0.11.0
|
||||||
keystonemiddleware>=1.5.0
|
keystonemiddleware>=1.5.0
|
||||||
WSME>=0.6
|
WSME>=0.7
|
||||||
# For openstack/common/lockutils
|
# For openstack/common/lockutils
|
||||||
posix_ipc
|
posix-ipc
|
||||||
|
|
||||||
# For Swift storage backend.
|
# For Swift storage backend.
|
||||||
python-swiftclient>=2.2.0
|
python-swiftclient>=2.2.0
|
||||||
|
|
||||||
# For VMware storage backed.
|
# For VMware storage backed.
|
||||||
oslo.vmware>=0.11.1 # Apache-2.0
|
oslo.vmware>=0.13.1 # Apache-2.0
|
||||||
|
|
||||||
# For paste.util.template used in keystone.common.template
|
# For paste.util.template used in keystone.common.template
|
||||||
Paste
|
Paste
|
||||||
|
|
||||||
jsonschema>=2.0.0,<3.0.0
|
jsonschema!=2.5.0,<3.0.0,>=2.0.0
|
||||||
python-keystoneclient>=1.3.0
|
python-keystoneclient>=1.6.0
|
||||||
pyOpenSSL>=0.11
|
pyOpenSSL>=0.11
|
||||||
# Required by openstack.common libraries
|
# Required by openstack.common libraries
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
|
|
||||||
oslo.db>=1.7.0 # Apache-2.0
|
oslo.db>=1.12.0 # Apache-2.0
|
||||||
oslo.i18n>=1.5.0 # Apache-2.0
|
oslo.i18n>=1.5.0 # Apache-2.0
|
||||||
oslo.log>=1.0.0 # Apache-2.0
|
oslo.log>=1.2.0 # Apache-2.0
|
||||||
oslo.messaging>=1.8.0 # Apache-2.0
|
oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
|
||||||
oslo.policy>=0.3.1 # Apache-2.0
|
oslo.policy>=0.5.0 # Apache-2.0
|
||||||
oslo.serialization>=1.4.0 # Apache-2.0
|
oslo.serialization>=1.4.0 # Apache-2.0
|
||||||
|
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
retrying!=1.3.0,>=1.2.3 # Apache-2.0
|
||||||
osprofiler>=0.3.0 # Apache-2.0
|
osprofiler>=0.3.0 # Apache-2.0
|
||||||
|
|
||||||
# Glance Store
|
# Glance Store
|
||||||
glance_store>=0.3.0 # Apache-2.0
|
-e git+https://github.com/openstack/glance_store.git#egg=glance_store
|
||||||
|
|
||||||
# Artifact repository
|
# Artifact repository
|
||||||
semantic_version>=2.3.1
|
semantic-version>=2.3.1
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -1,4 +1,3 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
|
|
||||||
# Hacking already pins down pep8, pyflakes and flake8
|
|
||||||
hacking>=0.10.0,<0.11
|
|
||||||
|
|
||||||
# For translations processing
|
|
||||||
Babel>=1.3
|
|
||||||
|
|
||||||
# Needed for testing
|
|
||||||
coverage>=3.6
|
|
||||||
discover
|
|
||||||
fixtures>=0.3.14
|
|
||||||
mox3>=0.7.0
|
|
||||||
mock>=1.0
|
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
|
||||||
requests>=2.5.2
|
|
||||||
testrepository>=0.0.18
|
|
||||||
testtools>=0.9.36,!=1.2.0
|
|
||||||
psutil>=1.1.1,<2.0.0
|
|
||||||
oslotest>=1.5.1 # Apache-2.0
|
|
||||||
# Optional packages that should be installed when testing
|
|
||||||
PyMySQL>=0.6.2 # MIT License
|
|
||||||
psycopg2
|
|
||||||
pysendfile>=2.0.0
|
|
||||||
xattr>=0.4
|
|
||||||
|
|
||||||
# Documentation
|
|
||||||
oslosphinx>=2.5.0 # Apache-2.0
|
|
||||||
|
|
||||||
# Glance catalog index
|
|
||||||
elasticsearch>=1.3.0
|
|
|
@ -3,7 +3,7 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
# Hacking already pins down pep8, pyflakes and flake8
|
# Hacking already pins down pep8, pyflakes and flake8
|
||||||
hacking>=0.10.0,<0.11
|
hacking<0.11,>=0.10.0
|
||||||
|
|
||||||
# For translations processing
|
# For translations processing
|
||||||
Babel>=1.3
|
Babel>=1.3
|
||||||
|
@ -11,20 +11,20 @@ Babel>=1.3
|
||||||
# Needed for testing
|
# Needed for testing
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
fixtures>=1.3.1
|
||||||
mox3>=0.7.0
|
mox3>=0.7.0
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||||
requests>=2.5.2
|
requests>=2.5.2
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testtools>=0.9.36,!=1.2.0
|
testtools>=1.4.0
|
||||||
psutil>=1.1.1,<2.0.0
|
psutil<2.0.0,>=1.1.1
|
||||||
oslotest>=1.5.1 # Apache-2.0
|
oslotest>=1.5.1 # Apache-2.0
|
||||||
# Optional packages that should be installed when testing
|
# Optional packages that should be installed when testing
|
||||||
PyMySQL>=0.6.2 # MIT License
|
PyMySQL>=0.6.2 # MIT License
|
||||||
psycopg2
|
psycopg2
|
||||||
pysendfile>=2.0.0
|
pysendfile>=2.0.0
|
||||||
qpid-python
|
qpid-python;python_version=='2.7'
|
||||||
xattr>=0.4
|
xattr>=0.4
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -18,8 +18,6 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
|
||||||
[testenv:py34]
|
[testenv:py34]
|
||||||
deps = -r{toxinidir}/requirements-py3.txt
|
|
||||||
-r{toxinidir}/test-requirements-py3.txt
|
|
||||||
commands =
|
commands =
|
||||||
python -m testtools.run \
|
python -m testtools.run \
|
||||||
glance.tests.unit.common.test_client \
|
glance.tests.unit.common.test_client \
|
||||||
|
|
Loading…
Reference in New Issue