Merge branch 'main' into pre-commit-ci-update-config

Ouranosinc · Nov 16, 2023 · b6c9e64 · b6c9e64
2 parents 76d4f6f + fbe82d7
commit b6c9e64
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -48,9 +48,9 @@ jobs:
         run: echo "current_version=$(grep -E '__version__'  xscen/__init__.py | cut -d ' ' -f3)"
       - name: Bump Patch Version
         run: |
-          pip install bump2version
+          python -m pip install bump2version
           echo "Bumping version"
-          bump2version patch
+          python -m bump2version patch
           echo "new_version=$(grep -E '__version__'  xscen/__init__.py | cut -d ' ' -f3)"
       - name: Push Changes
         uses: ad-m/github-push-action@master

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,13 +29,13 @@ jobs:
           python-version: "3.9"
       - name: Install tox
         run: |
-          pip install tox
+          python -m pip install tox
       - name: Run linting suite
         run: |
-          tox -e black
+          python -m tox -e black
 
-  testing-pypi:
-    name: Test with Python${{ matrix.python-version }} (PyPI)
+  testing-tox:
+    name: Test with Python${{ matrix.python-version }} (PyPI/tox)
     needs: black
     runs-on: ubuntu-latest
     env:
@@ -68,7 +68,7 @@ jobs:
             tox
       - name: Test with tox
         run: |
-          tox -e ${{ matrix.tox-build }}
+          python -m tox -e ${{ matrix.tox-build }}
         env:
           ESMF_VERSION: ${{ env.esmf-version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -127,17 +127,17 @@ jobs:
       - name: Compile catalogs and install xscen
         run: |
           make translate
-          pip install --no-deps --editable .
+          python -m pip install --no-deps --editable .
       - name: Check versions
         run: |
           conda list
-          pip check
+          python -m pip check || true
       - name: Test with pytest
         run: |
-          pytest tests
+          python -m pytest tests
       - name: Report coverage
         run: |
-          coveralls
+          python -m coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_FLAG_NAME: run-Python${{ matrix.python-version }}-conda
@@ -146,7 +146,7 @@ jobs:
 
   finish:
     needs:
-      - testing-pypi
+      - testing-tox
       - testing-conda
     runs-on: ubuntu-latest
     container: python:3-slim

diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -17,7 +17,7 @@ jobs:
           python-version: "3.x"
       - name: Install packaging libraries
         run: |
-          pip install build wheel
+          python -m pip install build wheel
       - name: Build a binary wheel and a source tarball
         run: |
           python -m build --sdist --wheel

diff --git a/.github/workflows/tag-testpypi.yml b/.github/workflows/tag-testpypi.yml
@@ -17,7 +17,7 @@ jobs:
           python-version: "3.x"
       - name: Install packaging libraries
         run: |
-          pip install build wheel
+          python -m pip install build wheel
       - name: Build a binary wheel and a source tarball
         run: |
           python -m build --sdist --wheel

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -53,6 +53,7 @@ Internal changes
     * `Manifest.in` is much more specific about what is installed.
     * Re-adds a dev recipe to the `setup.py`.
 * Multiple improvements to the docstrings and type annotations. (:pull:`282`).
+* `pip check` in conda builds in GitHub workflows have been temporarily set to always pass. (:pull:`288`).
 
 v0.7.1 (2023-08-23)
 -------------------