From 7ce65d4936577761daf3e37cfb3d34c3f26ffdd3 Mon Sep 17 00:00:00 2001 From: Yuvi Panda Date: Thu, 28 Jul 2022 16:47:29 -0700 Subject: [PATCH 01/48] Remove explicit server extension enabling Not required anymore --- postBuild | 5 ----- 1 file changed, 5 deletions(-) diff --git a/postBuild b/postBuild index ff03503..542f613 100644 --- a/postBuild +++ b/postBuild @@ -1,10 +1,5 @@ #!/bin/bash -# Enable the proxy extension in notebook and lab -jupyter serverextension enable --py jupyter_server_proxy -jupyter labextension install @jupyterlab/server-proxy -jupyter lab build - code-server --install-extension ms-python.python # Install the VS code proxy From b0d3b5ed48320264a7edc5ae6c1089ddda076d6c Mon Sep 17 00:00:00 2001 From: Toni Kukurin Date: Thu, 1 Sep 2022 09:14:00 +0200 Subject: [PATCH 02/48] Increase timeout, remove extra extensions --- jupyter_vscode_proxy/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index bc78f26..06d0698 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -14,8 +14,6 @@ def _get_vscode_cmd(port): working_dir = os.getenv("CODE_WORKINGDIR", ".") extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) - extra_extensions_dir = os.getenv("CODE_EXTRA_EXTENSIONSDIR", None) - cmd = [ executable, "--auth", @@ -27,15 +25,12 @@ def _get_vscode_cmd(port): if extensions_dir: cmd += ["--extensions-dir", extensions_dir] - if extra_extensions_dir: - cmd += ["--extra-extensions-dir", extra_extensions_dir] - cmd.append(working_dir) return cmd return { "command": _get_vscode_cmd, - "timeout": 20, + "timeout": 300, "new_browser_tab": True, "launcher_entry": { "title": "VS Code", From cf40e84dbc64bbcdd900a3156a24b2770552d5be Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 25 Nov 2022 11:56:12 +0100 Subject: [PATCH 03/48] Add Github Actions workflow to build and publish --- .github/workflows/ci.yaml | 26 ++++++++++++++++++++++++++ environment.yml | 2 ++ setup.py | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..47cbb26 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,26 @@ +name: Build and upload to PyPI +on: [push] + +jobs: + build_artifacts: + name: Build artifacts + runs-on: ubuntu-latest + strategy: + fail-fast: true + steps: + - uses: actions/checkout@v3 + - uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + miniforge-version: 22.9.0-2 + use-mamba: true + environment-file: environment.yml + activate-environment: vscode-binder + - shell: bash -el {0} + run: + python -m build + - uses: pypa/gh-action-pypi-publish@v1.5.1 + if: startsWith(github.ref, 'refs/tags/') + with: + user: __token__ + password: ${{ secrets.PYPI_TOKEN }} diff --git a/environment.yml b/environment.yml index bc2c718..7ea9cee 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,8 @@ +name: vscode-binder channels: - conda-forge dependencies: - numpy + - python-build - jupyter-server-proxy - code-server >=3.2 diff --git a/setup.py b/setup.py index f51d1b7..942409f 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setuptools.setup( name="jupyter-vscode-proxy", - version="0.1", + version="0.2", url="https://github.com/betatim/vscode-binder", author="Tim Head", license="BSD", From a1a5f79822b7bde01ef7b3ac7e39bdad8a253da2 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 25 Nov 2022 14:28:13 +0100 Subject: [PATCH 04/48] Upload on release --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 47cbb26..89dc31f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: run: python -m build - uses: pypa/gh-action-pypi-publish@v1.5.1 - if: startsWith(github.ref, 'refs/tags/') + if: github.event_name == 'release' with: user: __token__ password: ${{ secrets.PYPI_TOKEN }} From 8a44db07ac141bde7c46c6cc4a4139f072905c4b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 25 Nov 2022 14:30:36 +0100 Subject: [PATCH 05/48] Add release trigger --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 89dc31f..786b554 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,5 @@ name: Build and upload to PyPI -on: [push] +on: [push, release] jobs: build_artifacts: From 07bbff2e93fce1a9e92a3e01e3b848b7bc90d5f3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 25 Nov 2022 19:49:25 +0100 Subject: [PATCH 06/48] Update .github/workflows/ci.yaml Co-authored-by: Tim Head --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 786b554..278cf7f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,4 +23,4 @@ jobs: if: github.event_name == 'release' with: user: __token__ - password: ${{ secrets.PYPI_TOKEN }} + password: ${{ secrets.PYPI_RELEASE_TOKEN }} From 8c8e15f1e59d4e54fea40d429fc3a88d631440d0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 20 Dec 2022 15:13:00 +0100 Subject: [PATCH 07/48] Only upload on release creation. Otherwise, we will have three jobs that try to upload the same artifact. --- .github/workflows/ci.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 278cf7f..f7f2761 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,8 @@ name: Build and upload to PyPI -on: [push, release] +on: + push: + release: + types: [created] jobs: build_artifacts: From 24abe6cd4323acb631a0faa4830a6a334b43b66f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 21 Dec 2022 15:23:20 +0100 Subject: [PATCH 08/48] Update .github/workflows/ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f7f2761..9298027 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,7 @@ name: Build and upload to PyPI on: push: release: - types: [created] + types: [published] jobs: build_artifacts: From c2a69ff5117659028ecc32feb1c9c74eb260eb1e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 10:37:29 +0200 Subject: [PATCH 09/48] Run CI on pull requests --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9298027..b559d29 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,7 @@ name: Build and upload to PyPI on: push: + pull_request: release: types: [published] From 1de6cee2a59288fa7bd2d8dddc35f2ea0b69296d Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:34:26 +0200 Subject: [PATCH 10/48] Move _get_vscode_cmd outside of setup_vscode function. --- jupyter_vscode_proxy/__init__.py | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 06d0698..f9c9e4f 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -1,33 +1,33 @@ import os import shutil +def _get_vscode_cmd(port): + executable = "code-server" + if not shutil.which(executable): + raise FileNotFoundError("Can not find code-server in PATH") + + # Start vscode in CODE_WORKINGDIR env variable if set + # If not, start in 'current directory', which is $REPO_DIR in mybinder + # but /home/jovyan (or equivalent) in JupyterHubs + working_dir = os.getenv("CODE_WORKINGDIR", ".") -def setup_vscode(): - def _get_vscode_cmd(port): - executable = "code-server" - if not shutil.which(executable): - raise FileNotFoundError("Can not find code-server in PATH") - - # Start vscode in CODE_WORKINGDIR env variable if set - # If not, start in 'current directory', which is $REPO_DIR in mybinder - # but /home/jovyan (or equivalent) in JupyterHubs - working_dir = os.getenv("CODE_WORKINGDIR", ".") + extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) + cmd = [ + executable, + "--auth", + "none", + "--disable-telemetry", + "--port=" + str(port), + ] - extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) - cmd = [ - executable, - "--auth", - "none", - "--disable-telemetry", - "--port=" + str(port), - ] + if extensions_dir: + cmd += ["--extensions-dir", extensions_dir] - if extensions_dir: - cmd += ["--extensions-dir", extensions_dir] + cmd.append(working_dir) + return cmd - cmd.append(working_dir) - return cmd +def setup_vscode(): return { "command": _get_vscode_cmd, "timeout": 300, From e805c8119e9df71b7c8c54c01a6af90651675f5c Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:38:54 +0200 Subject: [PATCH 11/48] Allow to specify code executable. --- jupyter_vscode_proxy/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index f9c9e4f..39d9ef2 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -27,9 +27,17 @@ def _get_vscode_cmd(port): return cmd +_CODE_EXECUTABLE_CMD_MAP = { + "code-server": _get_vscode_cmd, +} + + def setup_vscode(): + executable = os.environ.get("CODE_EXECUTABLE", "code-server") + if executable not in _CODE_EXECUTABLE_CMD_MAP: + raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_CMD_MAP.keys()}.") return { - "command": _get_vscode_cmd, + "command": _CODE_EXECUTABLE_CMD_MAP[executable], "timeout": 300, "new_browser_tab": True, "launcher_entry": { From 796a39b000617898b2fb2e2bc559ac89cbd8fccc Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:40:30 +0200 Subject: [PATCH 12/48] Add openvscode-server as executable option. --- jupyter_vscode_proxy/__init__.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 39d9ef2..b67ea1c 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -27,8 +27,31 @@ def _get_vscode_cmd(port): return cmd +def _get_openvscode_cmd(port): + executable = "openvscode-server" + if not shutil.which(executable): + raise FileNotFoundError("Can not find openvscode-server in PATH") + + cmd = [ + executable, + "--without-connection-token", + "--telemetry-level off", + "--port=" + str(port), + ] + + if (extensions_dir := os.getenv("CODE_EXTENSIONSDIR", None)): + cmd += ["--extensions-dir", extensions_dir] + + # Start openvscode in CODE_WORKINGDIR env variable if set + # If not, start in 'current directory'. + working_dir = os.getenv("CODE_WORKINGDIR", ".") + cmd.append(working_dir) + return cmd + + _CODE_EXECUTABLE_CMD_MAP = { "code-server": _get_vscode_cmd, + "openvscode-server": _get_openvscode_cmd, } From ce4383633424ccebaaa6ed114c5e81ab4a6acb6c Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:49:03 +0200 Subject: [PATCH 13/48] Refactor to remove redundancy. --- jupyter_vscode_proxy/__init__.py | 78 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index b67ea1c..024bda2 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -1,53 +1,23 @@ import os import shutil -def _get_vscode_cmd(port): - executable = "code-server" - if not shutil.which(executable): - raise FileNotFoundError("Can not find code-server in PATH") - - # Start vscode in CODE_WORKINGDIR env variable if set - # If not, start in 'current directory', which is $REPO_DIR in mybinder - # but /home/jovyan (or equivalent) in JupyterHubs - working_dir = os.getenv("CODE_WORKINGDIR", ".") - - extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) - cmd = [ - executable, + +def _get_vscode_cmd(): + return [ + "code-server", "--auth", "none", "--disable-telemetry", - "--port=" + str(port), ] - if extensions_dir: - cmd += ["--extensions-dir", extensions_dir] - - cmd.append(working_dir) - return cmd - -def _get_openvscode_cmd(port): - executable = "openvscode-server" - if not shutil.which(executable): - raise FileNotFoundError("Can not find openvscode-server in PATH") - - cmd = [ - executable, +def _get_openvscode_cmd(): + return [ + "openvscode-server", "--without-connection-token", "--telemetry-level off", - "--port=" + str(port), ] - if (extensions_dir := os.getenv("CODE_EXTENSIONSDIR", None)): - cmd += ["--extensions-dir", extensions_dir] - - # Start openvscode in CODE_WORKINGDIR env variable if set - # If not, start in 'current directory'. - working_dir = os.getenv("CODE_WORKINGDIR", ".") - cmd.append(working_dir) - return cmd - _CODE_EXECUTABLE_CMD_MAP = { "code-server": _get_vscode_cmd, @@ -55,12 +25,40 @@ def _get_openvscode_cmd(port): } -def setup_vscode(): - executable = os.environ.get("CODE_EXECUTABLE", "code-server") +def _get_cmd_factory(executable): if executable not in _CODE_EXECUTABLE_CMD_MAP: raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_CMD_MAP.keys()}.") + + get_cmd = _CODE_EXECUTABLE_CMD_MAP[executable] + + def _get_cmd(port): + if not shutil.which(executable): + raise FileNotFoundError(f"Can not find {executable} in PATH") + + # Start vscode in CODE_WORKINGDIR env variable if set + # If not, start in 'current directory', which is $REPO_DIR in mybinder + # but /home/jovyan (or equivalent) in JupyterHubs + working_dir = os.getenv("CODE_WORKINGDIR", ".") + + extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) + + cmd = get_cmd() + + cmd.append("--port=" + str(port)) + + if extensions_dir: + cmd += ["--extensions-dir", extensions_dir] + + cmd.append(working_dir) + return cmd + + return _get_cmd + + +def setup_vscode(): + executable = os.environ.get("CODE_EXECUTABLE", "code-server") return { - "command": _CODE_EXECUTABLE_CMD_MAP[executable], + "command": _get_cmd_factory(executable), "timeout": 300, "new_browser_tab": True, "launcher_entry": { From 296f9d811929f5541601d0591e88cc3552ff640c Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:51:36 +0200 Subject: [PATCH 14/48] Add type hints. --- jupyter_vscode_proxy/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 024bda2..b2073a2 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -1,8 +1,10 @@ +from typing import Callable, List, Dict, Any + import os import shutil -def _get_vscode_cmd(): +def _get_vscode_cmd() -> List[str]: return [ "code-server", "--auth", @@ -11,7 +13,7 @@ def _get_vscode_cmd(): ] -def _get_openvscode_cmd(): +def _get_openvscode_cmd() -> List[str]: return [ "openvscode-server", "--without-connection-token", @@ -19,19 +21,19 @@ def _get_openvscode_cmd(): ] -_CODE_EXECUTABLE_CMD_MAP = { +_CODE_EXECUTABLE_CMD_MAP: Dict[str, Callable] = { "code-server": _get_vscode_cmd, "openvscode-server": _get_openvscode_cmd, } -def _get_cmd_factory(executable): +def _get_cmd_factory(executable: str) -> Callable: if executable not in _CODE_EXECUTABLE_CMD_MAP: raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_CMD_MAP.keys()}.") get_cmd = _CODE_EXECUTABLE_CMD_MAP[executable] - def _get_cmd(port): + def _get_cmd(port: int) -> List[str]: if not shutil.which(executable): raise FileNotFoundError(f"Can not find {executable} in PATH") @@ -55,7 +57,7 @@ def _get_cmd(port): return _get_cmd -def setup_vscode(): +def setup_vscode() -> Dict[str, Any]: executable = os.environ.get("CODE_EXECUTABLE", "code-server") return { "command": _get_cmd_factory(executable), From bee1fe524345b66ec23257001641458ca6c67e20 Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Tue, 15 Aug 2023 16:57:13 +0200 Subject: [PATCH 15/48] Rename to inner_cmd. --- jupyter_vscode_proxy/__init__.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index b2073a2..52d06f3 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -4,7 +4,7 @@ import shutil -def _get_vscode_cmd() -> List[str]: +def _get_inner_vscode_cmd() -> List[str]: return [ "code-server", "--auth", @@ -13,7 +13,7 @@ def _get_vscode_cmd() -> List[str]: ] -def _get_openvscode_cmd() -> List[str]: +def _get_inner_openvscode_cmd() -> List[str]: return [ "openvscode-server", "--without-connection-token", @@ -21,17 +21,17 @@ def _get_openvscode_cmd() -> List[str]: ] -_CODE_EXECUTABLE_CMD_MAP: Dict[str, Callable] = { - "code-server": _get_vscode_cmd, - "openvscode-server": _get_openvscode_cmd, +_CODE_EXECUTABLE_INNER_CMD_MAP: Dict[str, Callable] = { + "code-server": _get_inner_vscode_cmd, + "openvscode-server": _get_inner_openvscode_cmd, } def _get_cmd_factory(executable: str) -> Callable: - if executable not in _CODE_EXECUTABLE_CMD_MAP: - raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_CMD_MAP.keys()}.") + if executable not in _CODE_EXECUTABLE_INNER_CMD_MAP: + raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_INNER_CMD_MAP.keys()}.") - get_cmd = _CODE_EXECUTABLE_CMD_MAP[executable] + get_inner_cmd = _CODE_EXECUTABLE_INNER_CMD_MAP[executable] def _get_cmd(port: int) -> List[str]: if not shutil.which(executable): @@ -44,7 +44,7 @@ def _get_cmd(port: int) -> List[str]: extensions_dir = os.getenv("CODE_EXTENSIONSDIR", None) - cmd = get_cmd() + cmd = get_inner_cmd() cmd.append("--port=" + str(port)) From 593cb10ce40bf035e2b6696c15cef8401ef2ede6 Mon Sep 17 00:00:00 2001 From: Jan-Benedikt Jagusch Date: Fri, 18 Aug 2023 10:29:44 +0200 Subject: [PATCH 16/48] Update jupyter_vscode_proxy/__init__.py Co-authored-by: Uwe L. Korn --- jupyter_vscode_proxy/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 52d06f3..8c2ec97 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -17,7 +17,8 @@ def _get_inner_openvscode_cmd() -> List[str]: return [ "openvscode-server", "--without-connection-token", - "--telemetry-level off", + "--telemetry-level", + "off", ] From 937a0cdf398eb1216f315e14f15131ae129db6b4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 10:57:18 +0200 Subject: [PATCH 17/48] Add some pre-commit hooks --- .flake8 | 9 ++++++++ .github/workflows/pre-commit.yml | 32 +++++++++++++++++++++++++++++ .pre-commit-config.yaml | 35 ++++++++++++++++++++++++++++++++ jupyter_vscode_proxy/__init__.py | 11 +++++----- pyproject.toml | 23 +++++++++++++++++++++ setup.py | 9 ++++---- 6 files changed, 109 insertions(+), 10 deletions(-) create mode 100644 .flake8 create mode 100644 .github/workflows/pre-commit.yml create mode 100644 .pre-commit-config.yaml create mode 100644 pyproject.toml diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..63d64f0 --- /dev/null +++ b/.flake8 @@ -0,0 +1,9 @@ +# Taken directly from https://github.com/ambv/black/blob/master/.flake8 +[flake8] +ignore = E203, E266, E501, W503, C901, D104, D100 +max-line-length = 88 +max-complexity = 18 +select = B,C,E,F,W,T4,B9 +per-file-ignores = + tests/**:D101,D102,D103 +docstring-convention = numpy diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 0000000..1a576ed --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,32 @@ +name: CI +on: [push, pull_request] + +# Automatically stop old builds on the same branch/PR +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +defaults: + run: + shell: bash -el {0} + +jobs: + pre-commit-checks: + name: "Linux - pre-commit checks - Python 3.10" + timeout-minutes: 30 + runs-on: ubuntu-latest + env: + PRE_COMMIT_USE_MICROMAMBA: 1 + steps: + - name: Checkout branch + uses: actions/checkout@v3.5.2 + - name: Set up micromamba + uses: mamba-org/setup-micromamba@875557da4ee020f18df03b8910a42203fbf02da1 + - name: Add micromamba to GITHUB_PATH + run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" + - name: Install Python 3.10 + uses: actions/setup-python@v4 + with: + python-version: "3.10" + - name: Run pre-commit checks + uses: pre-commit/action@v3.0.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..394e28d --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,35 @@ +repos: + - repo: https://github.com/Quantco/pre-commit-mirrors-black + rev: 23.7.0 + hooks: + - id: black-conda + args: + - --safe + - --target-version=py38 + - repo: https://github.com/Quantco/pre-commit-mirrors-flake8 + rev: 6.1.0 + hooks: + - id: flake8-conda + - repo: https://github.com/Quantco/pre-commit-mirrors-isort + rev: 5.12.0 + hooks: + - id: isort-conda + additional_dependencies: [-c, conda-forge, toml=0.10.2] + - repo: https://github.com/Quantco/pre-commit-mirrors-mypy + rev: "1.5.1" + hooks: + - id: mypy-conda + additional_dependencies: + - -c + - conda-forge + - types-mock + - types-setuptools + - types-redis + - types-boto + - boto3-stubs + - repo: https://github.com/Quantco/pre-commit-mirrors-pyupgrade + rev: 3.10.1 + hooks: + - id: pyupgrade-conda + args: + - --py38-plus diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 8c2ec97..2ae6fd4 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -1,7 +1,6 @@ -from typing import Callable, List, Dict, Any - import os import shutil +from typing import Any, Callable, Dict, List def _get_inner_vscode_cmd() -> List[str]: @@ -30,14 +29,16 @@ def _get_inner_openvscode_cmd() -> List[str]: def _get_cmd_factory(executable: str) -> Callable: if executable not in _CODE_EXECUTABLE_INNER_CMD_MAP: - raise KeyError(f"'{executable}' is not one of {_CODE_EXECUTABLE_INNER_CMD_MAP.keys()}.") - + raise KeyError( + f"'{executable}' is not one of {_CODE_EXECUTABLE_INNER_CMD_MAP.keys()}." + ) + get_inner_cmd = _CODE_EXECUTABLE_INNER_CMD_MAP[executable] def _get_cmd(port: int) -> List[str]: if not shutil.which(executable): raise FileNotFoundError(f"Can not find {executable} in PATH") - + # Start vscode in CODE_WORKINGDIR env variable if set # If not, start in 'current directory', which is $REPO_DIR in mybinder # but /home/jovyan (or equivalent) in JupyterHubs diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..36c37ee --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,23 @@ +[tool.black] +exclude = ''' +/( + \.eggs + | \.git + | \.venv + | build + | dist +)/ +''' + +[tool.isort] +profile = "black" +line_length = 88 +known_first_party = "{{ project_slug }}" +skip_glob = '\.eggs/*,\.git/*,\.venv/*,build/*,dist/*' +default_section = 'THIRDPARTY' + +[tool.mypy] +python_version = '3.8' +ignore_missing_imports = true +no_implicit_optional = true +check_untyped_defs = true diff --git a/setup.py b/setup.py index 942409f..ce4a661 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ import setuptools - with open("README.md", encoding="utf8") as f: readme = f.read() @@ -17,11 +16,11 @@ packages=setuptools.find_packages(), keywords=["Jupyter", "vscode", "vs code", "editor"], classifiers=["Framework :: Jupyter"], - install_requires=[ - 'jupyter-server-proxy' - ], + install_requires=["jupyter-server-proxy"], entry_points={ - "jupyter_serverproxy_servers": ["vscode = jupyter_vscode_proxy:setup_vscode",] + "jupyter_serverproxy_servers": [ + "vscode = jupyter_vscode_proxy:setup_vscode", + ] }, package_data={"jupyter_vscode_proxy": ["icons/*"]}, project_urls={ From dd45d91ed98f3e35f62a69dd6027270c98c3417f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 11:02:14 +0200 Subject: [PATCH 18/48] Use micromamba everywhere in CI --- .github/workflows/ci.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b559d29..5a8b40f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,13 +13,11 @@ jobs: fail-fast: true steps: - uses: actions/checkout@v3 - - uses: conda-incubator/setup-miniconda@v2 + - name: Set up Conda env + uses: mamba-org/setup-micromamba@875557da4ee020f18df03b8910a42203fbf02da1 with: - miniforge-variant: Mambaforge - miniforge-version: 22.9.0-2 - use-mamba: true environment-file: environment.yml - activate-environment: vscode-binder + cache-environment: true - shell: bash -el {0} run: python -m build From 790b7193d788543ecaa36004fa7e3156c59b0acd Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 11:16:53 +0200 Subject: [PATCH 19/48] Move to pyproject.toml and setuptools_scm --- .github/workflows/ci.yaml | 2 ++ pyproject.toml | 31 +++++++++++++++++++++++++++++++ setup.cfg | 2 -- setup.py | 30 ------------------------------ 4 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5a8b40f..60a6dfd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,8 @@ jobs: fail-fast: true steps: - uses: actions/checkout@v3 + - name: Fetch full git history + run: git fetch --prune --unshallow - name: Set up Conda env uses: mamba-org/setup-micromamba@875557da4ee020f18df03b8910a42203fbf02da1 with: diff --git a/pyproject.toml b/pyproject.toml index 36c37ee..f6c35a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,34 @@ +[build-system] +requires = ["setuptools", "setuptools-scm", "wheel"] + +[tool.setuptools_scm] +version_scheme = "post-release" + +[project] +name = "jupyter_vscode_proxy" +description = "VS Code extension for Jupyter" +readme = "README.md" +dynamic = ["version"] +authors = [ + {name = "Tim Head", email = "noreply@example.com"}, +] +classifiers = [ + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Framework :: Juypter", +] +requires-python = ">=3.8" +license = {text = "BSD-3-clause"} + +[project.urls] +repository = "https://github.com/betatim/vscode-binder" + +[project.entry-points.jupyter_serverproxy_servers] +vscode = "jupyter_vscode_proxy:setup_vscode" + [tool.black] exclude = ''' /( diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 8183238..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -license_files = LICENSE diff --git a/setup.py b/setup.py deleted file mode 100644 index ce4a661..0000000 --- a/setup.py +++ /dev/null @@ -1,30 +0,0 @@ -import setuptools - -with open("README.md", encoding="utf8") as f: - readme = f.read() - - -setuptools.setup( - name="jupyter-vscode-proxy", - version="0.2", - url="https://github.com/betatim/vscode-binder", - author="Tim Head", - license="BSD", - description="VS Code extension for Jupyter", - long_description=readme, - long_description_content_type="text/markdown", - packages=setuptools.find_packages(), - keywords=["Jupyter", "vscode", "vs code", "editor"], - classifiers=["Framework :: Jupyter"], - install_requires=["jupyter-server-proxy"], - entry_points={ - "jupyter_serverproxy_servers": [ - "vscode = jupyter_vscode_proxy:setup_vscode", - ] - }, - package_data={"jupyter_vscode_proxy": ["icons/*"]}, - project_urls={ - "Source": "https://github.com/betatim/vscode-binder/", - "Tracker": "https://github.com/betatim/vscode-binder/issues", - }, -) From 915f1476297dd23e36098cf223b2c7fa524a5126 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 11:21:07 +0200 Subject: [PATCH 20/48] Classifier 'Framework :: Juypter' is not a valid classifier. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f6c35a6..32f5676 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,6 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Framework :: Juypter", ] requires-python = ">=3.8" license = {text = "BSD-3-clause"} From 6cf02f35ad06b0a3107e7d7fba3594b8b7031097 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 11:39:59 +0200 Subject: [PATCH 21/48] Add dependabot configuration --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..175844a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" From 12ce85edb419420ef1b18637f51418cb1192a452 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 18 Aug 2023 11:40:40 +0200 Subject: [PATCH 22/48] Add CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..08f4e4f --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @betatim @xhochy From 77de68e87d552a23ea976cffc0cec06962e3cf7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:43:11 +0000 Subject: [PATCH 23/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.5.1...v1.8.10) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 60a6dfd..50ddb9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.5.1 + - uses: pypa/gh-action-pypi-publish@v1.8.10 if: github.event_name == 'release' with: user: __token__ From 29782e871cc07d5f8195a1e7d02c9145420f7bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 04:14:35 +0000 Subject: [PATCH 24/48] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). Updates `actions/checkout` from 3 to 4 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) Updates `mamba-org/setup-micromamba` from 1.4.3 to 1.4.4 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/875557da4ee020f18df03b8910a42203fbf02da1...2b72821d5ad7f6da3c003a3684ce341bf187b46f) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/pre-commit.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50ddb9d..7e9ce7c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,11 +12,11 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@875557da4ee020f18df03b8910a42203fbf02da1 + uses: mamba-org/setup-micromamba@2b72821d5ad7f6da3c003a3684ce341bf187b46f with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 1a576ed..f0d3212 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -19,9 +19,9 @@ jobs: PRE_COMMIT_USE_MICROMAMBA: 1 steps: - name: Checkout branch - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@875557da4ee020f18df03b8910a42203fbf02da1 + uses: mamba-org/setup-micromamba@2b72821d5ad7f6da3c003a3684ce341bf187b46f - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 48424438059f9cdfd86d291ca3803eff5119f249 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:38:57 +0000 Subject: [PATCH 25/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/2b72821d5ad7f6da3c003a3684ce341bf187b46f...54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e9ce7c..1470565 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@2b72821d5ad7f6da3c003a3684ce341bf187b46f + uses: mamba-org/setup-micromamba@54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index f0d3212..199d66a 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@2b72821d5ad7f6da3c003a3684ce341bf187b46f + uses: mamba-org/setup-micromamba@54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 6068ae8d9f19f1d54fc559638afac74403cfc1fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 04:14:49 +0000 Subject: [PATCH 26/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18...db1df3ba9e07ea86f759e98b575c002747e9e757) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1470565..3ad9171 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18 + uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 199d66a..5753a6d 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@54d4d5980e1a4aa7cdc8b050cf2d19b7e262ce18 + uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 9550c2e79397e4384623c399b68eff9f5efcc1de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 04:27:04 +0000 Subject: [PATCH 27/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.10...v1.8.11) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3ad9171..df2d5f5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.8.10 + - uses: pypa/gh-action-pypi-publish@v1.8.11 if: github.event_name == 'release' with: user: __token__ From 7545b3016b7e4bb0964c61901f0b198b7c6423ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 04:50:22 +0000 Subject: [PATCH 28/48] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) and [actions/setup-python](https://github.com/actions/setup-python). Updates `mamba-org/setup-micromamba` from 1.6.0 to 1.7.0 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/db1df3ba9e07ea86f759e98b575c002747e9e757...8752438cc2755ab7d0de2a8d70b694f5586baae8) Updates `actions/setup-python` from 4 to 5 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index df2d5f5..656fa33 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757 + uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 5753a6d..3337a05 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,11 +21,11 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757 + uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Run pre-commit checks From b5ae10d0aae481ac5fb29f0e70b8d9bab8b51d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 04:07:13 +0000 Subject: [PATCH 29/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/8752438cc2755ab7d0de2a8d70b694f5586baae8...e820223f89c8720d6c740ca154a7adf32fcd278a) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 656fa33..d67a52e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8 + uses: mamba-org/setup-micromamba@e820223f89c8720d6c740ca154a7adf32fcd278a with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3337a05..4274732 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8 + uses: mamba-org/setup-micromamba@e820223f89c8720d6c740ca154a7adf32fcd278a - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 07740e3837da9bb615ecca376cc56052ad1c58d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 04:34:27 +0000 Subject: [PATCH 30/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). Updates `mamba-org/setup-micromamba` from 1.7.3 to 1.8.0 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/e820223f89c8720d6c740ca154a7adf32fcd278a...8767fb704bd78032e9392f0386bf46950bdd1194) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d67a52e..34ac7e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@e820223f89c8720d6c740ca154a7adf32fcd278a + uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 4274732..3998a85 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@e820223f89c8720d6c740ca154a7adf32fcd278a + uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 2d5abafbb27d9860cf67cd7625133bcf29818737 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 04:24:07 +0000 Subject: [PATCH 31/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [pre-commit/action](https://github.com/pre-commit/action). Updates `pre-commit/action` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/pre-commit/action/releases) - [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: pre-commit/action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3998a85..b224940 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -29,4 +29,4 @@ jobs: with: python-version: "3.10" - name: Run pre-commit checks - uses: pre-commit/action@v3.0.0 + uses: pre-commit/action@v3.0.1 From 298cdbb2db8fa5f57fc8c722fa0e8ccf073e9f94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 04:13:32 +0000 Subject: [PATCH 32/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). Updates `mamba-org/setup-micromamba` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/8767fb704bd78032e9392f0386bf46950bdd1194...422500192359a097648154e8db4e39bdb6c6eed7) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 34ac7e6..a11d23c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194 + uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index b224940..35fb5f2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194 + uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 95f83ac8680079fd38a3c99d1cb8f0576f1e87ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 04:43:30 +0000 Subject: [PATCH 33/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.8.11 to 1.8.12 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.11...v1.8.12) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a11d23c..855a58d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.8.11 + - uses: pypa/gh-action-pypi-publish@v1.8.12 if: github.event_name == 'release' with: user: __token__ From 22a412032017cebfd2b423bde2098bc38ed07f77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 04:37:50 +0000 Subject: [PATCH 34/48] Bump the dependencies group with 1 update Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.8.12 to 1.8.14 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.12...v1.8.14) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 855a58d..21c8e28 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.8.12 + - uses: pypa/gh-action-pypi-publish@v1.8.14 if: github.event_name == 'release' with: user: __token__ From a2a035c91eaad2b23968eca392789acea0fdaf26 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Mon, 6 May 2024 13:46:49 +0100 Subject: [PATCH 35/48] Add code-server icon behind `USE_CODE_SERVER_ICON` --- jupyter_vscode_proxy/__init__.py | 4 +++- jupyter_vscode_proxy/icons/code-server.svg | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 jupyter_vscode_proxy/icons/code-server.svg diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 2ae6fd4..9e99b09 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -61,6 +61,8 @@ def _get_cmd(port: int) -> List[str]: def setup_vscode() -> Dict[str, Any]: executable = os.environ.get("CODE_EXECUTABLE", "code-server") + use_code_server_icon = os.environ.get("USE_CODE_SERVER_ICON", "false").lower() + icon = "code-server.svg" if use_code_server_icon == "true" else "vscode.svg" return { "command": _get_cmd_factory(executable), "timeout": 300, @@ -68,7 +70,7 @@ def setup_vscode() -> Dict[str, Any]: "launcher_entry": { "title": "VS Code", "icon_path": os.path.join( - os.path.dirname(os.path.abspath(__file__)), "icons", "vscode.svg" + os.path.dirname(os.path.abspath(__file__)), "icons", icon ), }, } diff --git a/jupyter_vscode_proxy/icons/code-server.svg b/jupyter_vscode_proxy/icons/code-server.svg new file mode 100644 index 0000000..85b701d --- /dev/null +++ b/jupyter_vscode_proxy/icons/code-server.svg @@ -0,0 +1,9 @@ + + \ No newline at end of file From 9521f98c145bcbb3770c7d446762ac26baf8008c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 6 May 2024 20:10:43 +0200 Subject: [PATCH 36/48] Update jupyter_vscode_proxy/__init__.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> --- jupyter_vscode_proxy/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jupyter_vscode_proxy/__init__.py b/jupyter_vscode_proxy/__init__.py index 9e99b09..eb5ae43 100644 --- a/jupyter_vscode_proxy/__init__.py +++ b/jupyter_vscode_proxy/__init__.py @@ -61,8 +61,7 @@ def _get_cmd(port: int) -> List[str]: def setup_vscode() -> Dict[str, Any]: executable = os.environ.get("CODE_EXECUTABLE", "code-server") - use_code_server_icon = os.environ.get("USE_CODE_SERVER_ICON", "false").lower() - icon = "code-server.svg" if use_code_server_icon == "true" else "vscode.svg" + icon = "code-server.svg" if executable == "code-server" else "vscode.svg" return { "command": _get_cmd_factory(executable), "timeout": 300, From 00397bc7729595654727781273ac5a0b0057f145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 04:55:00 +0000 Subject: [PATCH 37/48] Bump mamba-org/setup-micromamba in the dependencies group Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). Updates `mamba-org/setup-micromamba` from 1.8.1 to 1.9.0 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/422500192359a097648154e8db4e39bdb6c6eed7...f8b8a1e23a26f60a44c853292711bacfd3eac822) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 21c8e28..d2c02f9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 + uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 35fb5f2..48f457c 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 + uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 4ec72fa6a6ca926c2b786dd38e8efb2190cb58cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 04:22:42 +0000 Subject: [PATCH 38/48] Bump pypa/gh-action-pypi-publish in the dependencies group Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.8.14 to 1.9.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.14...v1.9.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d2c02f9..4f6a62e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.8.14 + - uses: pypa/gh-action-pypi-publish@v1.9.0 if: github.event_name == 'release' with: user: __token__ From 3ec37d290749314a2ebbe252cbcf5e30499ecc5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 05:03:57 +0000 Subject: [PATCH 39/48] Bump pypa/gh-action-pypi-publish in the dependencies group Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4f6a62e..65a5884 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.9.0 + - uses: pypa/gh-action-pypi-publish@v1.10.0 if: github.event_name == 'release' with: user: __token__ From 0b1c3370a033adcf41b2e50dde755ede220530b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 04:48:07 +0000 Subject: [PATCH 40/48] Bump pypa/gh-action-pypi-publish in the dependencies group Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.10.0...v1.10.1) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65a5884..5929326 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.10.0 + - uses: pypa/gh-action-pypi-publish@v1.10.1 if: github.event_name == 'release' with: user: __token__ From f3a62755722dab8ac9d789b5d031e2dc71f76899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 04:33:23 +0000 Subject: [PATCH 41/48] Bump pypa/gh-action-pypi-publish in the dependencies group Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.10.1 to 1.10.2 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.10.1...v1.10.2) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5929326..bce61b3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.10.1 + - uses: pypa/gh-action-pypi-publish@v1.10.2 if: github.event_name == 'release' with: user: __token__ From 2fc4fd68248dbc3f4372a89386df8dc44d2411bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 04:27:45 +0000 Subject: [PATCH 42/48] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `mamba-org/setup-micromamba` from 1.9.0 to 2.0.0 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/f8b8a1e23a26f60a44c853292711bacfd3eac822...617811f69075e3fd3ae68ca64220ad065877f246) Updates `pypa/gh-action-pypi-publish` from 1.10.2 to 1.10.3 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.10.2...v1.10.3) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bce61b3..8445631 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,14 +16,14 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 + uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 with: environment-file: environment.yml cache-environment: true - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.10.2 + - uses: pypa/gh-action-pypi-publish@v1.10.3 if: github.event_name == 'release' with: user: __token__ diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 48f457c..9fba6be 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 + uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From 8e5cc5ef8f257a0dc832fa2e0c47f8a5daf6b044 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 04:05:06 +0000 Subject: [PATCH 43/48] Bump pypa/gh-action-pypi-publish in the dependencies group Bumps the dependencies group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.10.3 to 1.11.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.10.3...v1.11.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8445631..cc9bad8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.10.3 + - uses: pypa/gh-action-pypi-publish@v1.11.0 if: github.event_name == 'release' with: user: __token__ From 5d49341b9152fd6d9af01d6c70930b56ea07c3d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 04:41:58 +0000 Subject: [PATCH 44/48] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `mamba-org/setup-micromamba` from 2.0.0 to 2.0.1 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/617811f69075e3fd3ae68ca64220ad065877f246...ab6bf8bf7403e8023a094abeec19d6753bdc143e) Updates `pypa/gh-action-pypi-publish` from 1.11.0 to 1.12.2 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.11.0...v1.12.2) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cc9bad8..485f179 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,14 +16,14 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 + uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e with: environment-file: environment.yml cache-environment: true - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.11.0 + - uses: pypa/gh-action-pypi-publish@v1.12.2 if: github.event_name == 'release' with: user: __token__ diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9fba6be..2ed9fcd 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 + uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From a0e54103c4bbd54b2e96ea714506b8f6ca403af3 Mon Sep 17 00:00:00 2001 From: Tiago Neves <32251249+anhaabaete@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:23:06 -0300 Subject: [PATCH 45/48] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 554bfb0..3b7109e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # VS Code on Binder [![PyPI](https://img.shields.io/pypi/v/jupyter-vscode-proxy)](https://pypi.org/project/jupyter-vscode-proxy/) -[![Install with conda](https://anaconda.org/conda-forge/jupyter-vscode-proxy/badges/installer/conda.svg)](https://github.com/conda-forge/jupyter-vscode-proxy-feedstock) +[![Install with conda](https://upload.wikimedia.org/wikipedia/commons/thumb/e/ea/Conda_logo.svg/92px-Conda_logo.svg.png)](https://github.com/conda-forge/jupyter-vscode-proxy-feedstock) VS Code on Binder, because sometimes you need a real editor. From a7ada93dd42a314dd52d94d430659b43136a0eec Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 24 Nov 2024 09:26:48 +0100 Subject: [PATCH 46/48] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b7109e..c6a7641 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # VS Code on Binder [![PyPI](https://img.shields.io/pypi/v/jupyter-vscode-proxy)](https://pypi.org/project/jupyter-vscode-proxy/) -[![Install with conda](https://upload.wikimedia.org/wikipedia/commons/thumb/e/ea/Conda_logo.svg/92px-Conda_logo.svg.png)](https://github.com/conda-forge/jupyter-vscode-proxy-feedstock) +[![Install with conda](https://anaconda.org/conda-forge/jupyter-vscode-proxy/badges/version.svg)](https://github.com/conda-forge/jupyter-vscode-proxy-feedstock) VS Code on Binder, because sometimes you need a real editor. From 7b9b1db28f4cd2038810ced2be52fce77b2d00e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 04:46:07 +0000 Subject: [PATCH 47/48] Bump mamba-org/setup-micromamba in the dependencies group Bumps the dependencies group with 1 update: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba). Updates `mamba-org/setup-micromamba` from 2.0.1 to 2.0.2 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/ab6bf8bf7403e8023a094abeec19d6753bdc143e...06375d89d211a1232ef63355742e9e2e564bc7f7) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 485f179..781b9a9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e + uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 with: environment-file: environment.yml cache-environment: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2ed9fcd..2a47212 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e + uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10 From c93bc28cacb22bf7ef97ca9600ba7bd7a5dfabcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 04:46:43 +0000 Subject: [PATCH 48/48] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `mamba-org/setup-micromamba` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/06375d89d211a1232ef63355742e9e2e564bc7f7...068f1ab4b37ed9b3d9f73da7db90a0cda0a48d29) Updates `pypa/gh-action-pypi-publish` from 1.12.2 to 1.12.3 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.12.2...v1.12.3) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 781b9a9..5e35133 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,14 +16,14 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Conda env - uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 + uses: mamba-org/setup-micromamba@068f1ab4b37ed9b3d9f73da7db90a0cda0a48d29 with: environment-file: environment.yml cache-environment: true - shell: bash -el {0} run: python -m build - - uses: pypa/gh-action-pypi-publish@v1.12.2 + - uses: pypa/gh-action-pypi-publish@v1.12.3 if: github.event_name == 'release' with: user: __token__ diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2a47212..f77ebc2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout branch uses: actions/checkout@v4 - name: Set up micromamba - uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 + uses: mamba-org/setup-micromamba@068f1ab4b37ed9b3d9f73da7db90a0cda0a48d29 - name: Add micromamba to GITHUB_PATH run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH" - name: Install Python 3.10