Update dependencies 2023-03-22

* Add ITDE as dev-dependency * Update dependencies * Update change log --------- Co-authored-by: Christoph Pirkl <christoph.pirkl@exasol.com>
exasol · Mar 22, 2023 · 09ac067 · 09ac067
1 parent 974e908
commit 09ac067
Show file tree

Hide file tree

Showing 11 changed files with 548 additions and 207 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -65,8 +65,8 @@ jobs:
           - pyodbc
           - turbodbc
         exasol_version:
-          - 7.1.9
-          - 7.0.18
+          - 7.1.17
+          - 7.0.20
 
     name: Integration Tests (Python-${{ matrix.python }}, Connector-${{ matrix.connector }}, Exasol-${{ matrix.exasol_version }})
 
@@ -87,13 +87,6 @@ jobs:
         run: poetry install --extras "turbodbc"
         if: ${{ matrix.connector == 'turbodbc' }}
 
-      - name: Checkout test environment
-        run: git clone --depth 1 --branch ${ITDE_TAG} ${ITDE_URL}
-        working-directory: ..
-        env:
-          ITDE_URL: "https://github.com/exasol/integration-test-docker-environment.git"
-          ITDE_TAG: "0.11.0"
-
       - name: Run Test for Python ${{ matrix.python }} using ${{ matrix.connector }}
         run: |
           poetry run nox -s unit-tests

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -69,8 +69,8 @@ jobs:
           - pyodbc
           - turbodbc
         exasol_version:
-          - 7.1.9
-          - 7.0.18
+          - 7.1.17
+          - 7.0.20
 
     name: Integration Tests (Python-${{ matrix.python }}, Connector-${{ matrix.connector }}, Exasol-${{ matrix.exasol_version }})
 
@@ -91,13 +91,6 @@ jobs:
         run: poetry install --extras "turbodbc"
         if: ${{ matrix.connector == 'turbodbc' }}
 
-      - name: Checkout test environment
-        run: git clone --depth 1 --branch ${ITDE_TAG} ${ITDE_URL}
-        working-directory: ..
-        env:
-          ITDE_URL: "https://github.com/exasol/integration-test-docker-environment.git"
-          ITDE_TAG: "0.11.0"
-
       - name: Run Test for Python ${{ matrix.python }} using ${{ matrix.connector }}
         run: |
           poetry run nox -s unit-tests

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,7 +15,7 @@ Unreleased
 ✨ Added
 --------
 
-* Add websocket based dbapi2 compliant database driver
+* Added websocket based dbapi2 compliant database driver
 
 🔧 Changed
 ----------
@@ -27,17 +27,17 @@ Unreleased
 
 🧰 Internal
 -----------
-* Change changelog workflow
+* Changed changelog workflow
 
     - Removed scriv
     - Added unreleased section to track unreleased changes
 
 * Simplified workflows by factoring out python & poetry setup into an action
-* Add an internal category to the changelog fragment template
-* Add a manual trigger for the gh-pages workflow
+* Added a internal category to the changelog fragment template
+* Added manual trigger for the gh-pages workflow
 * Removed workaround for outdated DB versions
   (for further details see https://github.com/exasol/sqlalchemy-exasol/issues/5)
-
+* Added exasol-integration-test-docker-environment as dev dependency
 
 .. _changelog-4.0.0:
 

diff --git a/noxfile.py b/noxfile.py
@@ -18,7 +18,7 @@
 from typing import Iterator
 
 import nox
-from git import tags
+from git_helpers import tags
 from links import check as _check
 from links import documentation as _documentation
 from links import urls as _urls
@@ -40,14 +40,13 @@
 
 
 class Settings:
-    ITDE = PROJECT_ROOT / ".." / "integration-test-docker-environment"
     ODBC_DRIVER = PROJECT_ROOT / "driver" / "libexaodbc-uo2214lv2.so"
     CONNECTORS = ("pyodbc", "turbodbc")
     ENVIRONMENT_NAME = "test"
     DB_PORT = 8888
     BUCKETFS_PORT = 6666
     VERSION_FILE = PROJECT_ROOT / "sqlalchemy_exasol" / "version.py"
-    DB_VERSIONS = ("7.1.9", "7.0.18")
+    DB_VERSIONS = ("7.1.17", "7.0.20")
 
 
 def find_session_runner(session: Session, name: str) -> SessionRunner:
@@ -135,24 +134,21 @@ def parser() -> ArgumentParser:
         return p
 
     def start(db_version: str) -> None:
-        # Consider adding ITDE as dev dependency once ITDE is packaged properly
-        with session.chdir(Settings.ITDE):
-            session.run(
-                "bash",
-                "start-test-env",
-                "spawn-test-environment",
-                "--environment-name",
-                f"{Settings.ENVIRONMENT_NAME}",
-                "--database-port-forward",
-                f"{Settings.DB_PORT}",
-                "--bucketfs-port-forward",
-                f"{Settings.BUCKETFS_PORT}",
-                "--docker-db-image-version",
-                db_version,
-                "--db-mem-size",
-                "4GB",
-                external=True,
-            )
+        session.run(
+            "itde",
+            "spawn-test-environment",
+            "--environment-name",
+            f"{Settings.ENVIRONMENT_NAME}",
+            "--database-port-forward",
+            f"{Settings.DB_PORT}",
+            "--bucketfs-port-forward",
+            f"{Settings.BUCKETFS_PORT}",
+            "--docker-db-image-version",
+            db_version,
+            "--db-mem-size",
+            "4GB",
+            external=True,
+        )
 
     args = parser().parse_args(session.posargs)
     start(args.db_version)
@@ -162,7 +158,6 @@ def start(db_version: str) -> None:
 def stop_db(session: Session) -> None:
     """Stop the test database"""
     session.run("docker", "kill", "db_container_test", external=True)
-    session.run("docker", "kill", "test_container_test", external=True)
 
 
 @nox.session(name="sqla-tests", python=False)