Add support for SQLAlchemy 2.0

.github/workflows/test.yml

@@ -10,37 +10,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.9", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        sqlalchemy-version: ["1.4", "2.0"]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: pip
-        cache-dependency-path: pyproject.toml
-    - name: Install dependencies
-      run: pip install -e .[test] coveralls
-    - name: Test with pytest
-      run: coverage run -m pytest
-    - name: Upload Coverage
-      run: coveralls --service=github
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        COVERALLS_FLAG_NAME: ${{ matrix.test-name }}
-        COVERALLS_PARALLEL: true
-        SQLALCHEMY_WARN_20: "true"
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: pyproject.toml
+      - name: Install dependencies SQLAlchemy 1.4
+        if: matrix.sqlalchemy-version == 1.4
+        run: pip install -e .[test,sqlmodel] coveralls SQLAlchemy==1.4.*
+      - name: Install dependencies SQLAlchemy 2.0
+        if: matrix.sqlalchemy-version == 2.0
+        run: pip install -e .[test] coveralls SQLAlchemy==2.0.*
+      - name: Test with pytest
+        run: coverage run -m pytest
+      - name: Upload Coverage
+        run: coveralls --service=github
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: ${{ matrix.test-name }}
+          COVERALLS_PARALLEL: true
+          SQLALCHEMY_WARN_20: "true"
 
   coveralls:
     name: Finish Coveralls
     needs: [test]
     runs-on: ubuntu-latest
     container: python:3-slim
     steps:
-    - name: Finished
-      run: |
-        pip install coveralls
-        coveralls --service=github --finish
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Finished
+        run: |
+          pip install coveralls
+          coveralls --service=github --finish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pyproject.toml

@@ -25,10 +25,11 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 requires-python = ">=3.7"
 dependencies = [
-    "SQLAlchemy >= 1.4.36, < 2.0",
+    "SQLAlchemy >= 1.4.36",
     "inflect >= 4.0.0",
     "importlib_metadata; python_version < '3.10'",
 ]
@@ -44,6 +45,8 @@ test = [
     "pytest-cov",
     "psycopg2-binary",
     "mysql-connector-python",
+]
+sqlmodel = [
     "sqlmodel",
 ]
 citext = ["sqlalchemy-citext >= 1.7.0"]
@@ -75,7 +78,8 @@ strict = true
 plugins = ["sqlalchemy.ext.mypy.plugin"]
 
 [tool.pytest.ini_options]
-addopts = "-rsx --tb=short"
+pythonpath = "src/sqlacodegen"
+addopts = "-rsx --tb=short --import-mode=importlib"
 testpaths = ["tests"]
 
 [coverage.run]
@@ -88,7 +92,7 @@ show_missing = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py37, py38, py39, py310
+envlist = py37, py38, py39, py310, py311
 skip_missing_interpreters = true
 isolated_build = true