From 4934af01d192b791a7de74cd2b500b1b0bd07a38 Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Wed, 5 Apr 2023 15:07:03 -0700 Subject: [PATCH 01/12] added disclaimer about workspace memory limits --- .../platform_technical_documentation/create_workspace.ipynb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/platform_technical_documentation/create_workspace.ipynb b/docs/source/platform_technical_documentation/create_workspace.ipynb index a2c53d87..2ff2ba92 100644 --- a/docs/source/platform_technical_documentation/create_workspace.ipynb +++ b/docs/source/platform_technical_documentation/create_workspace.ipynb @@ -9,7 +9,9 @@ "\n", "![create workspace](../_static/create_workspace.png)\n", "\n", - "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. " + "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", + "\n", + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. " ] } ], From 353650e4a5edbe241b1eb8c7149deba4e8c7e086 Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Wed, 5 Apr 2023 15:07:03 -0700 Subject: [PATCH 02/12] added disclaimer about workspace memory limits --- docs/source/system_reference_guide/create_workspace.ipynb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/system_reference_guide/create_workspace.ipynb b/docs/source/system_reference_guide/create_workspace.ipynb index a2c53d87..2ff2ba92 100644 --- a/docs/source/system_reference_guide/create_workspace.ipynb +++ b/docs/source/system_reference_guide/create_workspace.ipynb @@ -9,7 +9,9 @@ "\n", "![create workspace](../_static/create_workspace.png)\n", "\n", - "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. " + "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", + "\n", + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. " ] } ], From 03d52834141e6f82f28b1729bc575a7bd5d0c030 Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Mon, 10 Apr 2023 08:31:06 -0700 Subject: [PATCH 03/12] added memory suggestion --- .../system_reference_guide/create_workspace.ipynb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/source/system_reference_guide/create_workspace.ipynb b/docs/source/system_reference_guide/create_workspace.ipynb index 2ff2ba92..ce2f445b 100644 --- a/docs/source/system_reference_guide/create_workspace.ipynb +++ b/docs/source/system_reference_guide/create_workspace.ipynb @@ -11,13 +11,13 @@ "\n", "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", "\n", - "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. " + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. For now, we suggest using 16GB (which means altering the devfile to `memory: 15258Mi`). " ] } ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3.11.1 64-bit", "language": "python", "name": "python3" }, @@ -31,7 +31,12 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.8" + "version": "3.11.1" + }, + "vscode": { + "interpreter": { + "hash": "5c7b89af1651d0b8571dde13640ecdccf7d5a6204171d6ab33e7c296e100e08a" + } } }, "nbformat": 4, From 49fe080bf9dd12f80763f1a2ce8954409c42c362 Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Wed, 5 Apr 2023 15:07:03 -0700 Subject: [PATCH 04/12] added disclaimer about workspace memory limits --- docs/source/system_reference_guide/create_workspace.ipynb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/system_reference_guide/create_workspace.ipynb b/docs/source/system_reference_guide/create_workspace.ipynb index a2c53d87..2ff2ba92 100644 --- a/docs/source/system_reference_guide/create_workspace.ipynb +++ b/docs/source/system_reference_guide/create_workspace.ipynb @@ -9,7 +9,9 @@ "\n", "![create workspace](../_static/create_workspace.png)\n", "\n", - "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. " + "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", + "\n", + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. " ] } ], From 9cbceaa01eae85c78e51d8a6e95ba062e83fcc6a Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Mon, 10 Apr 2023 08:31:06 -0700 Subject: [PATCH 05/12] added memory suggestion --- .../system_reference_guide/create_workspace.ipynb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/source/system_reference_guide/create_workspace.ipynb b/docs/source/system_reference_guide/create_workspace.ipynb index 2ff2ba92..ce2f445b 100644 --- a/docs/source/system_reference_guide/create_workspace.ipynb +++ b/docs/source/system_reference_guide/create_workspace.ipynb @@ -11,13 +11,13 @@ "\n", "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", "\n", - "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. " + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. For now, we suggest using 16GB (which means altering the devfile to `memory: 15258Mi`). " ] } ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3.11.1 64-bit", "language": "python", "name": "python3" }, @@ -31,7 +31,12 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.8" + "version": "3.11.1" + }, + "vscode": { + "interpreter": { + "hash": "5c7b89af1651d0b8571dde13640ecdccf7d5a6204171d6ab33e7c296e100e08a" + } } }, "nbformat": 4, From 9b50002f6eb2163c5180a02f9efe805eca438183 Mon Sep 17 00:00:00 2001 From: grallewellyn Date: Wed, 12 Apr 2023 10:46:22 -0700 Subject: [PATCH 06/12] added as a courtesy to other users... --- docs/source/system_reference_guide/create_workspace.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/system_reference_guide/create_workspace.ipynb b/docs/source/system_reference_guide/create_workspace.ipynb index ce2f445b..53e01633 100644 --- a/docs/source/system_reference_guide/create_workspace.ipynb +++ b/docs/source/system_reference_guide/create_workspace.ipynb @@ -11,7 +11,7 @@ "\n", "If you want to edit the devfile or your workspace's memory limit after its creation, just click on the `Workspaces` side panel tab, then the workspace, then the Devfile tab at the top of the page. \n", "\n", - "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. For now, we suggest using 16GB (which means altering the devfile to `memory: 15258Mi`). " + "**DISCLAIMER:** MAAP might change the way that we do workspace memory limits in the future, including restricting the memory that a user can allocate for their workspace. For now, as a courtesy to other users only increase the memory limit if your kernel keeps running out of memory and crashing. If you're not sure why your kernel is crashing after increasing your workspace's memory limit, please contact the development team. We recommend using a memory limit of 16GB (which means altering the devfile to `memory: 15258Mi`). " ] } ], From b9aaaecc65f8d9968f8deaa8933380cb105e6504 Mon Sep 17 00:00:00 2001 From: Alex Mandel Date: Thu, 4 May 2023 09:03:23 -0700 Subject: [PATCH 07/12] fix: test convert to rtd yml --- .readthedocs.yml | 20 ++++++++++++++++++++ readthedocs.yml | 4 ---- requirements.txt | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 .readthedocs.yml delete mode 100644 readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 00000000..001d4184 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,20 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: + version: 3.11 + +sphinx: + builder: html + configuration: docs/source/conf.py + +python: + install: + - requirements: requirements.txt + system_packages: true + +formats: + - epub + - pdf \ No newline at end of file diff --git a/readthedocs.yml b/readthedocs.yml deleted file mode 100644 index 11d4435b..00000000 --- a/readthedocs.yml +++ /dev/null @@ -1,4 +0,0 @@ -python: - version: 3.7 - install: - - requirements: requirements.txt diff --git a/requirements.txt b/requirements.txt index afbdfe3a..6e47c7fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ sphinx>=1.4 pandoc nbconvert -ipykernel~=6.4.1 +ipykernel>=6.4.1 nbsphinx sphinxcontrib-napoleon sphinx-rtd-theme -pystac-client~=0.3.2 +pystac-client>=0.6.0 h5py folium pandas From 0b0bbd025a86de624f9a6868fd2d7251744af994 Mon Sep 17 00:00:00 2001 From: Alex Mandel Date: Thu, 4 May 2023 13:42:16 -0700 Subject: [PATCH 08/12] chore: syntax error python version --- .readthedocs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 001d4184..43c409b2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,8 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: - version: 3.11 + python: "3.11" sphinx: builder: html From e9f5436a8a6184d28b139b63e6c03282d6516c5e Mon Sep 17 00:00:00 2001 From: Alex Mandel Date: Thu, 4 May 2023 15:39:34 -0700 Subject: [PATCH 09/12] chore: try forcing the python version to 3.11 --- .python-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .python-version diff --git a/.python-version b/.python-version deleted file mode 100644 index a0fc9e07..00000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.7.8 From 813e114bad5aa012af57ef4f33a69620f542c583 Mon Sep 17 00:00:00 2001 From: Alex Mandel Date: Thu, 4 May 2023 22:42:39 +0000 Subject: [PATCH 10/12] fix: specify setuptools version #186 --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..7a662d4a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools<60.0", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file From c0195a617f9769d137d3c85ea6c54061480495b6 Mon Sep 17 00:00:00 2001 From: Alex Mandel Date: Thu, 4 May 2023 22:48:59 +0000 Subject: [PATCH 11/12] fix: try system packages false --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 43c409b2..4df8a226 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,7 +12,7 @@ sphinx: python: install: - requirements: requirements.txt - system_packages: true + system_packages: false formats: - epub From dc8b608e7d96fd56ee2082a66e89004bc9269c86 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 9 May 2023 15:18:29 -0700 Subject: [PATCH 12/12] Delete trigger-gitlab.yml Action is not currently working and there are no current plans to use. --- .github/workflows/trigger-gitlab.yml | 40 ---------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/trigger-gitlab.yml diff --git a/.github/workflows/trigger-gitlab.yml b/.github/workflows/trigger-gitlab.yml deleted file mode 100644 index f7dca71e..00000000 --- a/.github/workflows/trigger-gitlab.yml +++ /dev/null @@ -1,40 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Trigger GitLab CI - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: - push: - branches: - - test-gitlab-trigger - pull_request: - branches: - - master - - develop - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "trigger-gitlab-pipeline" - trigger-gitlab-pipeline: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a set of commands using the runners shell - - name: Trigger GitLab CI - env: - GITLAB_CI_TRIGGER_URL: ${{ secrets.GITLAB_CI_TRIGGER_URL }} - GITLAB_CI_TRIGGER_TOKEN: ${{ secrets.GITLAB_CI_TRIGGER_TOKEN }} - run: | - echo Running on ref ${{ github.head_ref || github.ref_name }} - echo Trigger CI pipeline - curl -X POST \ - -F token=${GITLAB_CI_TRIGGER_TOKEN} \ - -F "ref=master" \ - -F "variables[GITHUB_REF]=${{ github.head_ref || github.ref_name }}" \ - ${GITLAB_CI_TRIGGER_URL}