From 494e288d17b0e02ba70a885798d1711ac34f38a3 Mon Sep 17 00:00:00 2001
From: Ryan Ly <rly@lbl.gov>
Date: Wed, 22 Feb 2023 14:52:02 -0800
Subject: [PATCH] Fix issue with importlib-metadata on conda py37 (#1645)

---
 .github/workflows/run_all_tests.yml | 20 ++++++++++++++------
 .github/workflows/run_tests.yml     | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml
index 332c89d16..e5c483b57 100644
--- 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
\ No newline at end of file
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index b99693591..d7b4e3e7c 100644
--- 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