Merge pull request #157 from Ouranosinc/fix-CI

Fix CI
Ouranosinc · Feb 28, 2023 · 97eed6c · 97eed6c
2 parents 8ca6fd0 + c7ba770
commit 97eed6c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,17 +61,21 @@ jobs:
           extra-specs: |
             mamba
             python=${{ matrix.python-version }}
-            tox~="3.0"
-            tox-conda
+            pytest
+            pytest-cov
+            xdoctest
       - name: Conda and mamba versions
         run: |
           mamba --version
-      - name: Install tox-current-env
+      - name: Test with pytest
         run: |
-          pip install tox-current-env
-      - name: Test with tox
-        run: |
-          tox -e ${{ matrix.tox-build }} --current-env
-        env:
-          CONDA_EXE: mamba
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pytest --cov xscen
+#      - name: Install tox-current-env
+#        run: |
+#          pip install tox tox-conda tox-current-env
+#      - name: Test with tox
+#        run: |
+#          tox -vv -e ${{ matrix.tox-build }} --current-env
+#        env:
+#          CONDA_EXE: mamba
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # XSCEN-specific
 paths.yml
+docs/modules.rst
+docs/xscen*.rst
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -53,4 +53,4 @@ dependencies:
   - pip
   # Testing
   - tox <4.0 # 2022-12-12: tox v4.0 is incompatible with tox-conda plugin
-  - tox-conda
+  - tox-conda >=0.10.2