From c1a892c6dcaa89aed5a84c27be5fc31d4bed56a8 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 1 Apr 2022 00:23:17 +0100 Subject: [PATCH 1/9] Remove JUPYTER_ENABLE_LAB variable warning --- base-notebook/start-notebook.sh | 4 ---- tests/base-notebook/test_start_container.py | 6 ------ 2 files changed, 10 deletions(-) diff --git a/base-notebook/start-notebook.sh b/base-notebook/start-notebook.sh index ce47768d..4f673d22 100755 --- a/base-notebook/start-notebook.sh +++ b/base-notebook/start-notebook.sh @@ -18,9 +18,5 @@ if [[ "${RESTARTABLE}" == "yes" ]]; then wrapper="run-one-constantly" fi -if [[ -v JUPYTER_ENABLE_LAB ]]; then - echo "WARNING: JUPYTER_ENABLE_LAB is ignored, use DOCKER_STACKS_JUPYTER_CMD if you want to change the command used to start the server" -fi - # shellcheck disable=SC1091,SC2086 exec /usr/local/bin/start.sh ${wrapper} jupyter ${DOCKER_STACKS_JUPYTER_CMD} ${NOTEBOOK_ARGS} "$@" diff --git a/tests/base-notebook/test_start_container.py b/tests/base-notebook/test_start_container.py index fffdf68f..ad45d2ce 100644 --- a/tests/base-notebook/test_start_container.py +++ b/tests/base-notebook/test_start_container.py @@ -15,12 +15,6 @@ LOGGER = logging.getLogger(__name__) @pytest.mark.parametrize( "env,expected_command,expected_start,expected_warnings", [ - ( - ["JUPYTER_ENABLE_LAB=yes"], - "jupyter lab", - True, - ["WARNING: JUPYTER_ENABLE_LAB is ignored"], - ), (None, "jupyter lab", True, []), (["DOCKER_STACKS_JUPYTER_CMD=lab"], "jupyter lab", True, []), (["RESTARTABLE=yes"], "run-one-constantly jupyter lab", True, []), From c3380395063ed29dabf04a25c7b2de133acde9dc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 20:42:52 +0000 Subject: [PATCH 2/9] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-prettier: v2.6.1 → v2.6.2](https://github.com/pre-commit/mirrors-prettier/compare/v2.6.1...v2.6.2) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2c96228e..c4560bbb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,7 +52,7 @@ repos: # Autoformat: YAML, JSON, Markdown, etc. - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.6.1 + rev: v2.6.2 hooks: - id: prettier From 0499f0e12c1832c5279f88508658ccefcc6a6eb0 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 7 Apr 2022 15:04:20 +0200 Subject: [PATCH 3/9] Add --quiet to mamba info --- tagging/manifests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tagging/manifests.py b/tagging/manifests.py index 5a475a38..5f7fab59 100644 --- a/tagging/manifests.py +++ b/tagging/manifests.py @@ -67,7 +67,7 @@ class CondaEnvironmentManifest(ManifestInterface): "", quoted_output(container, "python --version"), "", - quoted_output(container, "mamba info"), + quoted_output(container, "mamba info --quiet"), "", quoted_output(container, "mamba list"), ] From 220bbb3a2a6193ed7abfc955a40f793dc1c38671 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 21:48:08 +0000 Subject: [PATCH 4/9] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.31.1 → v2.32.0](https://github.com/asottile/pyupgrade/compare/v2.31.1...v2.32.0) - [github.com/pre-commit/pre-commit-hooks: v4.1.0 → v4.2.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.1.0...v4.2.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c4560bbb..18a167fc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: # Autoupdate: Python code - repo: https://github.com/asottile/pyupgrade - rev: v2.31.1 + rev: v2.32.0 hooks: - id: pyupgrade args: [--py39-plus] @@ -58,7 +58,7 @@ repos: # `pre-commit sample-config` default hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.2.0 hooks: - id: check-added-large-files - id: end-of-file-fixer From 0e4f74d8f540f3ecf5590d93cafa8c200ec8be17 Mon Sep 17 00:00:00 2001 From: neilnaveen <42328488+neilnaveen@users.noreply.github.com> Date: Thu, 14 Apr 2022 00:08:38 +0000 Subject: [PATCH 5/9] Set permissions for GitHub actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com> --- .github/workflows/docker-amd64.yml | 3 +++ .github/workflows/pre-commit.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/docker-amd64.yml b/.github/workflows/docker-amd64.yml index 05010afd..90d7ce2d 100644 --- a/.github/workflows/docker-amd64.yml +++ b/.github/workflows/docker-amd64.yml @@ -48,6 +48,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build-test-amd64-images: name: Build and test amd64 Docker Images diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index e138699e..b3bdb929 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -8,6 +8,9 @@ on: - master workflow_dispatch: +permissions: + contents: read + jobs: run-hooks: name: Run pre-commit hooks From 900c5b3ca5f2b5f65827c968b976e4c83f18e16b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 14 Apr 2022 16:35:24 +0300 Subject: [PATCH 6/9] Filter docs.github.com links in linkcheck --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py b/docs/conf.py index 10c0f53b..ba87f0f8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -91,6 +91,7 @@ myst_heading_anchors = 3 linkcheck_ignore = [ r".*github\.com.*#", # javascript based anchors + r"https://docs.github\.com/.*", # 403 error r"http://127\.0\.0\.1:49153/.*", # example r"https://mybinder\.org/v2/gh/.*", # lots of 500 errors ] From 78e6a669da65782af705a3aad547817b7e542e4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 16:07:05 +0000 Subject: [PATCH 7/9] Bump stefanzweifel/git-auto-commit-action from 4.14.0 to 4.14.1 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.14.0 to 4.14.1. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/c4b132ec2c77a21fcab564bd3c92610cee84b894...49620cd3ed21ee620a48530e81dba0d139c9cb80) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 98ee1ceb..d3d8ad34 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -108,7 +108,7 @@ jobs: - name: Push Wiki to GitHub if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.event_name == 'schedule' - uses: stefanzweifel/git-auto-commit-action@c4b132ec2c77a21fcab564bd3c92610cee84b894 # dependabot updates to latest release + uses: stefanzweifel/git-auto-commit-action@49620cd3ed21ee620a48530e81dba0d139c9cb80 # dependabot updates to latest release with: commit_message: "Automated wiki publish for ${{github.sha}}" repository: wiki/ From e9c993f055a0b608d2c95772c721d1742e2ff9d8 Mon Sep 17 00:00:00 2001 From: Alexander Manley Date: Tue, 19 Apr 2022 12:23:32 -0400 Subject: [PATCH 8/9] Update recipes.md Delta 1.2 was released. Important key improvements were made. --- docs/using/recipes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/using/recipes.md b/docs/using/recipes.md index 5048d489..7caec101 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -513,7 +513,7 @@ By adding the properties to `spark-defaults.conf`, the user no longer needs to e ```dockerfile FROM jupyter/pyspark-notebook:latest -ARG DELTA_CORE_VERSION="1.1.0" +ARG DELTA_CORE_VERSION="1.2.0" RUN pip install --quiet --no-cache-dir delta-spark==${DELTA_CORE_VERSION} && \ fix-permissions "${HOME}" && \ fix-permissions "${CONDA_DIR}" From f8815656758dc9f55e1a439c42b1888974dd57ef Mon Sep 17 00:00:00 2001 From: yacchin1205 <968739+yacchin1205@users.noreply.github.com> Date: Fri, 22 Apr 2022 02:10:24 +0000 Subject: [PATCH 9/9] Fix healthcheck for JupyterHub --- base-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 72d58605..944a7db6 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -175,7 +175,7 @@ RUN sed -re "s/c.ServerApp/c.NotebookApp/g" \ # This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server` and `retro` jupyter commands # https://github.com/jupyter/docker-stacks/issues/915#issuecomment-1068528799 HEALTHCHECK --interval=15s --timeout=3s --start-period=5s --retries=3 \ - CMD wget -O- --no-verbose --tries=1 http://localhost:8888/api || exit 1 + CMD wget -O- --no-verbose --tries=1 http://localhost:8888${JUPYTERHUB_SERVICE_PREFIX:-/}api || exit 1 # Switch back to jovyan to avoid accidental container runs as root USER ${NB_UID}