openstack/requirements
Code Issues Proposed changes

Update requirements ordering

Browse Source 
When using generated version output strings these produce stable but
unusually ordered outputs. Fudge the tests to create the expected
version strings to ease the update process.

Change-Id: I021f2befe2422525f528e27b041f60ec684e1eae
This commit is contained in:
Jamie Lennox 2016-04-14 11:35:12 +10:00
parent 55b4812577
commit 6410265574
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_requirements/tests/files/gr-base.txt
View File

@ -21,7 +21,7 @@ httplib2
iso8601>=0.1.4 iso8601>=0.1.4
Jinja2 Jinja2
jsonrpclib jsonrpclib
jsonschema>=1.0.0,!=1.4.0,<2 jsonschema!=1.4.0,<2,>=1.0.0
kazoo>=0.9,<=1.1 kazoo>=0.9,<=1.1
lesscpy>=0.9h lesscpy>=0.9h
kombu>=2.4.8 kombu>=2.4.8
@ -71,12 +71,12 @@ setuptools_git>=0.4
simplejson>=2.2.0 simplejson>=2.2.0
six six
sockjs-tornado>=1.0.0,<2.0.0 sockjs-tornado>=1.0.0,<2.0.0
SQLAlchemy>=0.7,<=0.7.99 SQLAlchemy<=0.7.99,>=0.7
sqlalchemy-migrate>=0.7 sqlalchemy-migrate>=0.7
stevedore>=0.10 stevedore>=0.10
suds>=0.4 suds>=0.4
warlock>=0.7.0,<2 warlock>=0.7.0,<2
WebOb>=1.2.3,<1.3 WebOb<1.3,>=1.2.3
websockify>=0.5.1,<0.6 websockify>=0.5.1,<0.6
wsgiref>=0.1.2 wsgiref>=0.1.2
WSME>=0.5b2 WSME>=0.5b2

20
openstack_requirements/tests/test_update.py
View File

@ -38,7 +38,7 @@ class SmokeTest(testtools.TestCase):
global_env = self.useFixture(common.GlobalRequirements()) global_env = self.useFixture(common.GlobalRequirements())
global_reqs = common._file_to_list(global_env.req_file) global_reqs = common._file_to_list(global_env.req_file)
# This is testing our test input data. Perhaps remove? (lifeless) # This is testing our test input data. Perhaps remove? (lifeless)
self.assertIn("jsonschema>=1.0.0,!=1.4.0,<2", global_reqs) self.assertIn("jsonschema!=1.4.0,<2,>=1.0.0", global_reqs)
# And test the end to end call of update.py, UI and all. # And test the end to end call of update.py, UI and all.
self.project = self.useFixture(common.project_fixture) self.project = self.useFixture(common.project_fixture)
capture = StringIO.StringIO() capture = StringIO.StringIO()
@ -51,18 +51,18 @@ class SmokeTest(testtools.TestCase):
expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa
"""Updated %(project)s/requirements.txt: """Updated %(project)s/requirements.txt:
greenlet>=0.3.1 -> greenlet>=0.3.2 greenlet>=0.3.1 -> greenlet>=0.3.2
SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy>=0.7,<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy<=0.7.99,>=0.7
eventlet>=0.9.12 -> eventlet>=0.12.0 eventlet>=0.9.12 -> eventlet>=0.12.0
PasteDeploy -> PasteDeploy>=1.5.0 PasteDeploy -> PasteDeploy>=1.5.0
routes -> Routes>=1.12.3 routes -> Routes>=1.12.3
WebOb>=1.2 -> WebOb>=1.2.3,<1.3 WebOb>=1.2 -> WebOb<1.3,>=1.2.3
wsgiref -> wsgiref>=0.1.2 wsgiref -> wsgiref>=0.1.2
boto -> boto>=2.4.0 boto -> boto>=2.4.0
kombu>2.4.7 -> kombu>=2.4.8 kombu>2.4.7 -> kombu>=2.4.8
pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 pycrypto>=2.1.0alpha1 -> pycrypto>=2.6
python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2 python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2
lxml -> lxml>=2.3 lxml -> lxml>=2.3
jsonschema -> jsonschema>=1.0.0,!=1.4.0,<2 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0
python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1 python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1
Version change for: mox, mox3, testrepository, testtools Version change for: mox, mox3, testrepository, testtools
Updated %(project)s/test-requirements.txt: Updated %(project)s/test-requirements.txt:
@ -156,18 +156,18 @@ class UpdateTest(testtools.TestCase):
expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa
"""Updated %(project)s/requirements.txt: """Updated %(project)s/requirements.txt:
greenlet>=0.3.1 -> greenlet>=0.3.2 greenlet>=0.3.1 -> greenlet>=0.3.2
SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy>=0.7,<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy<=0.7.99,>=0.7
eventlet>=0.9.12 -> eventlet>=0.12.0 eventlet>=0.9.12 -> eventlet>=0.12.0
PasteDeploy -> PasteDeploy>=1.5.0 PasteDeploy -> PasteDeploy>=1.5.0
routes -> Routes>=1.12.3 routes -> Routes>=1.12.3
WebOb>=1.2 -> WebOb>=1.2.3,<1.3 WebOb>=1.2 -> WebOb<1.3,>=1.2.3
wsgiref -> wsgiref>=0.1.2 wsgiref -> wsgiref>=0.1.2
boto -> boto>=2.4.0 boto -> boto>=2.4.0
kombu>2.4.7 -> kombu>=2.4.8 kombu>2.4.7 -> kombu>=2.4.8
pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 pycrypto>=2.1.0alpha1 -> pycrypto>=2.6
python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2 python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2
lxml -> lxml>=2.3 lxml -> lxml>=2.3
jsonschema -> jsonschema>=1.0.0,!=1.4.0,<2 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0
python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1 python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1
Version change for: mox, mox3, testrepository, testtools Version change for: mox, mox3, testrepository, testtools
Updated %(project)s/test-requirements.txt: Updated %(project)s/test-requirements.txt:
@ -189,18 +189,18 @@ Updated %(project)s/test-requirements.txt:
Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n""" # noqa Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n""" # noqa
"""Updated %(project)s/requirements.txt: """Updated %(project)s/requirements.txt:
greenlet>=0.3.1 -> greenlet>=0.3.2 greenlet>=0.3.1 -> greenlet>=0.3.2
SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy>=0.7,<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99 -> SQLAlchemy<=0.7.99,>=0.7
eventlet>=0.9.12 -> eventlet>=0.12.0 eventlet>=0.9.12 -> eventlet>=0.12.0
PasteDeploy -> PasteDeploy>=1.5.0 PasteDeploy -> PasteDeploy>=1.5.0
routes -> Routes>=1.12.3 routes -> Routes>=1.12.3
WebOb>=1.2 -> WebOb>=1.2.3,<1.3 WebOb>=1.2 -> WebOb<1.3,>=1.2.3
wsgiref -> wsgiref>=0.1.2 wsgiref -> wsgiref>=0.1.2
boto -> boto>=2.4.0 boto -> boto>=2.4.0
kombu>2.4.7 -> kombu>=2.4.8 kombu>2.4.7 -> kombu>=2.4.8
pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 pycrypto>=2.1.0alpha1 -> pycrypto>=2.6
python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2 python-swiftclient>=1.2,<2 -> python-swiftclient>=1.2
lxml -> lxml>=2.3 lxml -> lxml>=2.3
jsonschema -> jsonschema>=1.0.0,!=1.4.0,<2 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0
python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1 python-keystoneclient>=0.2.0 -> python-keystoneclient>=0.4.1
Syncing %(project)s/test-requirements.txt Syncing %(project)s/test-requirements.txt
Version change for: mox, mox3, testrepository, testtools Version change for: mox, mox3, testrepository, testtools