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

add session_id to payload to enable polling kernels #1

Open
wants to merge 87 commits into
base: v2.5.0-ocean
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
e1720c8
Update branch references and links (#791)
blink1073 Apr 20, 2022
bb677f5
Backport PR #793 on branch 1.x ([pre-commit.ci] pre-commit autoupdate…
meeseeksmachine Apr 20, 2022
ffa9848
Backport PR #798 on branch 1.x (missing required arguments in utils.f…
meeseeksmachine Apr 25, 2022
1f5f64b
Backport PR #804 on branch 1.x (Add the root_dir value to the logging…
meeseeksmachine Apr 26, 2022
2b29609
Backport PR #797 on branch 1.x (Add helper jobs for branch protection…
meeseeksmachine Apr 26, 2022
133d83d
Automated Changelog Entry for 1.17.0 on 1.x (#810)
blink1073 Apr 27, 2022
1441b5f
Publish 1.17.0
github-actions[bot] Apr 27, 2022
514760a
Bump to 1.18.0.dev0
github-actions[bot] Apr 27, 2022
6791cf9
(backport) ensure authorizer is defined (#815)
minrk Apr 28, 2022
2e31f90
Backport PR #792 on branch 1.x (Centralize app cleanup) (#819)
blink1073 Apr 29, 2022
999b056
Backport PR #826 on branch 1.x (Defer preferred_dir validation until …
meeseeksmachine May 3, 2022
25b8011
Backport PR #779 on branch 1.x (Add mypy check) (#831)
blink1073 May 3, 2022
0658988
Backport PR #834: Enable GatewayClient managers to be configurable (#…
meeseeksmachine May 6, 2022
15c9635
Backport PR #836: Call "/api/shutdown" instead of "/" (#837)
meeseeksmachine May 7, 2022
8de001a
fix docs version (#841)
blink1073 May 9, 2022
3485007
Merge pull request from GHSA-q874-g24w-4q9g
rashley-iqt Jun 7, 2022
e741350
Bump to 1.17.1
Zsailer Jun 7, 2022
d0a7fda
Bump to 1.18.0.dev0
Zsailer Jun 7, 2022
fa8e1c3
Backport PR #865 on branch 1.x (Fix sphinx 5.0 support) (#872)
meeseeksmachine Jun 15, 2022
e796836
Add changelog entry for 1.17.1 (#871)
blink1073 Jun 15, 2022
7bbc200
Backport PR #867 on branch 1.x (Fix lint) (#873)
meeseeksmachine Jun 15, 2022
1aa1250
Backport PR #874 on branch 1.x (Fix gateway kernel shutdown) (#875)
meeseeksmachine Jun 15, 2022
6a6e703
Backport PR #878 on branch 1.x (Show import error when faiing to load…
meeseeksmachine Jun 16, 2022
c451de3
Backport PR #886 on branch 1.x (Normalize os_path) (#888)
meeseeksmachine Jun 22, 2022
a625db9
Backport PR #882 on branch 1.x (suppress tornado deprecation warnings…
meeseeksmachine Jun 22, 2022
c867b2b
Automated Changelog Entry for 1.18.0 on 1.x (#890)
blink1073 Jun 23, 2022
6d0803b
Publish 1.18.0
github-actions[bot] Jun 23, 2022
5cf2b40
Bump to 1.19.0.dev0
github-actions[bot] Jun 23, 2022
c3032a0
Backport PR #892 on branch 1.x (Make ChannelQueue.get_msg true async)…
meeseeksmachine Jun 27, 2022
65d779a
Backport PR #896 on branch 1.x (Notify ChannelQueue that the response…
blink1073 Jun 29, 2022
f214016
Automated Changelog Entry for 1.18.1 on 1.x (#904)
blink1073 Jul 5, 2022
6404ce4
Publish 1.18.1
github-actions[bot] Jul 5, 2022
3d7323c
Bump to 1.19.0.dev0
github-actions[bot] Jul 5, 2022
add31bb
Backport PR #908 on branch 1.x (Fix owasp link) (#909)
meeseeksmachine Jul 5, 2022
04b197d
Backport PR #910 on branch 1.x (Add back support for kernel launch ti…
meeseeksmachine Jul 7, 2022
98db236
Backport PR #913 on branch 1.x (Fix handling of dev version) (#914)
meeseeksmachine Jul 11, 2022
c9897b5
Backport PR #917 on branch 1.x (Fix c.GatewayClient.url snippet synta…
meeseeksmachine Jul 12, 2022
4b3a390
Backport Inject session identifier into environment variable. #679 (…
vidartf Jul 13, 2022
7f72f1c
Backport PR #922: Improve logging of bare exceptions etc. (#926)
thetorpedodog Jul 14, 2022
569d305
Backport PR #935: avoid creating asyncio.Lock at import time (#936)
meeseeksmachine Jul 29, 2022
df59cfe
Backport PR #944 on branch 1.x (Retry certain errors between server a…
meeseeksmachine Aug 15, 2022
507c697
Backport PR #965: Correct content-type headers (#966)
epignot Sep 7, 2022
f8e122b
Backport #981: Make it easier to pass custom env variables to kernel …
divyansshhh Sep 26, 2022
27bc44c
Test with client 8 updates (#992)
blink1073 Sep 26, 2022
34c5f79
Automated Changelog Entry for 1.19.0 on 1.x (#996)
blink1073 Sep 26, 2022
c65706f
Publish 1.19.0
github-actions[bot] Sep 26, 2022
e61ba81
Bump to 1.20.0.dev0
github-actions[bot] Sep 26, 2022
690d2f4
Wrap the concurrent futures in an asyncio future (#1000)
blink1073 Sep 27, 2022
850e30d
Automated Changelog Entry for 1.19.1 on 1.x (#1002)
blink1073 Sep 27, 2022
6bbdc6c
Publish 1.19.1
github-actions[bot] Sep 27, 2022
596667c
Bump to 1.20.0.dev0
github-actions[bot] Sep 27, 2022
7d8c2d3
Backport PR #1004 on branch 1.x (Pin docutils to fix docs build) (#1005)
meeseeksmachine Sep 28, 2022
2f529bf
Backport PR #1014 on branch 1.x (Handle client 8 pending kernels) (#1…
meeseeksmachine Oct 11, 2022
9a55096
Publish 1.21.0
blink1073 Oct 11, 2022
d1c0457
Bump to 1.22.0.dev0
blink1073 Oct 11, 2022
da7071a
Backport-1046: Pass kernel environment to `cwd_for_path` method (#104…
divyansshhh Nov 7, 2022
1695394
[1.x] Switch to releaser v2 and update workflows (#1052)
blink1073 Nov 7, 2022
37bf658
Publish 1.23.0
blink1073 Nov 7, 2022
bfe36c6
Bump to 1.24.0.dev0
blink1073 Nov 7, 2022
0d8a179
Handle jupyter core warning (#1062)
blink1073 Nov 9, 2022
5a2851e
Publish 1.23.1
blink1073 Nov 9, 2022
5353767
Bump to 1.24.0.dev0
blink1073 Nov 9, 2022
1eed592
Fix config merge test for Jupyter Core 5.0 (#1068)
blink1073 Nov 12, 2022
92c856e
Publish 1.23.2
blink1073 Nov 14, 2022
74888bc
Bump to 1.24.0.dev0
blink1073 Nov 14, 2022
4b19bf0
Backport PR #1073 on branch 1.x (Fix rename_file and delete_file to h…
meeseeksmachine Nov 18, 2022
5eef77f
Publish 1.23.3
blink1073 Nov 21, 2022
66ac73e
Bump to 1.24.0.dev0
blink1073 Nov 21, 2022
28c9e29
Backport PR #1095 on branch 1.x (Defer webbrowser import) (#1097)
meeseeksmachine Nov 25, 2022
8de93c8
Backport PR #1139 on branch 1.x (Raise errors on individual problemat…
meeseeksmachine Dec 20, 2022
0a02e42
Backport PR #1124 on branch 1.x (Include base_url at start of kernels…
meeseeksmachine Dec 20, 2022
fd92c4f
Publish 1.23.4
blink1073 Dec 20, 2022
36e2100
Bump to 1.24.0.dev0
blink1073 Dec 20, 2022
2ca8008
Backport PR #1162: Reapply preferred_dir fix, now with better backwar…
vidartf Jan 6, 2023
a4f6104
Publish 1.23.5
blink1073 Jan 12, 2023
05758da
Bump to 1.24.0.dev0
blink1073 Jan 12, 2023
8ab076e
Backport PR #1193: Fix get_loader returning None when load_jupyter_se…
cmd-ntrf Feb 3, 2023
ef9663e
Backport PR #1200 on branch 1.x (Update jupyterhub security link) (#1…
meeseeksmachine Feb 3, 2023
75bbefa
Backport PR #1212: Redact tokens, etc. in url parameters from request…
blink1073 Feb 15, 2023
c2858b9
Publish 1.23.6
blink1073 Feb 15, 2023
a777102
Bump to 1.24.0.dev0
blink1073 Feb 15, 2023
513df71
Backport PR #1233 on branch 1.x (Added error propagation to gateway_r…
meeseeksmachine Mar 8, 2023
d7d8787
Publish 1.24.0
blink1073 Apr 13, 2023
72dadef
datamechanics changes on the notebooks repo copied to jupyter_server
sigmarkarl Apr 24, 2023
5c449e8
add session_id to payload to enable polling kernels
sigmarkarl Oct 27, 2023
fd7e7c2
remove polling dict bool
sigmarkarl Oct 27, 2023
7509acf
add release to pypi
sigmarkarl Oct 30, 2023
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
13 changes: 3 additions & 10 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
name: Check Release
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
branches: ["*"]

jobs:
check_release:
runs-on: ubuntu-latest
strategy:
matrix:
group: [check_release, link_check]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -20,10 +16,7 @@ jobs:
run: |
pip install -e .
- name: Check Release
if: ${{ matrix.group == 'check_release' }}
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
with:
version_spec: 100.100.100
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run Link Check
if: ${{ matrix.group == 'link_check' }}
uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1
15 changes: 13 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Jupyter Server Integration Tests [Linux]
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
branches: ["*"]

jobs:
build:
runs-on: ${{ matrix.os }}
Expand All @@ -28,3 +28,14 @@ jobs:
- name: Run the tests
run: |
pytest -vv --integration_tests=true tests

integration_check: # This job does nothing and is only used for the branch protection
if: always()
needs:
- build
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
43 changes: 43 additions & 0 deletions .github/workflows/prep-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "Step 1: Prep Release"
on:
workflow_dispatch:
inputs:
version_spec:
description: "New Version Specifier"
default: "next"
required: false
branch:
description: "The branch to target"
required: false
default: "1.x"
post_version_spec:
description: "Post Version Specifier"
required: false
since:
description: "Use PRs with activity since this date or git reference"
required: false
since_last_stable:
description: "Use PRs with activity since the last stable git tag"
required: false
type: boolean
jobs:
prep_release:
runs-on: ubuntu-latest
steps:
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Prep Release
id: prep-release
uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
version_spec: ${{ github.event.inputs.version_spec }}
post_version_spec: ${{ github.event.inputs.post_version_spec }}
target: ${{ github.event.inputs.target }}
branch: ${{ github.event.inputs.branch }}
since: ${{ github.event.inputs.since }}
since_last_stable: ${{ github.event.inputs.since_last_stable }}

- name: "** Next Step **"
run: |
echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"
55 changes: 55 additions & 0 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: "Step 2: Publish Release"
on:
workflow_dispatch:
inputs:
branch:
description: "The target branch"
required: false
default: "1.x"
release_url:
description: "The URL of the draft GitHub release"
required: false
steps_to_skip:
description: "Comma separated list of steps to skip"
required: false

jobs:
publish_release:
runs-on: ubuntu-latest
steps:
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Populate Release
id: populate-release
uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
target: ${{ github.event.inputs.target }}
branch: ${{ github.event.inputs.branch }}
release_url: ${{ github.event.inputs.release_url }}
steps_to_skip: ${{ github.event.inputs.steps_to_skip }}

- name: Finalize Release
id: finalize-release
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
TWINE_USERNAME: __token__
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
uses: jupyter-server/jupyter-releaser/.github/actions/finalize-release@v2
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
target: ${{ github.event.inputs.target }}
release_url: ${{ steps.populate-release.outputs.release_url }}

- name: "** Next Step **"
if: ${{ success() }}
run: |
echo "Verify the final release"
echo ${{ steps.finalize-release.outputs.release_url }}

- name: "** Failure Message **"
if: ${{ failure() }}
run: |
echo "Failed to Publish the Draft Release Url:"
echo ${{ steps.populate-release.outputs.release_url }}
53 changes: 35 additions & 18 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Jupyter Server Tests
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
schedule:
- cron: "0 8 * * *"
Expand All @@ -14,14 +14,16 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.7", "3.10"]
python-version: ["3.7", "3.11"]
include:
- os: windows-latest
python-version: "3.9"
- os: ubuntu-latest
python-version: "pypy-3.7"
python-version: "pypy-3.8"
- os: macos-latest
python-version: "3.8"
- os: ubuntu-latest
python-version: "3.11"
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -48,20 +50,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
with:
extra_args: --all-files --hook-stage=manual
- name: Help message if pre-commit fail
if: ${{ failure() }}
run: |
echo "You can install pre-commit hooks to automatically run formatting"
echo "on each commit with:"
echo " pre-commit install"
echo "or you can run by hand on staged files with"
echo " pre-commit run"
echo "or after-the-fact on already committed files with"
echo " pre-commit run --all-files --hook-stage=manual"
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/pre-commit@v1

test_docs_and_examples:
name: Test Docs and Examples
Expand Down Expand Up @@ -118,7 +108,16 @@ jobs:
pip check
- name: Run the tests
run: |
pytest -vv || pytest -vv --lf
pytest -vv -W default || pytest -vv -W default --lf

check_links:
name: Check Links
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1

make_sdist:
name: Make SDist
Expand All @@ -137,3 +136,21 @@ jobs:
steps:
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1
with:
test_command: pytest --vv || pytest -vv --lf

python_tests_check: # This job does nothing and is only used for the branch protection
if: always()
needs:
- build
- pre-commit
- test_prereleases
- test_docs_and_examples
- test_minimum_versions
- test_sdist
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
37 changes: 37 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

name: Publish package to PyPI

on:
release:
types:
- created

jobs:
pypi-publish:
name: Upload release to PyPI
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/ocean-jupyter-server
permissions:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install poetry
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: "1.5.1"

- name: poetry build
run: poetry build
shell: bash

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
11 changes: 9 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,19 @@ repos:
args: ["--line-length", "100"]

- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
files: \.py$
args: [--profile=black]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.942
hooks:
- id: mypy
exclude: examples/simple/setup.py
additional_dependencies: [types-requests]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.6.2
hooks:
Expand Down Expand Up @@ -65,7 +72,7 @@ repos:
stages: [manual]

- repo: https://github.com/sirosen/check-jsonschema
rev: 0.14.2
rev: 0.14.3
hooks:
- id: check-jsonschema
name: "Check GitHub Workflows"
Expand Down
Loading
Loading