Skip to content

Commit

Permalink
Merge branch 'master' into ipcc-robustness
Browse files Browse the repository at this point in the history
  • Loading branch information
aulemahal committed Nov 6, 2023
2 parents 1ab658c + 3406661 commit 930c272
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions-versions-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
token: ${{ secrets.WORKFLOW_TOKEN }}
persist-credentials: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
name: Bumpversion Patch
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
python-version: "3.x"
- name: Config Commit Bot
Expand All @@ -50,7 +50,7 @@ jobs:
NEW_VERSION="$(grep -E '__version__' xclim/__init__.py | cut -d ' ' -f3)"
echo "new_version=${NEW_VERSION}"
- name: Push Changes
uses: ad-m/github-push-action@v0.6.0
uses: ad-m/github-push-action@v0.8.0
with:
force: false
github_token: ${{ secrets.BUMPVERSION_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cache-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 'python'
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@codeql-bundle-20230524
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: 'Dependency Review'
uses: actions/[email protected]
4 changes: 2 additions & 2 deletions .github/workflows/label_on_approval.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
(steps.fc.outputs.comment-id == '') &&
(!contains(github.event.pull_request.labels.*.name, 'approved')) &&
(github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name)
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand All @@ -64,7 +64,7 @@ jobs:
- name: Update comment
if: |
contains(github.event.pull_request.labels.*.name, 'approved')
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
python-version:
- "3.8"
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Set up Python${{ matrix.python-version }}
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
- name: Install pylint and tox
Expand All @@ -64,9 +64,9 @@ jobs:
- tox-env: "py39-coverage"
python-version: "3.9"
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Set up Python${{ matrix.python-version }}
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
- name: Install tox
Expand Down Expand Up @@ -108,14 +108,14 @@ jobs:
python-version: "3.11"
markers: -m 'not slow and not requires_internet'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Install Eigen3
if: contains(matrix.tox-env, 'sbck')
run: |
sudo apt-get update
sudo apt-get install libeigen3-dev
- name: Set up Python${{ matrix.python-version }}
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
- name: Install tox
Expand Down Expand Up @@ -147,9 +147,9 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
uses: mamba-org/setup-micromamba@v1.4.4
uses: mamba-org/setup-micromamba@v1.6.0
with:
cache-downloads: true
cache-environment: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-mastodon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:

- name: Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Current Version
if: ${{ !github.event.inputs.version-tag }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
id-token: write
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Set up Python3
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: "3.x"
- name: Install packaging libraries
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
id-token: write
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Set up Python3
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: "3.x"
- name: Install packaging libraries
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testdata_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Check Latest xclim-testdata Tag
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Find xclim-testdata Tag and CI Testing Branch
run: |
XCLIM_TESTDATA_TAG="$( \
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
core.setFailed('Configured `xclim-testdata` tag is not `latest`.')
- name: Update Failure Comment
if: ${{ failure() }}
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand All @@ -60,7 +60,7 @@ jobs:
edit-mode: replace
- name: Update Success Comment
if: ${{ success() }}
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
uses: mamba-org/setup-micromamba@v1.4.4
uses: mamba-org/setup-micromamba@v1.6.0
with:
cache-downloads: true
cache-environment: true
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ default_language_version:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.14.0
rev: v3.15.0
hooks:
- id: pyupgrade
args: ['--py38-plus']
exclude: 'xclim/core/indicator.py'
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
exclude: setup.cfg
Expand All @@ -33,7 +33,7 @@ repos:
- id: yamllint
args: ['--config-file=.yamllint.yaml']
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.10.1
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
Expand All @@ -42,7 +42,7 @@ repos:
- id: isort
args: ['--settings-file=pyproject.toml']
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.0
rev: v0.1.4
hooks:
- id: ruff
- repo: https://github.com/pycqa/flake8
Expand All @@ -66,13 +66,13 @@ repos:
files: '.ipynb'
args: [ "--extra-keys", "metadata.kernelspec" ]
- repo: https://github.com/keewis/blackdoc
rev: v0.3.8
rev: v0.3.9
hooks:
- id: blackdoc
exclude: '(xclim/indices/__init__.py|docs/installation.rst)'
additional_dependencies: ['black==23.9.1']
additional_dependencies: ['black==23.10.1']
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.27.0
rev: 0.27.1
hooks:
- id: check-github-workflows
- id: check-readthedocs
Expand Down

0 comments on commit 930c272

Please sign in to comment.