Remove env setting PMR_POSTGRES_IMAGE to allow tests to set their own images

Author: Dan-Knott

.github/workflows/test.yml

@@ -29,9 +29,6 @@ jobs:
           - postgres-drivername: postgresql+psycopg
             sqlalchemy-version: 1.4.0
 
-    env:
-      PMR_POSTGRES_IMAGE: postgis/postgis:13-3.5
-
     steps:
       - uses: actions/checkout@v3
 

Makefile

@@ -2,15 +2,13 @@
 .DEFAULT_GOAL := help
 
 WORKER_COUNT ?= 4
-POSTGRES_IMAGE ?= postgis/postgis:13-3.5
 
 install:
 	uv sync --all-extras
 
 test:
 	SQLALCHEMY_WARN_20=1 \
 	COVERAGE_PROCESS_START="$(PWD)/pyproject.toml" \
-	PMR_POSTGRES_IMAGE="$(POSTGRES_IMAGE)" \
 	uv run \
 	coverage run -m pytest -n $(WORKER_COUNT) -vv src tests
 	uv run coverage combine

tests/conftest.py

@@ -36,7 +36,7 @@ def pmr_postgres_container(pytestconfig, pmr_postgres_config: PostgresConfig):
 
 @pytest.fixture
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)
 
 
 @pytest.fixture

tests/examples/test_create_role/conftest.py

@@ -6,4 +6,4 @@
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)

tests/examples/test_create_rows/conftest.py

@@ -6,4 +6,4 @@
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)

tests/examples/test_delete_rows/conftest.py

@@ -6,4 +6,4 @@
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)

tests/examples/test_delete_rows_ignore_unspecified/conftest.py

@@ -6,4 +6,4 @@
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)

tests/examples/test_delete_unspecified_grants/conftest.py

@@ -12,4 +12,4 @@ def alembic_engine(_alembic_engine):
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)

tests/examples/test_function_create/test_migrations.py

@@ -8,7 +8,7 @@
 
 @pytest.fixture(scope="session")
 def pmr_postgres_config():
-    return PostgresConfig(port=None, ci_port=None)
+    return PostgresConfig(image="postgres:13", port=None, ci_port=None)
 
 
 def test_apply_autogenerated_revision(alembic_runner: MigrationContext, alembic_engine):

tests/examples/test_function_create_pg_postgis/migrations/env.py

@@ -1,4 +1,3 @@
-
 from alembic import context
 
 # isort: split