Merge branch 'master' into python-3.6-to-3.10

Author: rocky

.circleci/config.yml

@@ -42,7 +42,8 @@ jobs:
 
       - run:
           command: | # Use pip to install dependengcies
-            pip install --user --upgrade setuptools
+            # pip install --user --upgrade setuptools
+            pip install --user -e git+https://github.com/rocky/python-xdis.git#egg=xdis
             pip install --user -e .
             # Not sure why "pip install -e" doesn't work above
             # pip install click spark-parser xdis

.github/workflows/osx.yml

@@ -21,7 +21,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         pip install -e .
         # Not sure why "pip install -e" doesn't work above
         # pip install click spark-parser xdis

.github/workflows/ubuntu.yml

@@ -20,7 +20,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         pip install -e .
         # pip install click spark-parser xdis
         pip install -r requirements-dev.txt

.github/workflows/windows.yml

@@ -21,7 +21,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
         pip install -e .
         # Not sure why "pip install -e" doesn't work above
         # pip install click spark-parser xdis