Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with openstack/requirements master branch

Browse Source 
In order to accept the requirements contract defined in
openstack/requirements, we need to sync with the master branch of that
project's global-requirements.txt and test-requirements.txt files.

Most of the changes are just version changes and nothing major.  The
only major change is:

1) The twine dependency is removed, and therefore the pypi tox
environment was also removed.

Change-Id: Idbe9e73ddc5a34ac49aa6f6eff0779d46a75f583
Closes-Bug: #1533282
This commit is contained in:
Taylor Peoples
2016-01-18 23:21:01 +01:00
committed by David TARDIVEL
parent b440f5c69a
commit 0ba8a35ade
4 changed files with 464 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

838
etc/watcher/watcher.conf.sample
View File

File diff suppressed because it is too large Load Diff

32
requirements.txt
View File

@@ -2,30 +2,30 @@
# 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.
enum34;python_version=='2.7' or python_version=='2.6' enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
jsonpatch>=1.1 jsonpatch>=1.1
keystoneauth1>=2.1.0 keystoneauth1>=2.1.0
keystonemiddleware>=2.0.0,!=2.4.0 keystonemiddleware>=4.0.0,!=4.1.0
oslo.config>=2.3.0 # Apache-2.0 oslo.config>=3.4.0 # Apache-2.0
oslo.db>=2.4.1 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=1.8.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0
oslo.messaging>=1.16.0,!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1 # Apache-2.0 oslo.messaging>=4.0.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0
oslo.service>=0.7.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0
oslo.utils>=2.0.0,!=2.6.0 # Apache-2.0 oslo.utils>=3.4.0 # Apache-2.0
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
pbr>=1.6 pbr>=1.6
pecan>=1.0.0 pecan>=1.0.0
python-ceilometerclient>=1.5.0 python-ceilometerclient>=2.2.1
python-cinderclient>=1.3.1 python-cinderclient>=1.3.1
python-glanceclient>=0.18.0 python-glanceclient>=1.2.0
python-keystoneclient>=1.6.0,!=1.8.0 python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0
python-neutronclient>=2.6.0 python-neutronclient>=2.6.0
python-novaclient>=2.28.1,!=2.33.0 python-novaclient>=2.29.0,!=2.33.0
python-openstackclient>=1.5.0 python-openstackclient>=2.0.0
six>=1.9.0 six>=1.9.0
SQLAlchemy>=0.9.9,<1.1.0 SQLAlchemy>=1.0.10,<1.1.0
stevedore>=1.5.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0
taskflow>=1.25.0 # Apache-2.0 taskflow>=1.25.0 # Apache-2.0
WSME>=0.7 WSME>=0.8

8
test-requirements.txt
View File

@@ -8,17 +8,13 @@ doc8 # Apache-2.0
hacking>=0.10.2,<0.11 hacking>=0.10.2,<0.11
mock>=1.2 mock>=1.2
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
os-testr>=0.1.0 os-testr>=0.4.1
python-subunit>=0.0.18 python-subunit>=0.0.18
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=1.4.0 testtools>=1.4.0
# Doc requirements # Doc requirements
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
sphinxcontrib-pecanwsme>=0.8 sphinxcontrib-pecanwsme>=0.8
# For PyPI distribution
twine

5
tox.ini
View File

@@ -53,11 +53,6 @@ ignore=
builtins= _ builtins= _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*,demo/ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*,demo/
[testenv:pypi]
commands =
python setup.py sdist bdist_wheel
twine upload --config-file .pypirc {posargs} dist/*
[testenv:wheel] [testenv:wheel]
commands = python setup.py bdist_wheel commands = python setup.py bdist_wheel