at mark and try check os again

Author: danielfeismann

.github/workflows/ci.yml

@@ -88,6 +88,12 @@ jobs:
       #    run test suite
       #----------------------------------------------
       - name: Run tests
+        if: matrix.os != 'windows-latest'
         run: |
           source $VENV
           pytest tests/
+      - name: Run tests (Windows - skip Docker tests)
+        if: matrix.os == 'windows-latest'
+        run: |
+          source $VENV
+          pytest tests/ -m "not docker_required"

tests/db/weather/conftest.py

@@ -9,9 +9,7 @@
 
 
 @pytest.fixture(scope="session")
-@pytest.mark.skipif(
-    platform.system() == "Windows", reason="Docker tests skipped on Windows"
-)
+@pytest.mark.docker_required
 def docker_postgres():
     """Start a PostgreSQL container for testing."""
     container_name = "test_postgres_container"
@@ -61,6 +59,7 @@ def docker_postgres():
 
 
 @pytest.fixture(scope="session")
+@pytest.mark.docker_required
 def db_engine(docker_postgres):
     """Create a database engine connected to the Docker PostgreSQL instance."""
     engine = create_engine(docker_postgres)
@@ -98,6 +97,7 @@ def db_engine(docker_postgres):
 
 
 @pytest.fixture
+@pytest.mark.docker_required
 def db_session(db_engine):
     """Create a new database session for a test."""
     with Session(db_engine) as session:
@@ -106,6 +106,7 @@ def db_session(db_engine):
 
 
 @pytest.fixture(scope="function", autouse=True)
+@pytest.mark.docker_required
 def reset_db(db_engine):
     SQLModel.metadata.drop_all(db_engine)
     SQLModel.metadata.create_all(db_engine)

tests/db/weather/test_proxy.py

@@ -1,15 +1,12 @@
 import math
-import platform
 
 import pytest
 
 from pypsdm.db.weather.models import Coordinate
 from pypsdm.db.weather.utils import weighted_interpolation_coordinates
 
 
-@pytest.mark.skipif(
-    platform.system() == "Windows", reason="Docker tests skipped on Windows"
-)
+@pytest.mark.docker_required
 def test_weighted_interpolation_coordinates(db_session):
     """Test weighted interpolation of coordinates."""
     coordinates = [

tests/db/weather/test_weather_models.py

@@ -1,4 +1,3 @@
-import platform
 from datetime import datetime
 
 import pytest
@@ -7,9 +6,7 @@
 from pypsdm.db.weather.models import Coordinate, WeatherValue
 
 
-@pytest.mark.skipif(
-    platform.system() == "Windows", reason="Docker tests skipped on Windows"
-)
+@pytest.mark.docker_required
 def test_create_coordinate(db_session):
     """Test creating a coordinate."""
     coordinates = []