From c94eb26fc44ee1685af50d273892b189b559862c Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Mon, 31 Jul 2023 20:45:36 +0000 Subject: [PATCH 1/5] Update pyyaml, awscli, boto3, and botocore --- requirements/base/base.in | 4 ++-- requirements/dev/dev.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/base/base.in b/requirements/base/base.in index 9bb5c9a2..d93e47f6 100644 --- a/requirements/base/base.in +++ b/requirements/base/base.in @@ -17,8 +17,8 @@ django-sass-processor django-phonenumber-field django-honeypot whitenoise -boto3==1.26.87 -botocore==1.29.87 +boto3==1.28.4 +botocore==1.31.4 libsass phonenumberslite pdfid diff --git a/requirements/dev/dev.in b/requirements/dev/dev.in index 9a11bfe9..651bcc2d 100644 --- a/requirements/dev/dev.in +++ b/requirements/dev/dev.in @@ -1,7 +1,7 @@ # Dev requirements -c ../base/base.txt -pyyaml +pyyaml==6.0.1 black==22.6.0 isort ipython @@ -12,7 +12,7 @@ ansible==7.6.0 invoke-kubesae==0.1.0 # AWS tools -awscli==1.27.87 +awscli==1.29.4 awslogs Jinja2==3.0.3 openshift==0.12 From f7850ac26c59629240d05a0c54682d6aebbd063e Mon Sep 17 00:00:00 2001 From: Dmitriy Chukhin Date: Tue, 1 Aug 2023 22:12:33 -0400 Subject: [PATCH 2/5] explcitly add PyYAML dependency to base requirements file, so we can guarantee using version>6 --- requirements/base/base.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/base/base.in b/requirements/base/base.in index d93e47f6..99d819cd 100644 --- a/requirements/base/base.in +++ b/requirements/base/base.in @@ -11,6 +11,7 @@ django-compressor django-taggit django-ipware django-import-export +pyyaml==6.0.1 django-sass-processor From b7b252cb9f7632ec7c546d5783e5c30f3672fbcf Mon Sep 17 00:00:00 2001 From: Dmitriy Chukhin Date: Tue, 1 Aug 2023 22:14:13 -0400 Subject: [PATCH 3/5] update generated requirements files based on changes to .in files --- requirements/base/base.txt | 10 ++++++---- requirements/dev/dev.txt | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/requirements/base/base.txt b/requirements/base/base.txt index 2d5e739c..8e1f8619 100644 --- a/requirements/base/base.txt +++ b/requirements/base/base.txt @@ -10,9 +10,9 @@ asgiref==3.3.4 # via django beautifulsoup4==4.8.2 # via wagtail -boto3==1.26.87 +boto3==1.28.4 # via -r requirements/base/base.in -botocore==1.29.87 +botocore==1.31.4 # via # -r requirements/base/base.in # boto3 @@ -137,8 +137,10 @@ pytz==2021.1 # django # django-modelcluster # l18n -pyyaml==5.4.1 - # via tablib +pyyaml==6.0.1 + # via + # -r requirements/base/base.in + # tablib rcssmin==1.0.6 # via django-compressor requests==2.25.1 diff --git a/requirements/dev/dev.txt b/requirements/dev/dev.txt index aca21fad..39509086 100644 --- a/requirements/dev/dev.txt +++ b/requirements/dev/dev.txt @@ -33,7 +33,7 @@ attrs==20.3.0 # via # jsonschema # pytest -awscli==1.27.87 +awscli==1.29.4 # via -r requirements/dev/dev.in awslogs==0.14.0 # via -r requirements/dev/dev.in @@ -49,12 +49,12 @@ black==22.6.0 # via -r requirements/dev/dev.in bleach==3.3.0 # via nbconvert -boto3==1.26.87 +boto3==1.28.4 # via # -c requirements/dev/../base/base.txt # awslogs # invoke-kubesae -botocore==1.29.87 +botocore==1.31.4 # via # -c requirements/dev/../base/base.txt # awscli @@ -294,7 +294,7 @@ openpyxl==3.1.2 # via # -c requirements/dev/../base/base.txt # wagtail -openshift==0.12 +openshift==0.12.0 # via -r requirements/dev/dev.in packaging==20.9 # via @@ -395,7 +395,7 @@ pytz==2021.1 # django # django-modelcluster # l18n -pyyaml==5.4.1 +pyyaml==6.0.1 # via # -c requirements/dev/../base/base.txt # -r requirements/dev/dev.in From 6fec16d447a9b2590e018c2ef575a8f89df0e8cc Mon Sep 17 00:00:00 2001 From: Dmitriy Chukhin Date: Fri, 4 Aug 2023 09:47:24 -0400 Subject: [PATCH 4/5] temporarily enable CI to deploy this branch --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5df0e159..4ae82fff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,6 +5,7 @@ on: branches: - main - develop + - pyyaml-fix jobs: deploy: From b6eb26f8e442c404c0b98718dcf4d1188e295161 Mon Sep 17 00:00:00 2001 From: Dmitriy Chukhin Date: Fri, 4 Aug 2023 09:53:23 -0400 Subject: [PATCH 5/5] revert temporary change to CI config file --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ae82fff..5df0e159 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,7 +5,6 @@ on: branches: - main - develop - - pyyaml-fix jobs: deploy: