Skip to content

Commit

Permalink
Merge branch 'master' into patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
scottyhq authored Feb 3, 2025
2 parents dd9622b + 9301d5f commit 3c376ce
Show file tree
Hide file tree
Showing 17 changed files with 31,737 additions and 32,728 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CondaLock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
ref: ${{ github.event.client_payload.pull_request.head.ref }}

- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
cache-environment: true
environment-file: environment-condalock.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/WatchCondaForge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:

- name: Get Latest pangeo-notebook Metapackage Version
id: latest_version
uses: jacobtomlinson/[email protected].3
uses: jacobtomlinson/[email protected].4
with:
org: "conda-forge"
package: "pangeo-notebook"
version_system: "CalVer"

- name: Find and Replace pangeo-notebook
id: find_replace
uses: jacobtomlinson/[email protected].3
uses: jacobtomlinson/[email protected].5
with:
include: "base-notebook/environment.yml"
find: "pangeo-notebook=.*"
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Create Pull Request
if: steps.check_branch.outputs.exists == 'False' && steps.find_replace.outputs.modifiedFiles > 0
id: cpr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
committer: Pangeo Bot <[email protected]>
token: ${{ secrets.PANGEOBOT_TOKEN }}
Expand Down
473 changes: 237 additions & 236 deletions base-notebook/conda-linux-64.lock

Large diffs are not rendered by default.

Loading

0 comments on commit 3c376ce

Please sign in to comment.