Reorganise tests so FIAT and FInAT can be run separately

firedrakeproject · Dec 5, 2024 · 18e30f3 · 18e30f3
1 parent 7c725d8
commit 18e30f3
Show file tree

Hide file tree

Showing 44 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -32,12 +32,14 @@ jobs:
         run: |
           python -m pip install pydocstyle
           python -m pydocstyle .
-      - name: Install FIAT
-        run: pip install .
-      - name: Test with pytest
+      - name: Install FIAT and CI dependencies
         run: |
-          python -m pip install coveralls pytest pytest-cov pytest-xdist
-          DATA_REPO_GIT="" python -m pytest --cov=FIAT/ --cov=finat --cov=gem test/
+          python -m pip install '.[test]'
+          python -m pip install coveralls pytest-cov
+      - name: Test FIAT
+        run: DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/FIAT
+      - name: Test FInAT
+        run: DATA_REPO_GIT="" python -m pytest --cov=finat/ --cov=gem/ test/finat
       - name: Coveralls
         if: ${{ github.repository == 'FEniCS/fiat' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' }}
         env:

diff --git a/pyproject.toml b/pyproject.toml
@@ -33,6 +33,7 @@ doc = [
   "setuptools",  # for pkg_resources
   "sphinx",
 ]
+test = ["pytest"]
 
 [tool.setuptools]
 packages = ["FIAT", "finat", "finat.ufl", "gem"]
diff --git a/test/regression/.gitignore → test/FIAT/regression/.gitignore b/test/regression/.gitignore → test/FIAT/regression/.gitignore
diff --git a/test/regression/README.rst → test/FIAT/regression/README.rst b/test/regression/README.rst → test/FIAT/regression/README.rst
diff --git a/test/regression/conftest.py → test/FIAT/regression/conftest.py b/test/regression/conftest.py → test/FIAT/regression/conftest.py
diff --git a/test/regression/fiat-reference-data-id → test/FIAT/regression/fiat-reference-data-id b/test/regression/fiat-reference-data-id → test/FIAT/regression/fiat-reference-data-id
diff --git a/test/regression/scripts/download → test/FIAT/regression/scripts/download b/test/regression/scripts/download → test/FIAT/regression/scripts/download
diff --git a/test/regression/scripts/getdata → test/FIAT/regression/scripts/getdata b/test/regression/scripts/getdata → test/FIAT/regression/scripts/getdata
diff --git a/test/regression/scripts/getreferencerepo → .../FIAT/regression/scripts/getreferencerepo b/test/regression/scripts/getreferencerepo → .../FIAT/regression/scripts/getreferencerepo
diff --git a/test/regression/scripts/parameters → test/FIAT/regression/scripts/parameters b/test/regression/scripts/parameters → test/FIAT/regression/scripts/parameters
diff --git a/test/regression/scripts/upload → test/FIAT/regression/scripts/upload b/test/regression/scripts/upload → test/FIAT/regression/scripts/upload
diff --git a/test/regression/test_regression.py → test/FIAT/regression/test_regression.py b/test/regression/test_regression.py → test/FIAT/regression/test_regression.py
diff --git a/test/unit/test_argyris.py → test/FIAT/unit/test_argyris.py b/test/unit/test_argyris.py → test/FIAT/unit/test_argyris.py
diff --git a/test/unit/test_awc.py → test/FIAT/unit/test_awc.py b/test/unit/test_awc.py → test/FIAT/unit/test_awc.py
diff --git a/test/unit/test_awnc.py → test/FIAT/unit/test_awnc.py b/test/unit/test_awnc.py → test/FIAT/unit/test_awnc.py
diff --git a/test/unit/test_bernstein.py → test/FIAT/unit/test_bernstein.py b/test/unit/test_bernstein.py → test/FIAT/unit/test_bernstein.py
diff --git a/test/unit/test_discontinuous_pc.py → test/FIAT/unit/test_discontinuous_pc.py b/test/unit/test_discontinuous_pc.py → test/FIAT/unit/test_discontinuous_pc.py
diff --git a/test/unit/test_discontinuous_taylor.py → test/FIAT/unit/test_discontinuous_taylor.py b/test/unit/test_discontinuous_taylor.py → test/FIAT/unit/test_discontinuous_taylor.py
diff --git a/test/unit/test_facet_support_dofs.py → test/FIAT/unit/test_facet_support_dofs.py b/test/unit/test_facet_support_dofs.py → test/FIAT/unit/test_facet_support_dofs.py
diff --git a/test/unit/test_fdm.py → test/FIAT/unit/test_fdm.py b/test/unit/test_fdm.py → test/FIAT/unit/test_fdm.py
diff --git a/test/unit/test_fiat.py → test/FIAT/unit/test_fiat.py b/test/unit/test_fiat.py → test/FIAT/unit/test_fiat.py
diff --git a/test/unit/test_gauss_legendre.py → test/FIAT/unit/test_gauss_legendre.py b/test/unit/test_gauss_legendre.py → test/FIAT/unit/test_gauss_legendre.py
diff --git a/test/unit/test_gauss_lobatto_legendre.py → .../FIAT/unit/test_gauss_lobatto_legendre.py b/test/unit/test_gauss_lobatto_legendre.py → .../FIAT/unit/test_gauss_lobatto_legendre.py
diff --git a/test/unit/test_gauss_radau.py → test/FIAT/unit/test_gauss_radau.py b/test/unit/test_gauss_radau.py → test/FIAT/unit/test_gauss_radau.py
diff --git a/...t/test_gopalakrishnan_lederer_schoberl.py → ...t/test_gopalakrishnan_lederer_schoberl.py b/...t/test_gopalakrishnan_lederer_schoberl.py → ...t/test_gopalakrishnan_lederer_schoberl.py
diff --git a/test/unit/test_hct.py → test/FIAT/unit/test_hct.py b/test/unit/test_hct.py → test/FIAT/unit/test_hct.py
diff --git a/test/unit/test_hdivtrace.py → test/FIAT/unit/test_hdivtrace.py b/test/unit/test_hdivtrace.py → test/FIAT/unit/test_hdivtrace.py
diff --git a/test/unit/test_hierarchical.py → test/FIAT/unit/test_hierarchical.py b/test/unit/test_hierarchical.py → test/FIAT/unit/test_hierarchical.py
diff --git a/test/unit/test_johnson_mercier.py → test/FIAT/unit/test_johnson_mercier.py b/test/unit/test_johnson_mercier.py → test/FIAT/unit/test_johnson_mercier.py
diff --git a/test/unit/test_kong_mulder_veldhuizen.py → .../FIAT/unit/test_kong_mulder_veldhuizen.py b/test/unit/test_kong_mulder_veldhuizen.py → .../FIAT/unit/test_kong_mulder_veldhuizen.py
diff --git a/test/unit/test_macro.py → test/FIAT/unit/test_macro.py b/test/unit/test_macro.py → test/FIAT/unit/test_macro.py
diff --git a/test/unit/test_mtw.py → test/FIAT/unit/test_mtw.py b/test/unit/test_mtw.py → test/FIAT/unit/test_mtw.py
diff --git a/test/unit/test_orientation.py → test/FIAT/unit/test_orientation.py b/test/unit/test_orientation.py → test/FIAT/unit/test_orientation.py
diff --git a/test/unit/test_pointwise_dual.py → test/FIAT/unit/test_pointwise_dual.py b/test/unit/test_pointwise_dual.py → test/FIAT/unit/test_pointwise_dual.py
diff --git a/test/unit/test_polynomial.py → test/FIAT/unit/test_polynomial.py b/test/unit/test_polynomial.py → test/FIAT/unit/test_polynomial.py
diff --git a/test/unit/test_powell_sabin.py → test/FIAT/unit/test_powell_sabin.py b/test/unit/test_powell_sabin.py → test/FIAT/unit/test_powell_sabin.py
diff --git a/test/unit/test_quadrature.py → test/FIAT/unit/test_quadrature.py b/test/unit/test_quadrature.py → test/FIAT/unit/test_quadrature.py
diff --git a/test/unit/test_quadrature_element.py → test/FIAT/unit/test_quadrature_element.py b/test/unit/test_quadrature_element.py → test/FIAT/unit/test_quadrature_element.py
diff --git a/test/unit/test_reference_element.py → test/FIAT/unit/test_reference_element.py b/test/unit/test_reference_element.py → test/FIAT/unit/test_reference_element.py
diff --git a/test/unit/test_regge_hhj.py → test/FIAT/unit/test_regge_hhj.py b/test/unit/test_regge_hhj.py → test/FIAT/unit/test_regge_hhj.py
diff --git a/test/unit/test_serendipity.py → test/FIAT/unit/test_serendipity.py b/test/unit/test_serendipity.py → test/FIAT/unit/test_serendipity.py
diff --git a/test/unit/test_stokes_complex.py → test/FIAT/unit/test_stokes_complex.py b/test/unit/test_stokes_complex.py → test/FIAT/unit/test_stokes_complex.py
diff --git a/test/unit/test_tensor_product.py → test/FIAT/unit/test_tensor_product.py b/test/unit/test_tensor_product.py → test/FIAT/unit/test_tensor_product.py
diff --git a/test/README b/test/README