Merge branch 'dev' into add_stacklevel_to_missing_timezone

NeurodataWithoutBorders · Feb 22, 2023 · c90ac00 · c90ac00
2 parents 6e5e84f + 494e288
commit c90ac00
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml
@@ -163,16 +163,20 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
-          auto-activate-base: true
-          activate-environment: true
           python-version: ${{ matrix.python-ver }}
 
       - name: Install build dependencies
         run: |
           conda config --set always_yes yes --set changeps1 no
           conda info
-          conda install -c conda-forge tox
-          conda list
+          # the conda dependency resolution for tox under python 3.7 can install the wrong importlib_metadata
+          conda install -c conda-forge tox "importlib_metadata>4"
+
+      - name: Conda reporting
+        run: |
+          conda info
+          conda config --show-sources
+          conda list --show-channel-urls
 
       - name: Run tox tests
         run: |
@@ -272,10 +276,14 @@ jobs:
         run: |
           pip install matplotlib
           pip install -e .
-          conda info
-          conda list
           pip list
 
+      - name: Conda reporting
+        run: |
+          conda info
+          conda config --show-sources
+          conda list --show-channel-urls
+
       - name: Run gallery ros3 tests
         run: |
           python test.py --example-ros3
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -138,16 +138,20 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
-          auto-activate-base: true
-          activate-environment: true
           python-version: ${{ matrix.python-ver }}
 
       - name: Install build dependencies
         run: |
           conda config --set always_yes yes --set changeps1 no
           conda info
-          conda install -c conda-forge tox
-          conda list
+          # the conda dependency resolution for tox under python 3.7 can install the wrong importlib_metadata
+          conda install -c conda-forge tox "importlib_metadata>4"
+
+      - name: Conda reporting
+        run: |
+          conda info
+          conda config --show-sources
+          conda list --show-channel-urls
 
       - name: Run tox tests
         run: |
@@ -242,10 +246,14 @@ jobs:
         run: |
           pip install matplotlib
           pip install -e .
-          conda info
-          conda list
           pip list
 
+      - name: Conda reporting
+        run: |
+          conda info
+          conda config --show-sources
+          conda list --show-channel-urls
+
       - name: Run gallery ros3 tests
         run: |
           python test.py --example-ros3