From 7c04f55b401c5c5db82a51a77dc350660f3775a2 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 2 Jan 2021 09:18:16 -0500 Subject: [PATCH 1/4] unskip py36, add pip check, some metadata --- recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db461bb..e46affa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,6 @@ build: entry_points: - jupyter-server = jupyter_server.serverapp:main - jupyter-bundlerextension = jupyter_server.bundlerextensions:main - skip: true # [py36] requirements: host: @@ -40,13 +39,16 @@ requirements: - anyio >=2.0.2 test: + requires: + - pip commands: + - pip check - jupyter server -h imports: - jupyter_server about: - home: http://jupyter.org + home: https://jupyter.org license: BSD-3-Clause license_family: BSD license_file: COPYING.md @@ -61,3 +63,4 @@ extra: - blink1073 - minrk - jasongrout + - bollwyvl From 4ff76286d2d6f2fd501cf7c1c6b3e1d5ceb41008 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 2 Jan 2021 09:19:14 -0500 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.6, and conda-forge-pinning 2021.01.01.16.59.39 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ .azure-pipelines/azure-pipelines-win.yml | 3 ++ .../linux_64_python3.6.____73_pypy.yaml | 16 ++++++++ .../linux_64_python3.6.____cpython.yaml | 16 ++++++++ .ci_support/osx_64_python3.6.____73_pypy.yaml | 16 ++++++++ .ci_support/osx_64_python3.6.____cpython.yaml | 16 ++++++++ .ci_support/win_64_python3.6.____cpython.yaml | 12 ++++++ .github/CODEOWNERS | 2 +- .scripts/run_docker_build.sh | 12 ++++-- README.md | 38 ++++++++++++++++++- 11 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 .ci_support/linux_64_python3.6.____73_pypy.yaml create mode 100644 .ci_support/linux_64_python3.6.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.6.____73_pypy.yaml create mode 100644 .ci_support/osx_64_python3.6.____cpython.yaml create mode 100644 .ci_support/win_64_python3.6.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 42fcddf..2c73985 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,6 +8,14 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: + linux_64_python3.6.____73_pypy: + CONFIG: linux_64_python3.6.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_python3.6.____cpython: + CONFIG: linux_64_python3.6.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_python3.7.____cpython: CONFIG: linux_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 46f2d97..d4c9ef2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,6 +8,12 @@ jobs: vmImage: macOS-10.15 strategy: matrix: + osx_64_python3.6.____73_pypy: + CONFIG: osx_64_python3.6.____73_pypy + UPLOAD_PACKAGES: 'True' + osx_64_python3.6.____cpython: + CONFIG: osx_64_python3.6.____cpython + UPLOAD_PACKAGES: 'True' osx_64_python3.7.____cpython: CONFIG: osx_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ff6a2fa..5c854f7 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,6 +8,9 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: + win_64_python3.6.____cpython: + CONFIG: win_64_python3.6.____cpython + UPLOAD_PACKAGES: 'True' win_64_python3.7.____cpython: CONFIG: win_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.6.____73_pypy.yaml b/.ci_support/linux_64_python3.6.____73_pypy.yaml new file mode 100644 index 0000000..bd8513a --- /dev/null +++ b/.ci_support/linux_64_python3.6.____73_pypy.yaml @@ -0,0 +1,16 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_73_pypy +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml new file mode 100644 index 0000000..dea0f54 --- /dev/null +++ b/.ci_support/linux_64_python3.6.____cpython.yaml @@ -0,0 +1,16 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/osx_64_python3.6.____73_pypy.yaml b/.ci_support/osx_64_python3.6.____73_pypy.yaml new file mode 100644 index 0000000..e6f08de --- /dev/null +++ b/.ci_support/osx_64_python3.6.____73_pypy.yaml @@ -0,0 +1,16 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_73_pypy +target_platform: +- osx-64 diff --git a/.ci_support/osx_64_python3.6.____cpython.yaml b/.ci_support/osx_64_python3.6.____cpython.yaml new file mode 100644 index 0000000..e5f17c2 --- /dev/null +++ b/.ci_support/osx_64_python3.6.____cpython.yaml @@ -0,0 +1,16 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- osx-64 diff --git a/.ci_support/win_64_python3.6.____cpython.yaml b/.ci_support/win_64_python3.6.____cpython.yaml new file mode 100644 index 0000000..96be81f --- /dev/null +++ b/.ci_support/win_64_python3.6.____cpython.yaml @@ -0,0 +1,12 @@ +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- win-64 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f5137df..bfa274c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @SylvainCorlay @blink1073 @jasongrout @maartenbreddels @minrk \ No newline at end of file +* @SylvainCorlay @blink1073 @bollwyvl @jasongrout @maartenbreddels @minrk \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..36dacd6 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ diff --git a/README.md b/README.md index 33d3037..4903d3d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About jupyter_server ==================== -Home: http://jupyter.org +Home: https://jupyter.org Package license: BSD-3-Clause @@ -31,6 +31,20 @@ Current build status + + + + + + + + + + + + + + +
VariantStatus
linux_64_python3.6.____73_pypy + + variant + +
linux_64_python3.6.____cpython + + variant + +
linux_64_python3.7.____cpython @@ -51,6 +65,20 @@ Current build status variant
osx_64_python3.6.____73_pypy + + variant + +
osx_64_python3.6.____cpython + + variant + +
osx_64_python3.7.____cpython @@ -72,6 +100,13 @@ Current build status variant
win_64_python3.6.____cpython + + variant + +
win_64_python3.7.____cpython @@ -195,6 +230,7 @@ Feedstock Maintainers * [@SylvainCorlay](https://github.com/SylvainCorlay/) * [@blink1073](https://github.com/blink1073/) +* [@bollwyvl](https://github.com/bollwyvl/) * [@jasongrout](https://github.com/jasongrout/) * [@maartenbreddels](https://github.com/maartenbreddels/) * [@minrk](https://github.com/minrk/) From c119393cc1da9c04201a76ef592d16c24224e509 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 2 Jan 2021 09:20:22 -0500 Subject: [PATCH 3/4] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e46affa..a3ee7f6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv entry_points: - jupyter-server = jupyter_server.serverapp:main From 25cdd02487e9b6a10ef15aecc248fc71524c7567 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 2 Jan 2021 10:50:55 -0500 Subject: [PATCH 4/4] remove tests folder before build --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a3ee7f6..2874d18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,10 @@ source: build: number: 1 - script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv + script: + # TODO: re-PR this again upstream + - {{ PYTHON }} -c "__import__('shutil').rmtree('tests')" + - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv entry_points: - jupyter-server = jupyter_server.serverapp:main - jupyter-bundlerextension = jupyter_server.bundlerextensions:main