From 6acafd086fe41393ae51c95ae68ab41aef2d01d2 Mon Sep 17 00:00:00 2001 From: Eric Masseran Date: Wed, 20 Dec 2023 11:29:14 +0100 Subject: [PATCH 1/3] Update GH action versions --- .github/workflows/flake8.yml | 2 +- .github/workflows/interrogate.yml | 6 +++--- .github/workflows/publish.yml | 4 ++-- .github/workflows/tox.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 7478bcf7..36af0c03 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -6,5 +6,5 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: TrueBrain/actions-flake8@v2 diff --git a/.github/workflows/interrogate.yml b/.github/workflows/interrogate.yml index b5091a65..25866572 100644 --- a/.github/workflows/interrogate.yml +++ b/.github/workflows/interrogate.yml @@ -7,16 +7,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout head branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: head - name: Checkout base branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.base_ref }} path: base - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install interrogate diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea8f8c2c..e849dbca 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,9 +10,9 @@ jobs: name: Build and publish to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install pypa/build diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 2bed2b59..cdc0378f 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -38,9 +38,9 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install lxml dependencies From e015e0beb5beaaf9fe38c853cf3d9c6b20dbaec0 Mon Sep 17 00:00:00 2001 From: Eric Masseran Date: Wed, 20 Dec 2023 14:41:36 +0100 Subject: [PATCH 2/3] Recreate tox --- .github/workflows/tox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index cdc0378f..1d47ec97 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -67,4 +67,4 @@ jobs: sleep 1 done - name: Test with tox - run: tox + run: tox --recreate \ No newline at end of file From 3481939075611055e3d77222069c9cb12abe67c6 Mon Sep 17 00:00:00 2001 From: Eric Masseran Date: Thu, 21 Dec 2023 15:22:06 +0100 Subject: [PATCH 3/3] Dispose DB connections as a teardown fixture --- tests/conftest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 50628202..56192d9a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -223,6 +223,8 @@ def truncate_app(dbconn): app = create_app(context.server) app.config["TESTING"] = True yield app + taxiiserver.servers.taxii1.persistence.api.db.engine.dispose() + taxiiserver.servers.taxii2.persistence.api.db.engine.dispose() @pytest.fixture()