Merge pull request #68 from jcapriot/build_updates

Build updates
simpeg · Oct 30, 2023 · 7cfdb78 · 7cfdb78
2 parents 2d0cbb6 + f8e47de
commit 7cfdb78
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 31 deletions.
diff --git a/.github/workflows/test_with_conda.yml b/.github/workflows/test_with_conda.yml
@@ -24,21 +24,30 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup Conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Setup environment
+      uses: mamba-org/setup-micromamba@v1
       with:
-        auto-update-conda: true
-        activate-environment: geoana-test
-        channels: conda-forge
-        python-version: ${{ matrix.python-version }}
-    - name: Install Env
-      run: |
-        conda info
-        conda list
-        conda config --show
-        conda install --quiet --yes pip numpy scipy "matplotlib>=3.5.0" ipython cython;
-        conda install --quiet --yes discretize libdlf setuptools_scm utm pytest pytest-cov graphviz
-        pip install -r requirements_dev.txt
+        environment-name: geoana-test
+        create-args: >-
+          python=${{ matrix.python-version }}
+          numpy>=1.20
+          scipy>=1.8
+          libdlf
+          cython
+          setuptools_scm
+          discretize
+          matplotlib
+          jupyter
+          utm
+          pytest
+          pytest-cov
+          sphinx
+          sphinx-gallery>=0.1.13
+          pydata-sphinx-theme=0.13.3
+          numpydoc>=1.5
+          graphviz
+          pillow
+        cache-environment: true
     - name: Install Our Package
       run: |
         export BUILD_GEOANA_EXT=1
@@ -49,8 +58,9 @@ jobs:
         pytest --cov-config=.coveragerc --cov=geoana --cov-report=xml -s -v -W ignore::DeprecationWarning
     - name: "Upload coverage to Codecov"
       if: ${{ matrix.python-version }} == '3.10'
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true
   distribute:
     name: Publish Source to Pypi
@@ -62,21 +72,30 @@ jobs:
         shell: bash -l {0}
     steps:
     - uses: actions/checkout@v2
-    - name: Setup Conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Setup environment
+      uses: mamba-org/setup-micromamba@v1
       with:
-        auto-update-conda: true
-        activate-environment: geoana-test
-        channels: conda-forge
-        python-version: '3.10'
-    - name: Install Env
-      run: |
-        conda info
-        conda list
-        conda config --show
-        conda install --quiet --yes pip numpy scipy "matplotlib>=3.5.0" ipython cython;
-        conda install --quiet --yes discretize libdlf setuptools_scm utm pytest pytest-cov graphviz
-        pip install -r requirements_dev.txt
+        environment-name: geoana-test
+        create-args: >-
+          python=3.10
+          numpy>=1.20
+          scipy>=1.8
+          libdlf
+          cython
+          setuptools_scm
+          discretize
+          matplotlib
+          jupyter
+          utm
+          pytest
+          pytest-cov
+          sphinx
+          sphinx-gallery>=0.1.13
+          pydata-sphinx-theme=0.13.3
+          numpydoc>=1.5
+          graphviz
+          pillow
+        cache-environment: true
     - name: Prepare source distribution
       run: |
         export BUILD_GEOANA_EXT=1

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,6 @@
     "sphinx.ext.inheritance_diagram",
     "sphinx.ext.graphviz",
     "matplotlib.sphinxext.plot_directive",
-    "sphinx_toolbox.collapse",
-    "nbsphinx",
     "sphinx_gallery.gen_gallery",
 ]