From b9024f4278a637ceaa0bffd374bc5b99508137f1 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 15 May 2025 18:13:11 +0200 Subject: [PATCH 1/8] Create the conda environment after downloading the extension artifacts --- .github/workflows/build.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 383bfb3c2..79d534426 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -250,18 +250,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install Conda environment with Micromamba - uses: mamba-org/setup-micromamba@v2 - with: - micromamba-version: '1.5.5-0' - environment-name: build-env - create-args: >- - python=3.10 - pip - jupyterlite-core - jupyterlite-xeus - jupyter_server - - name: Download extension package uses: actions/download-artifact@v4 with: @@ -270,7 +258,7 @@ jobs: - name: debug run: ls - - name: Install the extension + - name: Download the extension artifacts shell: bash -l {0} run: | set -eux @@ -280,6 +268,18 @@ jobs: cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl + - name: Install Conda environment with Micromamba + uses: mamba-org/setup-micromamba@v2 + with: + micromamba-version: '1.5.5-0' + environment-name: build-env + create-args: >- + python=3.10 + pip + jupyterlite-core + jupyterlite-xeus + jupyter_server + - name: Build JupyterLite shell: bash -l {0} working-directory: lite From c2fd9ab50dd5f4f49dd2d5772d78fb5e2d51724c Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Thu, 15 May 2025 21:50:07 +0530 Subject: [PATCH 2/8] Remove fallback --- packages/base/src/tools.ts | 7 +------ python/jupytergis_core/src/jgisplugin/plugins.ts | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/base/src/tools.ts b/packages/base/src/tools.ts index 59aa534cd..2767c8ca7 100644 --- a/packages/base/src/tools.ts +++ b/packages/base/src/tools.ts @@ -394,13 +394,8 @@ const fetchWithProxies = async ( model: IJupyterGISModel, parseResponse: (response: Response) => Promise ): Promise => { - let settings: any = null; - try { - settings = await model.getSettings(); - } catch (e) { - console.warn('Failed to get settings from model. Falling back.', e); - } + const settings = await model.getSettings(); const proxyUrl = settings && settings.proxyUrl ? settings.proxyUrl : 'https://corsproxy.io'; diff --git a/python/jupytergis_core/src/jgisplugin/plugins.ts b/python/jupytergis_core/src/jgisplugin/plugins.ts index 3c3b54e54..cd96e320a 100644 --- a/python/jupytergis_core/src/jgisplugin/plugins.ts +++ b/python/jupytergis_core/src/jgisplugin/plugins.ts @@ -62,12 +62,8 @@ const activate = async ( let settings: ISettingRegistry.ISettings | null = null; - try { - settings = await settingRegistry.load(SETTINGS_ID); - console.log(`Loaded settings for ${SETTINGS_ID}`, settings); - } catch (error) { - console.warn(`Failed to load settings for ${SETTINGS_ID}`, error); - } + settings = await settingRegistry.load(SETTINGS_ID); + console.log(`Loaded settings for ${SETTINGS_ID}`, settings); const widgetFactory = new JupyterGISDocumentWidgetFactory({ name: FACTORY, From 0482b10ad6bd86d2ef3cafbd1631542565660bdd Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 15 May 2025 18:30:03 +0200 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79d534426..c7477d816 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -250,24 +250,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Download extension package - uses: actions/download-artifact@v4 - with: - name: extension-artifacts - - name: debug run: ls - - name: Download the extension artifacts - shell: bash -l {0} - run: | - set -eux - cp ./jupytergis_core/dist/jupytergis*.whl jupytergis_core-0.0.1-py3-none-any.whl - cp ./jupytergis_lab/dist/jupytergis*.whl jupytergis_lab-0.0.1-py3-none-any.whl - cp ./jupytergis_qgis/dist/jupytergis*.whl jupytergis_qgis-0.0.1-py3-none-any.whl - cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl - cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl - - name: Install Conda environment with Micromamba uses: mamba-org/setup-micromamba@v2 with: @@ -280,6 +265,17 @@ jobs: jupyterlite-xeus jupyter_server + - name: Download extension package + uses: actions/download-artifact@v4 + with: + name: extension-artifacts + + - name: Install the extension artifacts + shell: bash -l {0} + run: | + set -eux + pip install /jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl + - name: Build JupyterLite shell: bash -l {0} working-directory: lite From 76e8370c08b0de3053a762e1d71137ad4964f303 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Thu, 15 May 2025 22:11:07 +0530 Subject: [PATCH 4/8] bring back whl files --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7477d816..4d3ea5b1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,7 +174,11 @@ jobs: shell: bash -l {0} run: | set -eux - cp ./jupytergis/dist/jupytergis*.whl ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl . + cp ./jupytergis_core/dist/jupytergis*.whl jupytergis_core-0.0.1-py3-none-any.whl + cp ./jupytergis_lab/dist/jupytergis*.whl jupytergis_lab-0.0.1-py3-none-any.whl + cp ./jupytergis_qgis/dist/jupytergis*.whl jupytergis_qgis-0.0.1-py3-none-any.whl + cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl + cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl python -m pip install jupytergis*.whl "jupyter-collaboration>=3,<4" "jupyterlab>=4.3,<5" - name: Install From 6e289c4b242ed6cc26ccb5de85196ae4fecccd26 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 15 May 2025 18:47:43 +0200 Subject: [PATCH 5/8] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d3ea5b1b..dd73837a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -278,7 +278,7 @@ jobs: shell: bash -l {0} run: | set -eux - pip install /jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl + pip install ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl - name: Build JupyterLite shell: bash -l {0} From 73be8fe5fbb8f626343739f57d5bbb69595501e7 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Thu, 15 May 2025 22:44:18 +0530 Subject: [PATCH 6/8] revert mistaken change in integration test job --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd73837a6..03f8c56a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,11 +174,7 @@ jobs: shell: bash -l {0} run: | set -eux - cp ./jupytergis_core/dist/jupytergis*.whl jupytergis_core-0.0.1-py3-none-any.whl - cp ./jupytergis_lab/dist/jupytergis*.whl jupytergis_lab-0.0.1-py3-none-any.whl - cp ./jupytergis_qgis/dist/jupytergis*.whl jupytergis_qgis-0.0.1-py3-none-any.whl - cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl - cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl + cp ./jupytergis/dist/jupytergis*.whl ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl . python -m pip install jupytergis*.whl "jupyter-collaboration>=3,<4" "jupyterlab>=4.3,<5" - name: Install From 8dc2f23d046137b56c59b7127f50d2b7cf0ca99a Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Thu, 15 May 2025 23:02:56 +0530 Subject: [PATCH 7/8] copy wheels before installing --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03f8c56a6..840786c32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -274,6 +274,11 @@ jobs: shell: bash -l {0} run: | set -eux + cp ./jupytergis_core/dist/jupytergis*.whl jupytergis_core-0.0.1-py3-none-any.whl + cp ./jupytergis_lab/dist/jupytergis*.whl jupytergis_lab-0.0.1-py3-none-any.whl + cp ./jupytergis_qgis/dist/jupytergis*.whl jupytergis_qgis-0.0.1-py3-none-any.whl + cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl + cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl pip install ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl - name: Build JupyterLite From a3f1e791aacb4bfd6fd69abac05f97517f129c3f Mon Sep 17 00:00:00 2001 From: Arjun Verma Date: Thu, 15 May 2025 23:48:35 +0530 Subject: [PATCH 8/8] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 840786c32..5cb7acb57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -279,7 +279,7 @@ jobs: cp ./jupytergis_qgis/dist/jupytergis*.whl jupytergis_qgis-0.0.1-py3-none-any.whl cp ./jupytergis_lite/dist/jupytergis*.whl jupytergis_lite-0.0.1-py3-none-any.whl cp ./jupytergis/dist/jupytergis*.whl jupytergis-0.0.1-py3-none-any.whl - pip install ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl + pip install ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_lite/dist/jupytergis*.whl ./jupytergis/dist/jupytergis*.whl - name: Build JupyterLite shell: bash -l {0}