Commits

Jimmy Yuen Ho Wong  committed 08a2c37

Update tox to 1.6.1, bound SQLAlchemy to < 0.9 and require dateutil >= 2.2, and relax geoalchemy and shapely requirements

  • Participants
  • Parent commits 362b367

Comments (0)

Files changed (3)

File requirements.txt

 Jinja2>=2.6
 PyYAML>=3.10
 Routes>=1.12.3
-SQLAlchemy>=0.7.6
-GeoAlchemy==0.7.1
-Shapely==1.2.14
+SQLAlchemy<=0.9
+GeoAlchemy>=0.7.1
+Shapely>=1.2.14
 redis>=2.4.11
 hiredis>=0.1.0
 webassets>=0.6
-python-dateutil<2.0
+python-dateutil>=2.2
 cdecimal>=2.3
 MarkupSafe>=0.15
 simplejson>=2.4.0
 install_requires = ['CherryPy>=3.2.2',
                     'Jinja2>=2.6',
                     'PyYAML>=3.10',
-                    'python-dateutil<2.0']
+                    'python-dateutil>=2.2']
 
 dev_requires = ['Sphinx>=1.1.3',
                 'nose>=1.1.2',
                 'coverage>=3.5.1',
                 'lazr.smtptest>=1.3',
                 'ludibrio>=3.1.0',
-                'tox>=1.3']
+                'tox>=1.6']
 
 if sys.version_info[:2] < (2, 7):
     install_requires.append("argparse>=1.2.1")
                                    'MarkupSafe>=0.15',
                                    'hiredis>=0.1.0',
                                    'simplejson>=2.4.0'],
-                      'all': ['SQLAlchemy>=0.7.6',
+                      'all': ['SQLAlchemy>=0.7.6,<0.9',
                               'redis>=2.4.11',
                               'webassets>=0.6',
                               'Routes>=1.12.3',
 [tox]
 envlist = py26,py27
 
-[testenv]
+[base]
 deps =
     nose
     nose-testconfig
     coverage
     openstack.nose-plugin
     ludibrio
-    sqlalchemy
+    sqlalchemy<0.9
     jinja2
     webassets
     redis
     psycopg2
     geoalchemy
     shapely
+
+[testenv:py27]
+deps = {[base]deps}
 commands = nosetests --tc-file={toxinidir}/tests/test.cfg {toxinidir}/tests
 
 [testenv:py26]
 deps =
-    nose
-    nose-testconfig
-    lazr.smtptest
-    coverage
-    openstack.nose-plugin
-    ludibrio
-    sqlalchemy
-    jinja2
-    webassets
-    redis
-    routes
-    psycopg2
-    geoalchemy
-    shapely
+    {[base]deps}
     logutils
     argparse
-    unittest2
+    unittest2
+commands = nosetests --tc-file={toxinidir}/tests/test.cfg {toxinidir}/tests