From e0f96f889d8f0aff661306432ad445d9629503e4 Mon Sep 17 00:00:00 2001 From: Lowell Torola Date: Thu, 4 Dec 2025 10:30:52 -0500 Subject: [PATCH 1/4] upgrade python to 3_12 --- backend/environment.yml | 8 ++++---- environment-dev.yml | 20 ++++++++++---------- pyproject.toml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/environment.yml b/backend/environment.yml index 937f27691..7c266e461 100644 --- a/backend/environment.yml +++ b/backend/environment.yml @@ -12,11 +12,11 @@ dependencies: - google-cloud-secret-manager=2.12.6 - google-cloud-storage=2.5.0 - gunicorn=20.1.0 - - openssl=3.0.5 - - pillow=9.0.1 - - pip=22.3 + - openssl + - pillow>=9.0 + - pip>=22.3 - psycopg2=2.9.3 - - python=3.10 + - python=3.12 - pip: - django-anymail==8.6 - django-configurations==2.4 diff --git a/environment-dev.yml b/environment-dev.yml index fa54415d4..52c70b4ad 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -2,10 +2,10 @@ name: galaxy channels: - conda-forge dependencies: - - black=22.10.0 - - ca-certificates=2022.9.24 + - black>=23.0 + - ca-certificates - click<8.1.0 - - coverage=6.5.0 + - coverage>=7.0 - django=4.1.2 - django-cors-headers=3.13.0 - django-stubs<1.12.0 @@ -18,16 +18,16 @@ dependencies: - google-cloud-secret-manager=2.12.6 - google-cloud-storage=2.5.0 - isort=5.10.1 - - mypy=0.942 + - mypy>=1.0 - nodejs=20 - openjdk=11 - - openssl>=3.0.15 - - pillow=9.0.1 - - pip=22.3 - - pre_commit=2.20.0 + - openssl + - pillow>=9.0 + - pip>=22.3 + - pre_commit>=2.20 - psycopg2=2.9.3 - - python=3.10 - - pyupgrade=3.1.0 + - python=3.12 + - pyupgrade>=3.1 - terraform=1.3.4 - pip: - django-anymail==8.6 diff --git a/pyproject.toml b/pyproject.toml index a77768f0d..8b09b9589 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ multi_line_output = 3 line_length = 88 [tool.mypy] -python_version = "3.10" +python_version = "3.12" mypy_path = "backend" ignore_missing_imports = true scripts_are_modules = true From e0e3d1a947515d42a56429c75cc5342b096e0bd0 Mon Sep 17 00:00:00 2001 From: Lowell Torola Date: Thu, 4 Dec 2025 10:37:18 -0500 Subject: [PATCH 2/4] fix problematic django deps --- backend/environment.yml | 10 +++++----- environment-dev.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/environment.yml b/backend/environment.yml index 7c266e461..16bd52baf 100644 --- a/backend/environment.yml +++ b/backend/environment.yml @@ -2,11 +2,11 @@ name: siarnaq channels: - conda-forge dependencies: - - ca-certificates=2022.9.24 - - django=4.1.2 - - django-cors-headers=3.13.0 - - djangorestframework=3.14.0 - - drf-spectacular=0.24.2 + - ca-certificates + - django>=4.2,<5.0 + - django-cors-headers>=3.13.0 + - djangorestframework>=3.14.0 + - drf-spectacular>=0.24.2 - google-auth=2.13.0 - google-cloud-pubsub=2.13.10 - google-cloud-secret-manager=2.12.6 diff --git a/environment-dev.yml b/environment-dev.yml index 52c70b4ad..d1762451f 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -6,11 +6,11 @@ dependencies: - ca-certificates - click<8.1.0 - coverage>=7.0 - - django=4.1.2 - - django-cors-headers=3.13.0 - - django-stubs<1.12.0 - - djangorestframework=3.14.0 - - drf-spectacular=0.24.2 + - django>=4.2,<5.0 + - django-cors-headers>=3.13.0 + - django-stubs>=1.12.0 + - djangorestframework>=3.14.0 + - drf-spectacular>=0.24.2 - flake8=5.0.4 - go=1.18.5 - google-auth=2.13.0 From affe5dee4db7d4e7c44556d6d86b5ef25c59f535 Mon Sep 17 00:00:00 2001 From: Lowell Torola Date: Sun, 7 Dec 2025 12:21:58 -0500 Subject: [PATCH 3/4] attempt at fixing numerous django deps --- backend/environment.yml | 42 +++++++++++++++++------------------ environment-dev.yml | 49 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/backend/environment.yml b/backend/environment.yml index 16bd52baf..eb07fb3d2 100644 --- a/backend/environment.yml +++ b/backend/environment.yml @@ -3,30 +3,30 @@ channels: - conda-forge dependencies: - ca-certificates - - django>=4.2,<5.0 - - django-cors-headers>=3.13.0 - - djangorestframework>=3.14.0 - - drf-spectacular>=0.24.2 - - google-auth=2.13.0 - - google-cloud-pubsub=2.13.10 - - google-cloud-secret-manager=2.12.6 - - google-cloud-storage=2.5.0 - - gunicorn=20.1.0 + - gunicorn>=20.1.0 - openssl - pillow>=9.0 - pip>=22.3 - psycopg2=2.9.3 - python=3.12 - pip: - - django-anymail==8.6 - - django-configurations==2.4 - - django-countries==7.4.2 - - django-import-export==3.0.2 - - django-sortedm2m==3.1.1 - - django-storages[google]==1.13.1 - - django-structlog==4.0.1 - - django_rest_passwordreset==1.3.0 - - djangorestframework-simplejwt==5.2.2 - - google-cloud-scheduler==2.7.3 - - google-cloud-tasks==2.12.0 - - requests==2.28.1 + - django>=4.2,<5.0 + - django-anymail>=8.6 + - django-configurations>=2.4 + - django-cors-headers>=3.13.0 + - django-countries>=7.4.2 + - django-import-export>=3.0.2 + - django-sortedm2m>=3.1.1 + - django-storages[google]>=1.13.1 + - django-structlog>=4.0.1 + - django_rest_passwordreset>=1.3.0 + - djangorestframework>=3.14.0 + - djangorestframework-simplejwt>=5.2.2 + - drf-spectacular>=0.24.2 + - google-auth>=2.13.0 + - google-cloud-pubsub>=2.13.10 + - google-cloud-scheduler>=2.7.3 + - google-cloud-secret-manager>=2.12.6 + - google-cloud-storage>=2.5.0 + - google-cloud-tasks>=2.12.0 + - requests>=2.28.1 diff --git a/environment-dev.yml b/environment-dev.yml index d1762451f..3d2fcee47 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -4,20 +4,10 @@ channels: dependencies: - black>=23.0 - ca-certificates - - click<8.1.0 - coverage>=7.0 - - django>=4.2,<5.0 - - django-cors-headers>=3.13.0 - - django-stubs>=1.12.0 - - djangorestframework>=3.14.0 - - drf-spectacular>=0.24.2 - - flake8=5.0.4 + - flake8>=5.0 - go=1.18.5 - - google-auth=2.13.0 - - google-cloud-pubsub=2.13.10 - - google-cloud-secret-manager=2.12.6 - - google-cloud-storage=2.5.0 - - isort=5.10.1 + - isort>=5.10 - mypy>=1.0 - nodejs=20 - openjdk=11 @@ -30,16 +20,25 @@ dependencies: - pyupgrade>=3.1 - terraform=1.3.4 - pip: - - django-anymail==8.6 - - django-configurations==2.4 - - django-countries==7.4.2 - - django-import-export==3.0.2 - - django-sortedm2m==3.1.1 - - django-storages[google]==1.13.1 - - django-structlog==4.0.1 - - django_rest_passwordreset==1.3.0 - - djangorestframework-simplejwt==5.2.2 - - google-cloud-scheduler==2.7.3 - - google-cloud-tasks==2.12.0 - - requests==2.28.1 - - types-requests==2.28.11.7 + - django>=4.2,<5.0 + - django-anymail>=8.6 + - django-configurations>=2.4 + - django-cors-headers>=3.13.0 + - django-countries>=7.4.2 + - django-import-export>=3.0.2 + - django-sortedm2m>=3.1.1 + - django-storages[google]>=1.13.1 + - django-structlog>=4.0.1 + - django-stubs>=1.12.0 + - django_rest_passwordreset>=1.3.0 + - djangorestframework>=3.14.0 + - djangorestframework-simplejwt>=5.2.2 + - drf-spectacular>=0.24.2 + - google-auth>=2.13.0 + - google-cloud-pubsub>=2.13.10 + - google-cloud-scheduler>=2.7.3 + - google-cloud-secret-manager>=2.12.6 + - google-cloud-storage>=2.5.0 + - google-cloud-tasks>=2.12.0 + - requests>=2.28.1 + - types-requests>=2.28.11 From 26c21964212df4b6346a54eaa2198f47dd069de3 Mon Sep 17 00:00:00 2001 From: Lowell Torola Date: Sun, 7 Dec 2025 12:29:45 -0500 Subject: [PATCH 4/4] random stab --- backend/environment.yml | 3 ++- environment-dev.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/environment.yml b/backend/environment.yml index eb07fb3d2..293e9ef72 100644 --- a/backend/environment.yml +++ b/backend/environment.yml @@ -6,9 +6,10 @@ dependencies: - gunicorn>=20.1.0 - openssl - pillow>=9.0 - - pip>=22.3 + - pip>=24.0 - psycopg2=2.9.3 - python=3.12 + - setuptools>=65.0 - pip: - django>=4.2,<5.0 - django-anymail>=8.6 diff --git a/environment-dev.yml b/environment-dev.yml index 3d2fcee47..ea8f206c7 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -13,10 +13,11 @@ dependencies: - openjdk=11 - openssl - pillow>=9.0 - - pip>=22.3 + - pip>=24.0 - pre_commit>=2.20 - psycopg2=2.9.3 - python=3.12 + - setuptools>=65.0 - pyupgrade>=3.1 - terraform=1.3.4 - pip: