Update requirements and test-requirements

Move oslo.serialization from requirements to test-requirement.
Sort requirements and test-requirements in alphabetical order.

Change-Id: Ic587843283d58c1df457f198afe7da0b8fac06bf
This commit is contained in:
Liping Mao 2016-08-29 20:50:41 +08:00 committed by Antoni Segura Puimedon
parent 88881e3016
commit dda19cd4b3
2 changed files with 10 additions and 11 deletions

View File

@ -2,18 +2,17 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0
Babel>=2.3.4 # BSD
Flask!=0.11,<1.0,>=0.10 # BSD
jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
netaddr!=0.7.16,>=0.7.12 # BSD
six>=1.9.0 # MIT
neutron-lib>=0.2.0 # Apache-2.0
os-client-config>=1.13.1 # Apache-2.0
oslo.concurrency>=3.8.0 # Apache-2.0
oslo.config>=3.14.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.11.0 # Apache-2.0
pbr>=1.6 # Apache-2.0
python-neutronclient>=4.2.0 # Apache-2.0
os-client-config>=1.13.1 # Apache-2.0
neutron-lib>=0.2.0 # Apache-2.0
six>=1.9.0 # MIT
-e git://git.openstack.org/openstack/kuryr#egg=kuryr_lib

View File

@ -3,16 +3,16 @@
# process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.0
coverage>=3.6 # Apache-2.0
ddt>=1.0.1 # MIT
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
docker-py<1.8.0,>=1.6.0 # Apache-2.0
hacking<0.11,>=0.10.0
oslo.serialization>=1.10.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
reno>=1.8.0 # Apache2
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
docker-py<1.8.0,>=1.6.0 # Apache-2.0
reno>=1.8.0 # Apache2