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.

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

Upgrade to Django 3.2 #3786

Merged
merged 22 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c358471
Update pip dependencies
noliveleger Apr 28, 2022
7843e1a
Use default "DEFAULT_AUTO_FIELD"
noliveleger Apr 28, 2022
68290d4
Replace deprecated "django.contrib.postgres.fields.JSONField" with "d…
noliveleger Apr 28, 2022
ad71795
Fix migration hack
noliveleger May 3, 2022
b263ebe
Fix KoboS3Storage deprecated bucket and acl arguments
noliveleger May 3, 2022
0c9e5e8
Make LazyDefaultJsonbField work with new models.JSONField
noliveleger May 3, 2022
e71cd35
Fix export tests
noliveleger May 3, 2022
ba6c69d
New package-lock.json
noliveleger May 3, 2022
2ca6334
Remove duplicated and wrong STATICFILES_DIR settings
noliveleger May 3, 2022
7f5878f
Make dependencies consistent with KoBoCAT
noliveleger May 3, 2022
88be069
Merge branch 'beta' into upgrade-to-django3.2
noliveleger May 3, 2022
31e934d
Merge branch 'beta' into upgrade-to-django3.2
noliveleger May 3, 2022
73bd69e
Merge branch 'beta' into upgrade-to-django3.2
noliveleger May 4, 2022
00359cc
Merge branch 'beta' into upgrade-to-django3.2
noliveleger May 16, 2022
8711c2c
Merge branch 'beta' into upgrade-to-django3.2
noliveleger May 25, 2022
9a9e092
Restore sentry-dsk dependency
noliveleger Jun 1, 2022
2d6a246
Merge branch 'beta' into upgrade-to-django3.2
noliveleger Jun 7, 2022
9805d92
Merge branch 'beta' into upgrade-to-django3.2
noliveleger Jun 28, 2022
79bce04
Merge branch 'beta' into upgrade-to-django3.2
noliveleger Jul 29, 2022
d7d37dc
Apply requested changes for PR#3786
noliveleger Jul 29, 2022
84531a7
Merge branch 'beta' into upgrade-to-django3.2
noliveleger Aug 2, 2022
1909a7b
Update Django 3.2 pip requirement
noliveleger Aug 16, 2022
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN python -m venv "$VIRTUAL_ENV"
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
RUN pip install --quiet pip==22.0.4 && \
pip install --quiet pip-tools
COPY ./dependencies/pip/external_services.txt "/tmp/pip_dependencies.txt"
COPY ./dependencies/pip/requirements.txt "/tmp/pip_dependencies.txt"
RUN pip-sync "/tmp/pip_dependencies.txt" 1>/dev/null


Expand Down
36 changes: 21 additions & 15 deletions dependencies/pip/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
# via -r dependencies/pip/requirements.in
-e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
# via -r dependencies/pip/requirements.in
amqp==5.1.0
amqp==5.1.1
# via
# -r dependencies/pip/requirements.in
# kombu
asgiref==3.5.0
# via django
asttokens==2.0.5
# via stack-data
async-timeout==4.0.2
Expand All @@ -38,11 +40,11 @@ billiard==3.6.4.0
# via
# -r dependencies/pip/requirements.in
# celery
boto3==1.21.35
boto3==1.22.2
# via
# django-amazon-ses
# django-storages
botocore==1.24.35
botocore==1.25.2
# via
# boto3
# s3transfer
Expand All @@ -54,6 +56,7 @@ certifi==2021.10.8
# via
# msrest
# requests
# sentry-sdk
cffi==1.15.0
# via
# bcrypt
Expand All @@ -80,7 +83,7 @@ coverage[toml]==6.3.2
# pytest-cov
coveralls==3.3.1
# via -r dependencies/pip/dev_requirements.in
cryptography==36.0.2
cryptography==37.0.1
# via
# azure-storage-blob
# jwcrypto
Expand All @@ -104,7 +107,7 @@ dict2xml==1.7.1
# via -r dependencies/pip/requirements.in
dj-static==0.0.6
# via -r dependencies/pip/requirements.in
django==2.2.27
django==3.2.15
# via
# -r dependencies/pip/requirements.in
# django-amazon-ses
Expand Down Expand Up @@ -157,7 +160,7 @@ django-markitup==4.0.0
# via -r dependencies/pip/requirements.in
django-mptt==0.13.4
# via -r dependencies/pip/requirements.in
django-oauth-toolkit==1.7.1
django-oauth-toolkit==2.0.0
# via -r dependencies/pip/requirements.in
django-picklefield==3.0.1
# via django-constance
Expand All @@ -171,7 +174,7 @@ django-registration-redux==2.10
# via -r dependencies/pip/requirements.in
django-request-cache==1.2
# via -r dependencies/pip/requirements.in
django-reversion==3.0.1
django-reversion==5.0.0
# via -r dependencies/pip/requirements.in
django-storages[azure,boto3]==1.12.3
# via -r dependencies/pip/requirements.in
Expand Down Expand Up @@ -229,7 +232,7 @@ jsonfield==3.1.0
# via -r dependencies/pip/requirements.in
jsonschema==4.4.0
# via formpack
jwcrypto==1.0
jwcrypto==1.2
# via django-oauth-toolkit
kombu==5.2.4
# via
Expand Down Expand Up @@ -268,7 +271,7 @@ packaging==21.3
# mongomock
# pytest
# redis
paramiko==2.10.3
paramiko==2.10.4
# via fabric
parso==0.8.3
# via jedi
Expand All @@ -290,7 +293,7 @@ prompt-toolkit==3.0.29
# via
# click-repl
# ipython
psycopg2==2.8.6
psycopg2==2.9.3
# via -r dependencies/pip/requirements.in
ptyprocess==0.7.0
# via pexpect
Expand All @@ -304,7 +307,7 @@ pyasn1==0.4.8
# ndg-httpsclient
pycparser==2.21
# via cffi
pygments==2.11.2
pygments==2.12.0
# via
# -r dependencies/pip/requirements.in
# ipython
Expand All @@ -320,13 +323,13 @@ pyopenssl==22.0.0
# ndg-httpsclient
pyotp==2.6.0
# via django-trench
pyparsing==3.0.7
pyparsing==3.0.8
# via packaging
pyquery==1.4.3
# via formpack
pyrsistent==0.18.1
# via jsonschema
pytest==7.1.1
pytest==7.1.2
# via
# -r dependencies/pip/dev_requirements.in
# pytest-cov
Expand Down Expand Up @@ -381,6 +384,8 @@ s3transfer==0.5.2
# via boto3
sentinels==1.0.0
# via mongomock
sentry-sdk==1.5.12
# via -r dependencies/pip/requirements.in
shortuuid==1.0.8
# via -r dependencies/pip/requirements.in
six==1.16.0
Expand All @@ -394,7 +399,7 @@ six==1.16.0
# paramiko
# pathlib2
# python-dateutil
smsapi-client==2.5.0
smsapi-client==2.6.0
# via django-trench
sqlparse==0.4.2
# via
Expand All @@ -419,7 +424,7 @@ traitlets==5.1.1
# via
# ipython
# matplotlib-inline
twilio==7.8.0
twilio==7.8.2
# via django-trench
typing-extensions==4.2.0
# via azure-core
Expand All @@ -430,6 +435,7 @@ urllib3==1.26.9
# botocore
# requests
# responses
# sentry-sdk
uwsgi==2.0.20
# via -r dependencies/pip/requirements.in
vine==5.0.0
Expand Down
5 changes: 0 additions & 5 deletions dependencies/pip/external_services.in

This file was deleted.

Loading