Skip to content

Commit c3914f4

Browse files
committed
try fix CI
1 parent 57b16e0 commit c3914f4

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
- name: Install Release Dependencies
107107
run: |
108108
just init ${{ steps.sp.outputs.python-path }}
109-
just install-postgres
109+
just install-${{ matrix.psycopg-version }}
110110
just pin-dependency Django~=${{ matrix.django-version }}.0
111111
- name: Install Emacs
112112
if: ${{ github.event.inputs.debug == 'true' }}

tests/verify_environment.py

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test():
2929
rdbms = os.environ["RDBMS"]
3030
expected_python = os.environ["TEST_PYTHON_VERSION"]
3131
expected_django = os.environ["TEST_DJANGO_VERSION"]
32-
expected_db_ver = os.environ["TEST_DATABASE_VERSION"]
32+
expected_db_ver = os.environ.get("TEST_DATABASE_VERSION", None)
3333
expected_client = os.environ.get("TEST_DATABASE_CLIENT_VERSION", None)
3434

3535
expected_python = tuple(int(v) for v in expected_python.split(".") if v)
@@ -44,19 +44,25 @@ def test():
4444
f"{expected_django}"
4545
)
4646

47-
if rdbms == "postgres":
48-
if expected_db_ver == "latest":
49-
# todo
47+
if expected_db_ver:
48+
if rdbms == "postgres":
49+
if expected_db_ver == "latest":
50+
# todo
51+
pass
52+
else:
53+
expected_version = tuple(
54+
int(v) for v in expected_db_ver.split(".") if v
55+
)
56+
assert (
57+
expected_version
58+
== get_postgresql_version()[: len(expected_version)]
59+
)
60+
assert find_spec(expected_client), f"{expected_client} not installed"
61+
elif rdbms == "mysql":
62+
pass
63+
elif rdbms == "mariadb":
64+
pass
65+
elif rdbms == "sqlite":
66+
pass
67+
elif rdbms == "oracle":
5068
pass
51-
else:
52-
expected_version = tuple(int(v) for v in expected_db_ver.split(".") if v)
53-
assert expected_version == get_postgresql_version()[: len(expected_version)]
54-
assert find_spec(expected_client), f"{expected_client} not installed"
55-
elif rdbms == "mysql":
56-
pass
57-
elif rdbms == "mariadb":
58-
pass
59-
elif rdbms == "sqlite":
60-
pass
61-
elif rdbms == "oracle":
62-
pass

0 commit comments

Comments
 (0)