Reorganize test folder (#54)

* Reorganize tests folder to match directory structure of project

* Skip more tests on windows

* Report test speeds

* Skip new keynesian tests on windows

* Remove quotes

* single quotes

* escape space

* another try

* quote the whole string

* new matrix argument

Author: jessegrabowski

.github/workflows/run_tests.yml

@@ -20,39 +20,54 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - subset-name: "Model Steady State Tests"
+          - subset-name: "Steady State Tests"
             os: ubuntu-latest
             python-version: "3.12"
-            test-subset: "tests/test_model.py::test_numerical_steady_state tests/test_model.py::test_steady_state tests/test_model.py::test_partially_analytical_steady_state"
-          - subset-name: "Model Tests"
+            test-subset: "tests/model/test_steady_state.py tests/model/test_model.py::test_steady_state"
+            test-marker: ""
+
+          - subset-name: "Numerical Steady State Tests"
             os: ubuntu-latest
             python-version: "3.12"
-            test-subset: "tests/test_model.py --deselect tests/test_model.py::test_numerical_steady_state --deselect tests/test_model.py::test_steady_state --deselect tests/test_model.py::test_partially_analytical_steady_state"
-          - subset-name: "Steady State Tests"
+            test-subset: "tests/model/test_model.py::test_numerical_steady_state tests/model/test_model.py::test_numerical_steady_state_with_calibrated_params tests/model/test_model.py::test_partially_analytical_steady_state"
+            test-marker: ""
+
+          - subset-name: "Perturbation and Statespace Tests"
             os: ubuntu-latest
             python-version: "3.12"
-            test-subset: "tests/test_steady_state.py"
-          - subset-name: "Perturbation Tests"
+            test-subset: "tests/model/test_perturbation.py tests/model/test_statespace.py"
+            test-marker: ""
+
+          - subset-name: "Other Model Tests"
             os: ubuntu-latest
             python-version: "3.12"
-            test-subset: "tests/test_perturbation.py"
+            test-subset: "tests/model --ignore=tests/model/test_steady_state.py --ignore=tests/model/test_statespace.py --ignore=tests/model/test_perturbation.py --deselect tests/model/test_model.py::test_numerical_steady_state --deselect tests/model/test_model.py::test_numerical_steady_state_with_calibrated_params --deselect tests/model/test_model.py::test_partially_analytical_steady_state"
+            test-marker: ""
+
           - subset-name: "Other Tests"
             os: ubuntu-latest
             python-version: "3.12"
-            test-subset: "tests/ --ignore tests/test_model.py --ignore tests/test_steady_state.py --ignore tests/test_perturbation.py"
+            test-subset: "tests/ --ignore=tests/model"
+            test-marker: ""
+
           - subset-name: "Windows Test Model"
             os: windows-latest
             python-version: "3.13"
-            test-subset: "tests/test_model.py --deselect tests/test_model.py::test_numerical_steady_state --deselect tests/test_model.py::test_steady_state --deselect tests/test_model.py::test_partially_analytical_steady_state --deselect tests/test_model.py::test_all_backends_agree_on_functions --deselect tests/test_model.py::test_scipy_wrapped_functions_agree"
+            test-subset: "tests/model --ignore=tests/model/test_steady_state.py --ignore=tests/model/test_statespace.py --ignore=tests/model/test_build.py --deselect tests/model/test_model.py::test_steady_state --deselect tests/model/test_model.py::test_numerical_steady_state --deselect tests/model/test_model.py::test_partially_analytical_steady_state --deselect tests/model/test_model.py::test_all_backends_agree_on_functions --deselect tests/model/test_model.py::test_scipy_wrapped_functions_agree --deselect tests/model/test_model.py::test_all_backends_agree_on_parameters --deselect tests/models/test_model.py::test_simulate"
+            test-marker: "not include_nk"
+
           - subset-name: "Windows Other Tests"
             os: windows-latest
             python-version: "3.13"
-            test-subset: "tests/ --ignore tests/test_model.py --ignore tests/test_steady_state.py --ignore tests/test_perturbation.py"
+            test-subset: "tests/ --ignore=tests/model"
+            test-marker: "not include_nk"
+
     name: ${{ matrix.subset-name }} (${{ matrix.os }} Python ${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
 
     env:
       TEST_SUBSET: ${{ matrix.test-subset }}
+      TEST_MARKER: ${{ matrix.test-marker }}
 
     defaults:
       run:
@@ -87,7 +102,7 @@ jobs:
 
     - name: Run tests
       run: |
-        python -m pytest -vv --cache-clear --cov=gEconpy --cov-report=xml:coverage/coverage-${MATRIX_ID}.xml --no-cov-on-fail --cov-report term $TEST_SUBSET
+        python -m pytest -vv --cache-clear --cov=gEconpy --cov-report=xml:coverage/coverage-${MATRIX_ID}.xml --no-cov-on-fail --cov-report term $TEST_SUBSET -m "$TEST_MARKER" --durations=50
       env:
         MATRIX_ID: ${{ steps.matrix-id.outputs.id }}
 

gEconpy/model/build.py

@@ -2,6 +2,7 @@
 
 import pytensor.tensor as pt
 import sympy as sp
+from pathlib import Path
 
 from pymc.pytensorf import rewrite_pregrad
 from pytensor import graph_replace
@@ -204,7 +205,7 @@ def _compile_gcn(
 
 
 def model_from_gcn(
-    gcn_path: str,
+    gcn_path: str | Path,
     simplify_blocks: bool = True,
     simplify_tryreduce: bool = True,
     simplify_constants: bool = True,

gEconpy/parser/file_loaders.py

@@ -4,6 +4,7 @@
 from warnings import warn
 
 import sympy as sp
+from pathlib import Path
 
 from gEconpy.classes.containers import SymbolDictionary
 from gEconpy.classes.time_aware_symbol import TimeAwareSymbol
@@ -33,13 +34,13 @@
 _log = logging.getLogger(__name__)
 
 
-def load_gcn(gcn_path: str) -> str:
+def load_gcn(gcn_path: str | Path) -> str:
     """
     Loads a model file as raw text.
 
     Parameters
     ----------
-    gcn_path : str
+    gcn_path : str or Path
         File path to model file (GCN file).
 
     Returns
@@ -300,7 +301,7 @@ def parsed_model_to_data(
 
 
 def gcn_to_block_dict(
-    gcn_path: str, simplify_blocks: bool, include_ss_block=False
+    gcn_path: str | Path, simplify_blocks: bool, include_ss_block=False
 ) -> tuple[
     dict[str, Block],
     ASSUMPTION_DICT,

pyproject.toml

@@ -108,6 +108,9 @@ filterwarnings = [
     "ignore::DeprecationWarning",
     "ignore::RuntimeWarning"]
 
+markers = [
+    "include_nk: mark tests using the full new keyenesian model (which can be quite slow)",
+]
 
 [tool.ruff.lint]
 select = ["D", "E", "F", "I", "UP", "W", "RUF"]

tests/utilities/__init__.py tests/_resources/__init__.pytests/utilities/__init__.py renamed to tests/_resources/__init__.py

@@ -1,5 +1,4 @@
-import os
-
+from pathlib import Path
 from functools import cache
 
 from gEconpy import model_from_gcn, statespace_from_gcn
@@ -11,7 +10,7 @@ def load_and_cache_model(gcn_file, backend, use_jax=False):
     if backend == "pytensor" and use_jax:
         compile_kwargs["mode"] = "JAX"
 
-    gcn_path = os.path.join("tests", "Test GCNs", gcn_file)
+    gcn_path = Path("tests") / "_resources" / "test_gcns" / gcn_file
     model = model_from_gcn(
         gcn_path,
         verbose=False,
@@ -24,7 +23,7 @@ def load_and_cache_model(gcn_file, backend, use_jax=False):
 
 @cache
 def load_and_cache_statespace(gcn_file):
-    gcn_path = os.path.join("tests", "Test GCNs", gcn_file)
+    gcn_path = Path("tests") / "_resources" / "test_gcns" / gcn_file
     statespace = statespace_from_gcn(gcn_path, verbose=False)
 
     return statespace