diff --git a/setup.py b/setup.py index 1ead048..bb12dd6 100644 --- a/setup.py +++ b/setup.py @@ -40,13 +40,19 @@ setup( packages = find_packages(), install_requires = [ - 'SQLAlchemy>=0.5,<=0.6.99', + 'SQLAlchemy', ], - # This is only used by SQLAlchemy 0.6. entry_points = { + + # SQLAlchemy 0.5 + 'sqlalchemy.databases' : [ + 'sqlbase7 = sqlbase7_sa.sqlbase7_sa05:SQLBase7Dialect_SA05', + ], + + # SQLAlchemy 0.6 'sqlalchemy.dialects' : [ - 'sqlbase7 = sqlbase7_sa:base.dialect', + 'sqlbase7 = sqlbase7_sa.sqlbase7_sa06:SQLBase7Dialect_SA06_pyodbc', ], }, diff --git a/sqlbase7_sa/__init__.py b/sqlbase7_sa/__init__.py index 1c23c57..a7c7be0 100644 --- a/sqlbase7_sa/__init__.py +++ b/sqlbase7_sa/__init__.py @@ -24,25 +24,3 @@ from sqlbase7_sa._version import __version__ - -import sqlalchemy -from pkg_resources import parse_version - - -if parse_version(sqlalchemy.__version__) <= parse_version('0.5.99'): - - # SQLAlchemy 0.5 doesn't support user-contributed dialects "directly" - # by way of setuptools entry points, so we must monkey-patch it in - # order to add ours. - import sqlalchemy.databases, sqlbase7_sa, sys - sqlalchemy.databases.sqlbase7 = sqlbase7_sa - sys.modules['sqlalchemy.databases.sqlbase7'] = sqlbase7_sa - - # SQLAlchemy will be expecting us to have a 'dialect' attribute. - import sqlbase7_sa.sqlbase7_sa05 - dialect = sqlbase7_sa.sqlbase7_sa05.SQLBase7Dialect_SA05 - -else: - # SQLAlchemy 0.6 is much nicer to play with. - import sqlbase7_sa.sqlbase7_sa06 - base = sqlbase7_sa.sqlbase7_sa06