Skip to content

Commit ef14b43

Browse files
committed
Revert "Updating github actions (#84)"
This reverts commit 1727595.
1 parent 1727595 commit ef14b43

26 files changed

+328
-677
lines changed

.copier-answers.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
jlpm
3131
jlpm run lint:check
3232
33-
# - name: Test the extension
34-
# run: |
35-
# set -eux
36-
# jlpm run test
33+
- name: Test the extension
34+
run: |
35+
set -eux
36+
jlpm run test
3737
3838
- name: Build the extension
3939
run: |

.github/workflows/publish-release.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,33 @@ on:
1515
jobs:
1616
publish_release:
1717
runs-on: ubuntu-latest
18-
environment: release
1918
permissions:
19+
# This is useful if you want to use PyPI trusted publisher
20+
# and NPM provenance
2021
id-token: write
2122
steps:
2223
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
2324

24-
- uses: actions/create-github-app-token@v1
25-
id: app-token
26-
with:
27-
app-id: ${{ vars.APP_ID }}
28-
private-key: ${{ secrets.APP_PRIVATE_KEY }}
29-
3025
- name: Populate Release
3126
id: populate-release
3227
uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
3328
with:
34-
token: ${{ steps.app-token.outputs.token }}
29+
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
3530
branch: ${{ github.event.inputs.branch }}
3631
release_url: ${{ github.event.inputs.release_url }}
3732
steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
3833

3934
- name: Finalize Release
4035
id: finalize-release
4136
env:
37+
# The following are needed if you use legacy PyPI set up
38+
# PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
39+
# PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
40+
# TWINE_USERNAME: __token__
4241
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4342
uses: jupyter-server/jupyter_releaser/.github/actions/finalize-release@v2
4443
with:
45-
token: ${{ steps.app-token.outputs.token }}
44+
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
4645
release_url: ${{ steps.populate-release.outputs.release_url }}
4746

4847
- name: "** Next Step **"

.github/workflows/update-integration-tests.yml

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ permissions:
1010

1111
jobs:
1212
update-snapshots:
13-
if: >
14-
(
15-
github.event.issue.author_association == 'OWNER' ||
16-
github.event.issue.author_association == 'COLLABORATOR' ||
17-
github.event.issue.author_association == 'MEMBER'
18-
) && github.event.issue.pull_request && contains(github.event.comment.body, 'please update snapshots')
13+
if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'please update snapshots') }}
1914
runs-on: ubuntu-latest
2015

2116
steps:
@@ -30,40 +25,10 @@ jobs:
3025
with:
3126
token: ${{ secrets.GITHUB_TOKEN }}
3227

33-
- name: Get PR Info
34-
id: pr
35-
env:
36-
PR_NUMBER: ${{ github.event.issue.number }}
37-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
GH_REPO: ${{ github.repository }}
39-
COMMENT_AT: ${{ github.event.comment.created_at }}
40-
run: |
41-
pr="$(gh api /repos/${GH_REPO}/pulls/${PR_NUMBER})"
42-
head_sha="$(echo "$pr" | jq -r .head.sha)"
43-
pushed_at="$(echo "$pr" | jq -r .pushed_at)"
44-
45-
if [[ $(date -d "$pushed_at" +%s) -gt $(date -d "$COMMENT_AT" +%s) ]]; then
46-
echo "Updating is not allowed because the PR was pushed to (at $pushed_at) after the triggering comment was issued (at $COMMENT_AT)"
47-
exit 1
48-
fi
49-
50-
echo "head_sha=$head_sha" >> $GITHUB_OUTPUT
51-
5228
- name: Checkout the branch from the PR that triggered the job
53-
env:
54-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5529
run: gh pr checkout ${{ github.event.issue.number }}
56-
57-
- name: Validate the fetched branch HEAD revision
5830
env:
59-
EXPECTED_SHA: ${{ steps.pr.outputs.head_sha }}
60-
run: |
61-
actual_sha="$(git rev-parse HEAD)"
62-
63-
if [[ "$actual_sha" != "$EXPECTED_SHA" ]]; then
64-
echo "The HEAD of the checked out branch ($actual_sha) differs from the HEAD commit available at the time when trigger comment was submitted ($EXPECTED_SHA)"
65-
exit 1
66-
fi
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6732

6833
- name: Base Setup
6934
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
@@ -83,4 +48,3 @@ jobs:
8348
# Playwright knows how to start JupyterLab server
8449
start_server_script: 'null'
8550
test_folder: ui-tests
86-
npm_client: jlpm

CHANGELOG.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# Slurm JupyterLab Extension
22

3-
A JupyterLab extension that interfaces with the Slurm Workload Manager,
3+
A JupyterLab extension that interfaces with the Slurm Workload Manager,
44
providing simple and intuitive controls for viewing and managing jobs on the queue.
55

66
![Slurm Extension](./docs/images/slurm.png)
77

88
## Prerequisites
99

10-
- JupyterLab >= 4.0.0
11-
- Slurm
10+
* JupyterLab >= 3.0
11+
* Node.js 14+
12+
* Slurm
13+
1214

1315
## Installation
1416

@@ -26,12 +28,13 @@ jupyter serverextension enable --py --sys-prefix jupyterlab_slurm
2628
```
2729

2830
After launching JupyterLab, the extension can be found in the command palette under
29-
the name `Slurm Queue Manager`, and is listed under the `HPC TOOLS` section
31+
the name ```Slurm Queue Manager```, and is listed under the ```HPC TOOLS``` section
3032
of the palette and the launcher.
3133

34+
3235
### Development install
3336

34-
As described in the [JupyterLab documentation](https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html#extension-authoring) for a development install of the labextension you can run the following in this directory:
37+
As described in the [JupyterLab documentation](https://jupyterlab.readthedocs.io/en/stable/developer/extension_dev.html#extension-authoring) for a development install of the labextension you can run the following in this directory:
3538

3639
### Setup a local slurm cluster
3740

@@ -74,11 +77,10 @@ jlpm run build
7477
```
7578

7679
### Restart the jupyterlab docker container
77-
7880
```bash
7981
docker compose restart jupyterlab
8082

8183
# rerun munged on the jupyterlab instance
8284
docker compose exec jupyterlab bash
8385
runuser -u slurm -- munged
84-
```
86+
```

conftest.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

jupyter-config/jupyter_notebook_config.d/jupyterlab_slurm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"jupyterlab_slurm": true
55
}
66
}
7-
}
7+
}

jupyterlab_slurm/tests/__init__.py

Whitespace-only changes.

jupyterlab_slurm/tests/test_handlers.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)