From 727e146a0b402e1b22dfb84a0233a3354775b8a2 Mon Sep 17 00:00:00 2001 From: Victor San Kho Lin Date: Mon, 12 Aug 2024 14:23:27 +1000 Subject: [PATCH] Upgraded Django5.1 and bumped dependencies for MM, SRM, WFM services --- .../metadata-manager/deps/requirements-dev.txt | 2 +- .../deps/requirements-full.txt | 10 +++++++--- .../deps/requirements-slim.txt | 16 ++++++++-------- .../deps/requirements-test.txt | 8 +++++--- .../deps/requirements-dev.txt | 2 +- .../deps/requirements-test.txt | 10 ++++++---- .../sequence-run-manager/deps/requirements.txt | 18 ++++++++++-------- .../workflow-manager/deps/requirements-dev.txt | 2 +- .../deps/requirements-test.txt | 10 ++++++---- .../workflow-manager/deps/requirements.txt | 16 +++++++++------- 10 files changed, 54 insertions(+), 40 deletions(-) diff --git a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-dev.txt b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-dev.txt index 7da472204..16546034d 100644 --- a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-dev.txt +++ b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-dev.txt @@ -1,2 +1,2 @@ -r requirements-test.txt -django_extensions==3.2.3 +django_extensions diff --git a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-full.txt b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-full.txt index fb087ea56..d6cdd2eaf 100644 --- a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-full.txt +++ b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-full.txt @@ -2,8 +2,12 @@ -r requirements-slim.txt -pandas==2.2.1 -google-auth==2.29.0 -google-auth-oauthlib==1.2.0 +pandas==2.2.2 +google-auth==2.33.0 +google-auth-oauthlib==1.2.1 + +# NOTE: +# We can't bump `gspread` to v6 yet. As `gspread-pandas` required `gspread>=5.0.0, <6`. +# We are tracking this at upstream https://github.com/umccr/libumccr/issues/29 gspread==5.12.4 gspread-pandas==3.3.0 diff --git a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-slim.txt b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-slim.txt index 0c65dfd49..62e2cad70 100644 --- a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-slim.txt +++ b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-slim.txt @@ -3,19 +3,19 @@ aws-xray-sdk # intentionally leave out version, the daily release of this dep is ok djangorestframework==3.15.2 -Django==5.0.7 -django-cors-headers==4.3.1 +Django==5.1 +django-cors-headers==4.4.0 django-environ==0.11.2 -django-simple-history==3.5.0 +django-simple-history==3.7.0 drf-spectacular==0.27.2 # See psycopg[binary] or psycopg[c] impl https://www.psycopg.org/psycopg3/docs/basic/install.html -psycopg[binary]==3.1.18 +psycopg[binary]==3.2.1 Werkzeug==3.0.3 -libumccr==0.4.0rc3 -cachetools==5.3.3 -serverless-wsgi==3.0.3 +libumccr==0.4.0rc4 +cachetools==5.4.0 +serverless-wsgi==3.0.4 # six and regex required by automatically generated EventBridge code binding six==1.16.0 -regex==2023.12.25 +regex==2024.7.24 diff --git a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-test.txt b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-test.txt index ba45f2638..3d55cb2e1 100644 --- a/lib/workload/stateless/stacks/metadata-manager/deps/requirements-test.txt +++ b/lib/workload/stateless/stacks/metadata-manager/deps/requirements-test.txt @@ -1,7 +1,9 @@ -r requirements-full.txt -pytest==7.4.4 + +# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. +boto3 + +pytest==8.3.2 factory_boy==3.3.0 pytz==2024.1 mockito==1.5.0 -# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. -boto3 diff --git a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-dev.txt b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-dev.txt index 2407bcb94..3cc2e8d70 100644 --- a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-dev.txt +++ b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-dev.txt @@ -1,3 +1,3 @@ -r requirements-test.txt -django_extensions==3.2.3 +django_extensions openapi-spec-validator diff --git a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-test.txt b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-test.txt index 0e21e7935..3a3a55946 100644 --- a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-test.txt +++ b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements-test.txt @@ -1,8 +1,10 @@ -r requirements.txt -pytest==8.2.0 + +# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. +boto3 + +pytest==8.3.2 factory_boy==3.3.0 pytz==2024.1 mockito==1.5.0 -# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. -boto3 -coverage==7.5.1 +coverage==7.6.1 diff --git a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements.txt b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements.txt index 922946624..0dbb37e40 100644 --- a/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements.txt +++ b/lib/workload/stateless/stacks/sequence-run-manager/deps/requirements.txt @@ -1,22 +1,24 @@ # Intentionally leave out the xray version here. They bump like daily and latest is always fine. aws-xray-sdk + # Intentionally commented boto3. We can just leverage the AWS Lambda Python Runtime cache for boto3 and botocore. #boto3 -Django==5.0.7 + +Django==5.1 djangorestframework==3.15.2 -django-cors-headers==4.3.1 +django-cors-headers==4.4.0 django-environ==0.11.2 djangorestframework-camel-case==1.4.2 drf-spectacular==0.27.2 # See psycopg[binary] or psycopg[c] impl https://www.psycopg.org/psycopg3/docs/basic/install.html -psycopg[binary]==3.1.18 +psycopg[binary]==3.2.1 Werkzeug==3.0.3 -libica==2.4.0 -libumccr==0.4.0rc3 -cachetools==5.3.3 -serverless-wsgi==3.0.3 +libica==2.5.0 +libumccr==0.4.0rc4 +cachetools==5.4.0 +serverless-wsgi==3.0.4 # six and regex required by automatically generated EventBridge code binding # for sequencerunstatechange package six==1.16.0 -regex==2024.4.28 +regex==2024.7.24 diff --git a/lib/workload/stateless/stacks/workflow-manager/deps/requirements-dev.txt b/lib/workload/stateless/stacks/workflow-manager/deps/requirements-dev.txt index 2407bcb94..3cc2e8d70 100644 --- a/lib/workload/stateless/stacks/workflow-manager/deps/requirements-dev.txt +++ b/lib/workload/stateless/stacks/workflow-manager/deps/requirements-dev.txt @@ -1,3 +1,3 @@ -r requirements-test.txt -django_extensions==3.2.3 +django_extensions openapi-spec-validator diff --git a/lib/workload/stateless/stacks/workflow-manager/deps/requirements-test.txt b/lib/workload/stateless/stacks/workflow-manager/deps/requirements-test.txt index 0e21e7935..3a3a55946 100644 --- a/lib/workload/stateless/stacks/workflow-manager/deps/requirements-test.txt +++ b/lib/workload/stateless/stacks/workflow-manager/deps/requirements-test.txt @@ -1,8 +1,10 @@ -r requirements.txt -pytest==8.2.0 + +# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. +boto3 + +pytest==8.3.2 factory_boy==3.3.0 pytz==2024.1 mockito==1.5.0 -# Intentionally leave out the boto3 version here. They bump like daily and latest is always fine. -boto3 -coverage==7.5.1 +coverage==7.6.1 diff --git a/lib/workload/stateless/stacks/workflow-manager/deps/requirements.txt b/lib/workload/stateless/stacks/workflow-manager/deps/requirements.txt index ec35a3bd9..912901713 100644 --- a/lib/workload/stateless/stacks/workflow-manager/deps/requirements.txt +++ b/lib/workload/stateless/stacks/workflow-manager/deps/requirements.txt @@ -1,22 +1,24 @@ # Intentionally leave out the xray version here. They bump like daily and latest is always fine. aws-xray-sdk + # Intentionally commented boto3. We can just leverage the AWS Lambda Python Runtime cache for boto3 and botocore. #boto3 -Django==5.0.7 + +Django==5.1 djangorestframework==3.15.2 -django-cors-headers==4.3.1 +django-cors-headers==4.4.0 django-environ==0.11.2 djangorestframework-camel-case==1.4.2 drf-spectacular==0.27.2 # See psycopg[binary] or psycopg[c] impl https://www.psycopg.org/psycopg3/docs/basic/install.html -psycopg[binary]==3.1.18 +psycopg[binary]==3.2.1 Werkzeug==3.0.3 # libica==2.2.1 -libumccr==0.4.0rc3 -cachetools==5.3.3 -serverless-wsgi==3.0.3 +libumccr==0.4.0rc4 +cachetools==5.4.0 +serverless-wsgi==3.0.4 # six and regex required by automatically generated EventBridge code binding # for sequencerunstatechange package six==1.16.0 -regex==2024.4.28 +regex==2024.7.24