From 67aec3714471950003d6b01f3f9b3c7bc93f7b66 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 15 Oct 2024 11:17:40 +0530 Subject: [PATCH 1/9] Test support for Python 3.13 in CI --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5e527e9aa5..77eb124dbb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,6 +35,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" fail-fast: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.python-version }} From aa69705717de795b0ac3d7ce13b1dedba0f934bd Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:43:20 +0100 Subject: [PATCH 2/9] update pydantic --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 75301b8549..2b2abbc30b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,8 @@ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Intended Audience :: Developers", "Intended Audience :: Education", "Intended Audience :: Information Technology", @@ -70,7 +72,7 @@ dependencies = [ "kubernetes==27.2.0", "pluggy==1.3.0", "prompt-toolkit==3.0.36", - "pydantic==2.4.2", + "pydantic==2.9.2", "pynacl==1.5.0", "python-keycloak>=3.9.0,<4.0.0", "questionary==2.0.0", From 4a0cfc4af48fd9d7ca2ccf324b8f408420156bd4 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:49:11 +0100 Subject: [PATCH 3/9] update depenencies --- .github/workflows/test.yaml | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 77eb124dbb..7f93b168c2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,6 +32,7 @@ jobs: strategy: matrix: python-version: + - "3.9" - "3.10" - "3.11" - "3.12" diff --git a/pyproject.toml b/pyproject.toml index 2b2abbc30b..6fa9773f34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ dependencies = [ "ruamel.yaml==0.18.6", "typer==0.9.0", "packaging==23.2", - "typing-extensions==4.11.0", + "typing-extensions>=4.11.0", ] [project.optional-dependencies] From 8d8d7068010d2e2b6da7e9174bd51ec912ab18d9 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:58:47 +0100 Subject: [PATCH 4/9] remove diagrams package --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6fa9773f34..a9a9b6d668 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,6 @@ dev = [ "black==22.3.0", "coverage[toml]", "dask-gateway", - "diagrams", "escapism", "importlib-metadata<5.0", "mypy==1.6.1", From 9f6129d9ac527346d096ff9c12a16ed661eb35c2 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:00:09 +0100 Subject: [PATCH 5/9] require python 3.9 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a9a9b6d668..18b44490ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ name = "nebari" dynamic = ["version"] description = "A Jupyter and Dask-powered open source data science platform." readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.9" license = "BSD-3-Clause" authors = [ { name = "Nebari development team", email = "internal-it@quansight.com" }, From b77177fe0be41d3cf82acb919388e0070374cf6c Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:10:00 +0100 Subject: [PATCH 6/9] allow updates for boto3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 18b44490ba..55ab5220c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dependencies = [ "azure-mgmt-containerservice==26.0.0", "azure-mgmt-resource==23.0.1", "bcrypt==4.0.1", - "boto3==1.34.63", + "boto3>=1.34.63", "cloudflare==2.11.7", "google-auth==2.31.0", "google-cloud-compute==1.19.1", From 8ba262e19da95833fbe738bcf6cf038897152560 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:15:03 +0100 Subject: [PATCH 7/9] allow upgrade of kubernetes --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 55ab5220c6..5c612f4b4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,7 +69,7 @@ dependencies = [ "google-cloud-storage==2.18.0", "grpc-google-iam-v1==0.13.1", "jinja2", - "kubernetes==27.2.0", + "kubernetes>=27.2.0", "pluggy==1.3.0", "prompt-toolkit==3.0.36", "pydantic==2.9.2", From 96a98e622ec6c92f9ba5091615ef7bc3194ad07b Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:18:45 +0100 Subject: [PATCH 8/9] remove 3.9 tests --- .github/workflows/test.yaml | 2 +- pyproject.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1bb9c38781..77eb124dbb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,6 +12,7 @@ on: push: branches: - main + - develop - release/\d{4}.\d{1,2}.\d{1,2} paths: - ".github/workflows/test.yaml" @@ -31,7 +32,6 @@ jobs: strategy: matrix: python-version: - - "3.9" - "3.10" - "3.11" - "3.12" diff --git a/pyproject.toml b/pyproject.toml index 5c612f4b4d..a9a9b6d668 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ name = "nebari" dynamic = ["version"] description = "A Jupyter and Dask-powered open source data science platform." readme = "README.md" -requires-python = ">=3.9" +requires-python = ">=3.10" license = "BSD-3-Clause" authors = [ { name = "Nebari development team", email = "internal-it@quansight.com" }, @@ -60,7 +60,7 @@ dependencies = [ "azure-mgmt-containerservice==26.0.0", "azure-mgmt-resource==23.0.1", "bcrypt==4.0.1", - "boto3>=1.34.63", + "boto3==1.34.63", "cloudflare==2.11.7", "google-auth==2.31.0", "google-cloud-compute==1.19.1", @@ -69,7 +69,7 @@ dependencies = [ "google-cloud-storage==2.18.0", "grpc-google-iam-v1==0.13.1", "jinja2", - "kubernetes>=27.2.0", + "kubernetes==27.2.0", "pluggy==1.3.0", "prompt-toolkit==3.0.36", "pydantic==2.9.2", From 21e85ebf2d7ee0ce0e8bed8584d386621f6e05df Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:37:14 +0100 Subject: [PATCH 9/9] remove develop branch from gha --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 77eb124dbb..35f3b80e85 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,7 +12,6 @@ on: push: branches: - main - - develop - release/\d{4}.\d{1,2}.\d{1,2} paths: - ".github/workflows/test.yaml"