Update requirements to stable/liberty

Update requirements in requirements.txt file.

Require the following modules only if python2.6:
* argparse
* ordereddict

Is NOT compatible with CentOS6 master node.

Use new oslo import notation.

Change-Id: Ib6a5be6ad784339ba4ee2f69a94a400ab8d79dfe
Blueprint: master-on-centos7

nailgun/nailgun/db/sqlalchemy/models/base.py

@@ -16,10 +16,7 @@
 
 from datetime import datetime
 
-try:
-    from oslo.db.sqlalchemy import models
-except ImportError:
-    from oslo_db.sqlalchemy import models
+from oslo_db.sqlalchemy import models
 
 from sqlalchemy import Column
 from sqlalchemy import DateTime

nailgun/nailgun/test/integration/test_plugin_links_collection_handler.py

@@ -14,10 +14,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_serialization import jsonutils
 
 from nailgun.test.base import BaseIntegrationTest
 from nailgun.utils import reverse
-from oslo.serialization import jsonutils
 
 
 class TestAssignmentHandlers(BaseIntegrationTest):

nailgun/nailgun/test/integration/test_plugin_links_handler.py

@@ -14,10 +14,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_serialization import jsonutils
+
 from nailgun.db.sqlalchemy.models.plugin_link import PluginLink
 from nailgun.test.base import BaseIntegrationTest
 from nailgun.utils import reverse
-from oslo.serialization import jsonutils
 
 
 class TestHandlers(BaseIntegrationTest):

nailgun/nailgun/test/unit/test_network_configuration_validator.py

@@ -642,10 +642,10 @@ class TestNeutronNetworkConfigurationValidatorProtocol(
         self.assertRaisesTooShort(self.nc, "[2]")
 
         self.nc['networking_parameters']['vlan_range'] = [1, 2]
-        self.assertRaisesLessThanMinimum(self.nc, "1.0")
+        self.assertRaisesLessThanMinimum(self.nc, "1")
 
         self.nc['networking_parameters']['vlan_range'] = [2, 4097]
-        self.assertRaisesGreaterThanMaximum(self.nc, "4097.0")
+        self.assertRaisesGreaterThanMaximum(self.nc, "4097")
 
         self.nc['networking_parameters']['vlan_range'] = [2, 2]
         self.assertRaisesNonUnique(self.nc, "[2, 2]")

nailgun/requirements.txt

@@ -1,47 +1,47 @@
-Babel==1.3
-Jinja2==2.7
-Mako==0.9.1
-MarkupSafe==0.18
-PyYAML==3.10
-alembic>=0.6.2
-amqplib==1.0.2
-anyjson==0.3.3
-decorator==3.4.0
-fysom==1.0.11
-iso8601==0.1.9
-jsonschema==2.3.0
-kombu==3.0.16
-netaddr>=0.7.10
-oslo.config>=1.6.0,<1.10.0
-oslo.serialization>=1.2.0,<1.5.0
-SQLAlchemy<=0.9.99
+Babel>=1.3
+Jinja2>=2.7
+Mako>=0.9.1
+MarkupSafe>=0.18
+PyYAML>=3.1.0
+alembic>=0.8.0
+amqplib>=1.0.2
+anyjson>=0.3.3
+decorator>=3.4.0
+fysom>=1.0.11
+iso8601>=0.1.9
+jsonschema>=2.3.0,<3.0.0,!=2.5.0
+kombu>=3.0.16
+netaddr>=0.7.12,!=0.7.16
+oslo.config>=2.3.0
+oslo.serialization>=1.4.0
+SQLAlchemy>=0.9.9,<1.1.0
 # oslo.db has no upper bound for sqlalchemy-migrate, and latest
 # sqlalchemy-migrate requires conflicting version of pbr.
-sqlalchemy-migrate!=0.9.8,<0.10.0
-oslo.db<1.8.0
-ply==3.4
-psycopg2==2.5.1
-pycrypto==2.6.1
-requests>=1.2.3,<2.8.0
+sqlalchemy-migrate>=0.9.6
+oslo.db>2.4.1
+ply>=3.4
+psycopg2>=2.5.1
+pycrypto>=2.6.1
+requests>=2.5.2,!=2.8.0
 simplejson>=3.3.0
-six>=1.5.2
-urllib3>=1.7
-web.py==0.37
-wsgilog==0.3
-wsgiref==0.1.2
-keystonemiddleware>=1.2.0,<1.6.0
+six>=1.9.0
+urllib3>=1.8.3
+web.py>=0.37
+wsgilog>=0.3
+wsgiref>=0.1.2
+keystonemiddleware>=2.0.0,!=2.4.0
 # we might still need keystone command
-python-keystoneclient>=0.11,<1.4.0
-python-novaclient>=2.17.0,<2.24.0
-python-cinderclient>=1.0.7,<1.2.0
-networkx>=1.8,<1.10
+python-keystoneclient>=1.6.0,!=1.8.0
+python-novaclient>=2.28.1,!=2.33.0
+python-cinderclient>=1.3.1
+networkx>=1.10
 pydot-ng>=1.0.0
-oslo.utils<1.4.1
+oslo.utils>2.0.0,!=2.6.0
 # NOTE(prmtl): not all packages has correctly
 # requirements for stevedore - some of them install
 # newest one which case version conflicts
 # See: https://bugs.launchpad.net/fuel/+bug/1481212
-stevedore<1.4.0
+stevedore>=1.5.0
 # NOTE(akscram): pinned until 18.6.2 because the installation in
 # the editable mode is broken
 # See: https://bugs.launchpad.net/fuel/+bug/1519727

nailgun/setup.py

@@ -29,8 +29,8 @@ def find_requires():
     with open('{0}/requirements.txt'.format(dir_path), 'r') as reqs:
         requirements = reqs.readlines()
     if sys.version_info == (2, 6):
-        requirements.append('argparse==1.2.1')
-        requirements.append('ordereddict>=1.1')
+        requirements.append('argparse')
+        requirements.append('ordereddict')
     return requirements