Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Running pip check in conda environments shouldn't fail #1531

Merged
merged 5 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
echo "current_version=${CURRENT_VERSION}"
- name: Bump Patch Version
run: |
pip install bump2version
python -m pip install bump2version
echo "running `bump2version patch`"
NEW_VERSION="$(grep -E '__version__' xclim/__init__.py | cut -d ' ' -f3)"
echo "new_version=${NEW_VERSION}"
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ jobs:
- name: Install pylint and tox
run: pip install pylint tox~=4.0
- name: Run pylint
run: pylint --rcfile=pylintrc --disable=import-error --exit-zero xclim
run: |
python -m pylint --rcfile=pylintrc --disable=import-error --exit-zero xclim
- name: Run linting suite
run: tox -e lint
run: |
python -m tox -e lint

test-py39:
name: test-${{ matrix.tox-env }} (Python${{ matrix.python-version }})
Expand All @@ -71,10 +73,10 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install tox
run: |
pip install tox~=4.0
python -m pip install tox~=4.0
- name: Test with tox
run: |
tox -e ${{ matrix.tox-env }}
python -m tox -e ${{ matrix.tox-env }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: run-{{ matrix.tox-env }}
Expand Down Expand Up @@ -120,10 +122,10 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install tox
run: |
pip install tox~=4.0
python -m pip install tox~=4.0
- name: Test with tox
run: |
tox -e ${{ matrix.tox-env }} -- ${{ matrix.markers }}
python -m tox -e ${{ matrix.tox-env }} -- ${{ matrix.markers }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: run-{{ matrix.tox-env }}
Expand Down Expand Up @@ -168,10 +170,10 @@ jobs:
run: |
conda list
xclim show_version_info
pip check
python -m pip check || true
- name: Test with pytest
run: |
pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=term-missing
python -m pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=term-missing
# - name: Install tox
# shell: bash -l {0}
# run: |
Expand Down Expand Up @@ -203,8 +205,8 @@ jobs:
steps:
- name: Coveralls Finished
run: |
pip install --upgrade coveralls
coveralls --finish
python -m pip install --upgrade coveralls
python -m coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
6 changes: 4 additions & 2 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ jobs:
with:
python-version: "3.x"
- name: Install packaging libraries
run: pip install flit
run: |
python -m pip install flit
- name: Build a binary wheel and a source tarball
run: flit build
run: |
python -m flit build
- name: Publish distribution 📦 to PyPI
uses: pypa/[email protected]
6 changes: 4 additions & 2 deletions .github/workflows/tag-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ jobs:
with:
python-version: "3.x"
- name: Install packaging libraries
run: pip install flit
run: |
python -m pip install flit
- name: Build a binary wheel and a source tarball
run: flit build
run: |
python -m flit build
- name: Publish distribution 📦 to Test PyPI
uses: pypa/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ jobs:
- name: Check versions
run: |
conda list
xclim show_version_info
pip check
python -m xclim show_version_info
python -m pip check
- name: Run Tests
if: success()
id: status
run: |
pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=term-missing --report-log output-${{ matrix.python-version }}-log.jsonl
python -m pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=term-missing --report-log output-${{ matrix.python-version }}-log.jsonl
- name: Generate and publish the report
if: |
failure()
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Bug fixes
Internal changes
^^^^^^^^^^^^^^^^
* Pinned `cf-xarray` below v0.8.5 in Python3.8 installation to further extend legacy support. (:pull:`1519`).
* `pip check` in conda builds in GitHub workflows have been temporarily set to always pass. (:pull:`1531`).

v0.46.0 (2023-10-24)
--------------------
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ This package was created with Cookiecutter_ and the `audreyfeldroy/cookiecutter-
:target: https://gitter.im/Ouranosinc/xclim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
:alt: Gitter Chat

.. |build| image:: https://github.com/Ouranosinc/xclim/workflows/xclim/badge.svg
:target: https://github.com/Ouranosinc/xclim/actions
.. |build| image:: https://github.com/Ouranosinc/xclim/actions/workflows/main.yml/badge.svg
:target: https://github.com/Ouranosinc/xclim/actions/workflows/main.yml
:alt: Build Status

.. |coveralls| image:: https://coveralls.io/repos/github/Ouranosinc/xclim/badge.svg
Expand Down