From 55631d407e0dd579144201eefdc10e5731d247c9 Mon Sep 17 00:00:00 2001 From: Dmitry Maslennikov Date: Fri, 3 Feb 2023 17:02:02 +0400 Subject: [PATCH] fix for SQLAlchemy>=2.0 --- requirements-dev.txt | 4 +++- setup.py | 18 +++--------------- sqlalchemy_iris/embedded.py | 5 +++++ sqlalchemy_iris/iris.py | 5 +++++ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b121004..7722b8e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,5 @@ wheel flake8 -pytest \ No newline at end of file +pytest +black +twine diff --git a/setup.py b/setup.py index 674ab3a..49b7aa0 100644 --- a/setup.py +++ b/setup.py @@ -1,21 +1,9 @@ from setuptools import setup -import os - -thelibFolder = os.path.dirname(os.path.realpath(__file__)) -requirementPath = thelibFolder + '/requirements.txt' - -requirements, dependency_links = [], [] -if os.path.isfile(requirementPath): - with open('./requirements.txt') as f: - for line in f.read().splitlines(): - if line.startswith('http'): - dependency_links.append(line) - else: - requirements.append(line) setup( - install_requires=requirements, - dependency_links=dependency_links, + install_requires=[ + "SQLAlchemy>=1.3" + ], entry_points={ "sqlalchemy.dialects": [ "iris = sqlalchemy_iris.iris:IRISDialect_iris", diff --git a/sqlalchemy_iris/embedded.py b/sqlalchemy_iris/embedded.py index 23b1d3b..43b2e71 100644 --- a/sqlalchemy_iris/embedded.py +++ b/sqlalchemy_iris/embedded.py @@ -14,5 +14,10 @@ def _get_option(self, connection, option): def _set_option(self, connection, option, value): return connection.iris.cls('%SYSTEM.SQL.Util').SetOption(option) + @classmethod + def import_dbapi(cls): + import intersystems_iris.dbapi._DBAPI as dbapi + return dbapi + dialect = IRISDialect_emb diff --git a/sqlalchemy_iris/iris.py b/sqlalchemy_iris/iris.py index 7bc563a..6067684 100644 --- a/sqlalchemy_iris/iris.py +++ b/sqlalchemy_iris/iris.py @@ -6,5 +6,10 @@ class IRISDialect_iris(IRISDialect): supports_statement_cache = True + @classmethod + def import_dbapi(cls): + import intersystems_iris.dbapi._DBAPI as dbapi + return dbapi + dialect = IRISDialect_iris