Support sqlalchemy 0.9

jacobsvante · Jan 5, 2014 · de09ef6 · de09ef6
1 parent b0fb945
commit de09ef6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.2 (2014-01-04)
+
+* Download geoalchemy2 from GitHub instead so we can support SQLAlchemy 0.9.
+* Use progressbar2 (py3 compatible fork of python-progressbar)
+
 ## 0.1.1 (2014-01-04)
 
 * Make `cdecimal` install optional

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,13 @@
 # Don't support newer SQLAlchemy until a GeoAlchemy2 release with this fix https://github.com/geoalchemy/geoalchemy2/pull/59 has been released.
 
-SQLAlchemy>=0.8,<0.9
-GeoAlchemy2>=0.2.2
+SQLAlchemy>=0.8
+
+# NOTE: 0.2.3 is not yet released as of 2014-01-04. GitHub download URL
+#       specified in setup.py. Waiting for
+#       fix @ https://github.com/geoalchemy/geoalchemy2/pull/59 to be
+#       released to PyPi.
+GeoAlchemy2>=0.2.3
+
 requests>=2.0
 psycopg2>=2.5
 
@@ -10,5 +16,6 @@ psycopg2>=2.5
 # as external urls are no longer allowed by default.
 # cdecimal>=2.3
 
-# NOTE: progressbar is not yet py3.3 compatible as of 4 jan 2014. Use fixed release specified in setup.py dependency_links.
-# progressbar>2.2
+# NOTE: progressbar is not yet py3.3 compatible as of 4 jan 2014.
+#       Use progressbar2 instead (fork of progressbar).
+progressbar2>=2.6
diff --git a/setup.py b/setup.py
@@ -33,10 +33,10 @@
             'sqlageonames = sqlalchemy_geonames.bin.sqlageonames:main',
         },
     },
-    # Until there's a py3.3 compatible progressbar release
-    dependency_links=['https://github.com/bradleyayers/python-progressbar/'
-                      'archive/c25e56619ca625344b71016c9dd7a7bbd5a67285.'
-                      'zip#egg=progressbar-2.3.dev'],
+    dependency_links=[
+        # Until an official release supports 0.9
+        'https://github.com/jmagnusson/geoalchemy2/'
+        'archive/27fd3eb.zip#egg=GeoAlchemy2-0.2.3'],
     author='Jacob Magnusson',
     author_email='m@jacobian.se',
     url='https://github.com/jmagnusson/sqlalchemy-geonames',

diff --git a/sqlalchemy_geonames/metadata.py b/sqlalchemy_geonames/metadata.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 1, 1)
+__version_info__ = (0, 1, 2)
 __version__ = '.'.join(map(str, __version_info__))