[ckan-changes] commit/ckan: kindly: [vdm] sqlalchemy and vdm upgrade to 0.7.3

Wed Oct 26 10:32:24 UTC 2011

1 new commit in ckan:


https://bitbucket.org/okfn/ckan/changeset/2c21fe91f1e4/
changeset:   2c21fe91f1e4
branch:      feature-1371-task-status-logic-layer
user:        kindly
date:        2011-10-26 12:31:53
summary:     [vdm] sqlalchemy and vdm upgrade to 0.7.3
affected #:  3 files

diff -r 028897b1e4b00b395a99cb5f680f56a9de2142d4 -r 2c21fe91f1e4da45f8bcbc03593668783e197a3b ckan/model/__init__.py

--- a/ckan/model/__init__.py
+++ b/ckan/model/__init__.py
@@ -41,10 +41,10 @@
     meta.engine = engine
     meta.metadata.bind = engine
     # sqlalchemy migrate version table
-    import sqlalchemy.exceptions
+    import sqlalchemy.exc
     try:
         version_table = Table('migrate_version', metadata, autoload=True)
-    except sqlalchemy.exceptions.NoSuchTableError:
+    except sqlalchemy.exc.NoSuchTableError:
         pass
 
 
@@ -155,13 +155,13 @@
 
 
     def setup_migration_version_control(self, version=None):
-        import migrate.versioning.exceptions
+        import migrate.exceptions
         import migrate.versioning.api as mig
         # set up db version control (if not already)
         try:
             mig.version_control(self.metadata.bind,
                     self.migrate_repository, version)
-        except migrate.versioning.exceptions.DatabaseAlreadyControlledError:
+        except migrate.exceptions.DatabaseAlreadyControlledError:
             pass
 
     def upgrade_db(self, version=None):


diff -r 028897b1e4b00b395a99cb5f680f56a9de2142d4 -r 2c21fe91f1e4da45f8bcbc03593668783e197a3b requires/lucid_conflict.txt
--- a/requires/lucid_conflict.txt
+++ b/requires/lucid_conflict.txt
@@ -6,7 +6,7 @@
 
 Genshi==0.6
 sqlalchemy-migrate==0.6
-sqlalchemy==0.6.6
+sqlalchemy==0.7.3
 webhelpers==1.2
 
 # NOTE: Developers, our build script for the Debian packages relies on the 


diff -r 028897b1e4b00b395a99cb5f680f56a9de2142d4 -r 2c21fe91f1e4da45f8bcbc03593668783e197a3b requires/lucid_missing.txt
--- a/requires/lucid_missing.txt
+++ b/requires/lucid_missing.txt
@@ -6,7 +6,7 @@
 # licenses==0.4,<0.6.99
 -e hg+https://bitbucket.org/okfn/licenses@0eed4a13296b#egg=licenses
 # vdm>=0.9,<0.9.99
--e hg+https://bitbucket.org/okfn/vdm@vdm-0.9#egg=vdm
+-e hg+https://bitbucket.org/okfn/vdm@54193f2df710#egg=vdm
 # markupsafe==0.9.2 required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6
 -e git+https://github.com/mitsuhiko/markupsafe.git@0.9.2#egg=markupsafe
 # autoneg>=0.5

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


