switch to official driver by default

Author: daimor

.github/workflows/python-publish.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 2024.3
+          - latest-em
           - latest-cd
           - latest-preview
         engine:
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       iris:
-        image: containers.intersystems.com/intersystems/iris-community:${{ matrix.image }}
+        image: caretdev/iris-community-light:${{ matrix.image }}
         ports:
         - 1972:1972
         options: >-
@@ -53,7 +53,8 @@ jobs:
       run: |
         pip install tox
     - name: Run Tests
-      continue-on-error: ${{ matrix.driver == 'intersystems' }}
+    #   continue-on-error: ${{ matrix.driver == 'intersystems' }}
+      continue-on-error: true
       run: |
         docker exec iris iris session iris -U%SYS '##class(Security.Users).UnExpireUserPasswords("*")'
         tox -e py312-${{ matrix.engine }}-${{ matrix.driver }} -- --dburi iris+${{ matrix.driver }}://_SYSTEM:SYS@localhost:1972/USER --junit-xml=test-results.xml
@@ -96,10 +97,7 @@ jobs:
         echo name=$NAME >> $GITHUB_OUTPUT
     - name: Install requirements
       run: |
-        pip install -U pip setuptools wheel \
-                    -r requirements-dev.txt \
-                    -r requirements-iris.txt \
-                    -e .
+        pip install -U pip setuptools wheel -e .
 
     - name: Build Python package
       run: ./scripts/build-dist.sh

requirements.txt

@@ -1 +1,2 @@
-SQLAlchemy>=1.3
+SQLAlchemy>=1.3
+intersystems-irispython~=5.3.2

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlalchemy-iris
-version = 0.18.2
+version = 0.19.0
 description = InterSystems IRIS for SQLAlchemy
 long_description = file: README.md
 url = https://github.com/caretdev/sqlalchemy-iris
@@ -32,7 +32,7 @@ packages = find:
 
 [options.extras_require]
 intersystems =
-    intersystems-irispython~=5.1.0
+    intersystems-irispython~=5.3.2
 
 [tool:pytest]
 addopts= --tb native -v -r fxX -p no:warnings
@@ -41,8 +41,8 @@ addopts= --tb native -v -r fxX -p no:warnings
 default=iris://_SYSTEM:SYS@localhost:1972/USER
 iris=iris://_SYSTEM:SYS@localhost:1972/USER
 irisintersystems=iris+intersystems://_SYSTEM:SYS@localhost:1972/USER
-irisasync=iris+irisasync://_SYSTEM:SYS@localhost:1972/USER
-irisemb=iris+emb:///
+# irisasync=iris+irisasync://_SYSTEM:SYS@localhost:1972/USER
+# irisemb=iris+emb:///
 sqlite=sqlite:///:memory:
 
 [sqla_testing]

setup.py

@@ -2,13 +2,15 @@
 
 setup(
     install_requires=[
-        "SQLAlchemy>=1.3"
+        "SQLAlchemy>=1.3",
+        "intersystems-irispython~=5.3.2",
     ],
     entry_points={
         "sqlalchemy.dialects": [
-            "iris = sqlalchemy_iris.iris:IRISDialect_iris",
-            "iris.emb = sqlalchemy_iris.embedded:IRISDialect_emb",
-            "iris.irisasync = sqlalchemy_iris.irisasync:IRISDialect_irisasync",
+            # "iris = sqlalchemy_iris.iris:IRISDialect_iris",
+            # "iris.emb = sqlalchemy_iris.embedded:IRISDialect_emb",
+            # "iris.irisasync = sqlalchemy_iris.irisasync:IRISDialect_irisasync",
+            "iris = sqlalchemy_iris.intersystems:IRISDialect_intersystems",
             "iris.intersystems = sqlalchemy_iris.intersystems:IRISDialect_intersystems",
         ]
     },

sqlalchemy_iris/__init__.py

@@ -1,7 +1,8 @@
 from sqlalchemy.dialects import registry as _registry
 
 from . import base
-from . import iris
+from . import iris # noqa
+from .intersystems import dialect as intersystems_dialect
 
 try:
     import alembic # noqa
@@ -27,11 +28,12 @@
 from .base import IRISListBuild
 from .base import IRISVector
 
-base.dialect = dialect = iris.dialect
+base.dialect = dialect = intersystems_dialect
 
-_registry.register("iris.iris", "sqlalchemy_iris.iris", "IRISDialect_iris")
-_registry.register("iris.emb", "sqlalchemy_iris.embedded", "IRISDialect_emb")
-_registry.register("iris.irisasync", "sqlalchemy_iris.irisasync", "IRISDialect_irisasync")
+# _registry.register("iris.iris", "sqlalchemy_iris.iris", "IRISDialect_iris")
+# _registry.register("iris.emb", "sqlalchemy_iris.embedded", "IRISDialect_emb")
+# _registry.register("iris.irisasync", "sqlalchemy_iris.irisasync", "IRISDialect_irisasync")
+_registry.register("iris.iris", "sqlalchemy_iris.intersystems", "IRISDialect_intersystems")
 _registry.register("iris.intersystems", "sqlalchemy_iris.intersystems", "IRISDialect_intersystems")
 
 __all__ = [

sqlalchemy_iris/base.py

@@ -2,7 +2,10 @@
 from decimal import Decimal
 from typing import Optional
 from typing import Any
-import intersystems_iris.dbapi._DBAPI as dbapi
+try:
+    import intersystems_iris.dbapi._DBAPI as dbapi
+except ImportError:
+    dbapi = None
 from . import information_schema as ischema
 from sqlalchemy import exc
 from sqlalchemy.orm import aliased

sqlalchemy_iris/types.py

@@ -4,9 +4,13 @@
 from sqlalchemy.sql import sqltypes
 from sqlalchemy.types import UserDefinedType
 from uuid import UUID as _python_UUID
-from intersystems_iris import IRISList
 from sqlalchemy import __version__ as sqlalchemy_version
 
+try:
+    from intersystems_iris import IRISList
+except ImportError:
+    pass
+
 HOROLOG_ORDINAL = datetime.date(1840, 12, 31).toordinal()
 
 

tox.ini

@@ -11,30 +11,27 @@ setenv =
 deps =
   sqlalchemy<2
   -r requirements-dev.txt
-  -r requirements-iris.txt
   -e.
-commands = {envpython} -m pytest {posargs} --driver iris
+commands = {envpython} -m pytest {posargs}
 
 [testenv:py{310,311,312,313,314}-new-iris]
 deps =
   sqlalchemy>=2
   -r requirements-dev.txt
-  -r requirements-iris.txt
   -e.
-commands = {envpython} -m pytest {posargs} --driver iris
+commands = {envpython} -m pytest {posargs}
 
 [testenv:py{310,311,312,313,314}-old-intersystems]
 deps =
   sqlalchemy<2
   -r requirements-dev.txt
-  -r requirements-iris.txt
-  -e .[intersystems]
+#   -r requirements-iris.txt
+  -e .
 commands = {envpython} -m pytest {posargs} --driver intersystems
 
 [testenv:py{310,311,312,313,314}-new-intersystems]
 deps =
   sqlalchemy>=2
   -r requirements-dev.txt
-  -r requirements-iris.txt
-  -e .[intersystems]
+  -e .
 commands = {envpython} -m pytest {posargs} --driver intersystems