Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
manics committed Nov 9, 2024
2 parents ba490a7 + 58bb7db commit bca0313
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install helm diff plugin, update local chart dependencies
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- uses: actions/setup-node@v4
# node required to build wheel
with:
node-version: "16"
node-version: "22"

- name: Set up QEMU (for docker buildx)
uses: docker/setup-qemu-action@v3
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Setup helm
uses: azure/setup-helm@v4
with:
version: "v3.5.4"
version: "v3.16.2"

- name: Install chart publishing dependencies (chartpress, etc)
run: |
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Install pypa/build
run: python -mpip install build
- name: Build a sdist, and a binary wheel from the sdist
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- uses: actions/setup-node@v4
# node required to build wheel
with:
node-version: "16"
node-version: "22"

- name: Install chartpress
run: pip install chartpress build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
- uses: actions/setup-node@v4
id: setup-node
with:
node-version: "18"
node-version: "22"

- name: Cache npm
uses: actions/cache@v4
Expand All @@ -155,7 +155,7 @@ jobs:
- uses: actions/setup-python@v5
id: setup-python
with:
python-version: "3.11"
python-version: "3.12"

- name: Cache pip
uses: actions/cache@v4
Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:
- uses: actions/setup-node@v4
id: setup-node
with:
node-version: "18"
node-version: "22"

- name: Cache npm
uses: actions/cache@v4
Expand All @@ -408,7 +408,7 @@ jobs:
- uses: actions/setup-python@v5
id: setup-python
with:
python-version: "3.11"
python-version: "3.12"

- name: Cache pip
uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/watch-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
# ref: https://github.com/peter-evans/create-pull-request
- name: Create a PR
if: github.event_name != 'pull_request'
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: "${{ secrets.jupyterhub_bot_pat }}"
author: JupterHub Bot Account <[email protected]>
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
# ref: https://github.com/peter-evans/create-pull-request
- name: Create a PR
if: github.event_name != 'pull_request'
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: "${{ secrets.jupyterhub_bot_pat }}"
author: JupyterHub Bot Account <[email protected]>
Expand Down
20 changes: 10 additions & 10 deletions binderhub/tests/test_repoproviders.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,18 +221,18 @@ async def test_dataverse(
"ckan-sample-dataset-1",
],
[
"https://demo.datashades.com/dataset/chart-test?activity_id=061888e9-e3c2-4769-b097-9c195a841e2f",
"https://demo.datashades.com/dataset/chart-test?activity_id=061888e9-e3c2-4769-b097-9c195a841e2f",
"chart-test.v1717501747",
"https://demo.datashades.com/dataset/chart-test?activity_id=061888e9-e3c2-4769-b097-9c195a841e2f",
"ckan-chart-test",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/?activity_id=93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/?activity_id=93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"binder-example-sea-turtle-sightings-in-taiwan.v1712023831",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/?activity_id=93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"ckan-binder-example-sea-turtle-sightings-in-taiwan",
],
[
"https://demo.datashades.com/dataset/chart-test/history/061888e9-e3c2-4769-b097-9c195a841e2f",
"https://demo.datashades.com/dataset/chart-test/history/061888e9-e3c2-4769-b097-9c195a841e2f",
"chart-test.v1717501747",
"https://demo.datashades.com/dataset/chart-test/history/061888e9-e3c2-4769-b097-9c195a841e2f",
"ckan-chart-test",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/history/93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/history/93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"binder-example-sea-turtle-sightings-in-taiwan.v1712023831",
"https://data.depositar.io/dataset/binder-example-sea-turtle-sightings-in-taiwan/history/93df7fd0-0edc-4ebf-bac7-fbf5f78de90b",
"ckan-binder-example-sea-turtle-sightings-in-taiwan",
],
["https://demo.ckan.org/group/roger", None, None, None, None],
["https://demo.ckan.org/dataset/nosuchdataset", None, None, None, None],
Expand Down

0 comments on commit bca0313

Please sign in to comment.