Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build (pyyaml) #273

Merged
merged 5 commits into from
Aug 4, 2023
Merged

Fix build (pyyaml) #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c94eb26
Update pyyaml, awscli, boto3, and botocore
ronardcaktus Jul 31, 2023
f7850ac
explcitly add PyYAML dependency to base requirements file, so we can …
dchukhin Aug 2, 2023
b7b252c
update generated requirements files based on changes to .in files
dchukhin Aug 2, 2023
6fec16d
temporarily enable CI to deploy this branch
dchukhin Aug 4, 2023
b6eb26f
revert temporary change to CI config file
dchukhin Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions requirements/base/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ django-compressor
django-taggit
django-ipware
django-import-export
pyyaml==6.0.1

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
Expand Down
10 changes: 6 additions & 4 deletions requirements/base/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev/dev.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dev requirements
-c ../base/base.txt

pyyaml
pyyaml==6.0.1
black==22.6.0
isort
ipython
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions requirements/dev/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down