Merge pull request #816 from kobotoolbox/django-storages-azure

Django storages upgrade + azure
kobotoolbox · May 4, 2022 · 361f81f · 361f81f
2 parents dfee086 + ba83a86
commit 361f81f
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 25 deletions.
diff --git a/dependencies/pip/dev.txt b/dependencies/pip/dev.txt
@@ -6,8 +6,6 @@
 #
 -e git+https://github.com/dimagi/django-digest@419f7306443f9a800b07d832b2cc147941062d59#egg=django_digest
     # via -r dependencies/pip/requirements.in
--e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages
-    # via -r dependencies/pip/requirements.in
 -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
     # via -r dependencies/pip/requirements.in
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
@@ -22,12 +20,16 @@ async-timeout==4.0.2
     # via redis
 attrs==21.4.0
     # via pytest
+azure-core==1.23.1
+    # via azure-storage-blob
+azure-storage-blob==12.11.0
+    # via django-storages
 backcall==0.2.0
     # via ipython
 billiard==3.6.4.0
     # via celery
 boto3==1.22.0
-    # via -r dependencies/pip/requirements.in
+    # via django-storages
 botocore==1.25.0
     # via
     #   boto3
@@ -38,6 +40,7 @@ celery[redis]==5.2.6
     #   django-celery-beat
 certifi==2021.10.8
     # via
+    #   msrest
     #   requests
     #   sentry-sdk
 cffi==1.15.0
@@ -57,7 +60,9 @@ click-plugins==1.1.1
 click-repl==0.2.0
     # via celery
 cryptography==36.0.2
-    # via jwcrypto
+    # via
+    #   azure-storage-blob
+    #   jwcrypto
 decorator==5.1.1
     # via
     #   ipdb
@@ -116,6 +121,8 @@ django-render-block==0.9.1
     # via django-templated-email
 django-reversion==3.0.1
     # via -r dependencies/pip/requirements.in
+django-storages[azure,boto3]==1.12.3
+    # via -r dependencies/pip/requirements.in
 django-taggit==2.1.0
     # via -r dependencies/pip/requirements.in
 django-templated-email==3.0.0
@@ -161,6 +168,8 @@ ipython==8.2.0
     # via
     #   -r dependencies/pip/dev.in
     #   ipdb
+isodate==0.6.1
+    # via msrest
 jedi==0.18.1
     # via ipython
 jmespath==1.0.0
@@ -187,10 +196,14 @@ modilabs-python-utils==0.1.5
     # via -r dependencies/pip/requirements.in
 mongomock==4.0.0
     # via -r dependencies/pip/dev.in
+msrest==0.6.21
+    # via azure-storage-blob
 numpy==1.22.3
     # via pandas
 oauthlib==3.2.0
-    # via django-oauth-toolkit
+    # via
+    #   django-oauth-toolkit
+    #   requests-oauthlib
 openpyxl==3.0.9
     # via
     #   -r dependencies/pip/requirements.in
@@ -266,8 +279,13 @@ redis==4.2.2
     #   django-redis-sessions
 requests==2.27.1
     # via
+    #   azure-core
     #   django-oauth-toolkit
     #   httmock
+    #   msrest
+    #   requests-oauthlib
+requests-oauthlib==1.3.1
+    # via msrest
 s3transfer==0.5.2
     # via boto3
 savreaderwriter @ https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip
@@ -283,9 +301,11 @@ simplejson==3.17.6
 six==1.16.0
     # via
     #   asttokens
+    #   azure-core
     #   click-repl
     #   djangorestframework-csv
     #   ecdsa
+    #   isodate
     #   mongomock
     #   python-dateutil
 sqlparse==0.4.2
@@ -304,6 +324,8 @@ traitlets==5.1.1
     # via
     #   ipython
     #   matplotlib-inline
+typing-extensions==4.2.0
+    # via azure-core
 unicodecsv==0.14.1
     # via djangorestframework-csv
 urllib3==1.26.9

diff --git a/dependencies/pip/prod.txt b/dependencies/pip/prod.txt
@@ -6,8 +6,6 @@
 #
 -e git+https://github.com/dimagi/django-digest@419f7306443f9a800b07d832b2cc147941062d59#egg=django_digest
     # via -r dependencies/pip/requirements.in
--e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages
-    # via -r dependencies/pip/requirements.in
 -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
     # via -r dependencies/pip/requirements.in
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
@@ -18,10 +16,14 @@ amqp==5.1.1
     #   kombu
 async-timeout==4.0.2
     # via redis
+azure-core==1.23.1
+    # via azure-storage-blob
+azure-storage-blob==12.11.0
+    # via django-storages
 billiard==3.6.4.0
     # via celery
 boto3==1.22.0
-    # via -r dependencies/pip/requirements.in
+    # via django-storages
 botocore==1.25.0
     # via
     #   boto3
@@ -32,6 +34,7 @@ celery[redis]==5.2.6
     #   django-celery-beat
 certifi==2021.10.8
     # via
+    #   msrest
     #   requests
     #   sentry-sdk
 cffi==1.15.0
@@ -51,7 +54,9 @@ click-plugins==1.1.1
 click-repl==0.2.0
     # via celery
 cryptography==36.0.2
-    # via jwcrypto
+    # via
+    #   azure-storage-blob
+    #   jwcrypto
 defusedxml==0.7.1
     # via
     #   djangorestframework-xml
@@ -106,6 +111,8 @@ django-render-block==0.9.1
     # via django-templated-email
 django-reversion==3.0.1
     # via -r dependencies/pip/requirements.in
+django-storages[azure,boto3]==1.12.3
+    # via -r dependencies/pip/requirements.in
 django-taggit==2.1.0
     # via -r dependencies/pip/requirements.in
 django-templated-email==3.0.0
@@ -139,6 +146,8 @@ gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 idna==3.3
     # via requests
+isodate==0.6.1
+    # via msrest
 jmespath==1.0.0
     # via
     #   boto3
@@ -157,10 +166,14 @@ markdown==3.3.6
     # via -r dependencies/pip/requirements.in
 modilabs-python-utils==0.1.5
     # via -r dependencies/pip/requirements.in
+msrest==0.6.21
+    # via azure-storage-blob
 numpy==1.22.3
     # via pandas
 oauthlib==3.2.0
-    # via django-oauth-toolkit
+    # via
+    #   django-oauth-toolkit
+    #   requests-oauthlib
 openpyxl==3.0.9
     # via
     #   -r dependencies/pip/requirements.in
@@ -205,7 +218,13 @@ redis==4.2.2
     #   celery
     #   django-redis-sessions
 requests==2.27.1
-    # via django-oauth-toolkit
+    # via
+    #   azure-core
+    #   django-oauth-toolkit
+    #   msrest
+    #   requests-oauthlib
+requests-oauthlib==1.3.1
+    # via msrest
 s3transfer==0.5.2
     # via boto3
 savreaderwriter @ https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip
@@ -216,14 +235,18 @@ simplejson==3.17.6
     # via -r dependencies/pip/requirements.in
 six==1.16.0
     # via
+    #   azure-core
     #   click-repl
     #   djangorestframework-csv
     #   ecdsa
+    #   isodate
     #   python-dateutil
 sqlparse==0.4.2
     # via django
 tlslite-ng==0.7.6
     # via gdata-python3
+typing-extensions==4.2.0
+    # via azure-core
 unicodecsv==0.14.1
     # via djangorestframework-csv
 urllib3==1.26.9

diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
@@ -12,14 +12,10 @@ https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip#
 # ssrf
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
 
-# jnm's django storages
-# Necessary to use this fork until the resolution of
-# https://github.com/jschneier/django-storages/issues/566
--e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages
-
 # Regular PyPI packages
 Django>=2.2,<2.3
 django-environ
+django-storages[azure,boto3]
 django-templated-email
 dpath
 gdata-python3
@@ -79,9 +75,6 @@ django-oauth-toolkit
 simplejson
 djangorestframework-guardian
 
-# Django Storage AWS
-boto3
-
 # Sentry
 sentry-sdk
 

diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -6,8 +6,6 @@
 #
 -e git+https://github.com/dimagi/django-digest@419f7306443f9a800b07d832b2cc147941062d59#egg=django_digest
     # via -r dependencies/pip/requirements.in
--e git+https://github.com/jnm/django-storages@s3boto3_accurate_tell#egg=django_storages
-    # via -r dependencies/pip/requirements.in
 -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
     # via -r dependencies/pip/requirements.in
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
@@ -18,10 +16,14 @@ amqp==5.1.1
     #   kombu
 async-timeout==4.0.2
     # via redis
+azure-core==1.23.1
+    # via azure-storage-blob
+azure-storage-blob==12.11.0
+    # via django-storages
 billiard==3.6.4.0
     # via celery
 boto3==1.22.0
-    # via -r dependencies/pip/requirements.in
+    # via django-storages
 botocore==1.25.0
     # via
     #   boto3
@@ -32,6 +34,7 @@ celery[redis]==5.2.6
     #   django-celery-beat
 certifi==2021.10.8
     # via
+    #   msrest
     #   requests
     #   sentry-sdk
 cffi==1.15.0
@@ -51,7 +54,9 @@ click-plugins==1.1.1
 click-repl==0.2.0
     # via celery
 cryptography==36.0.2
-    # via jwcrypto
+    # via
+    #   azure-storage-blob
+    #   jwcrypto
 defusedxml==0.7.1
     # via
     #   djangorestframework-xml
@@ -106,6 +111,8 @@ django-render-block==0.9.1
     # via django-templated-email
 django-reversion==3.0.1
     # via -r dependencies/pip/requirements.in
+django-storages[azure,boto3]==1.12.3
+    # via -r dependencies/pip/requirements.in
 django-taggit==2.1.0
     # via -r dependencies/pip/requirements.in
 django-templated-email==3.0.0
@@ -139,6 +146,8 @@ gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 idna==3.3
     # via requests
+isodate==0.6.1
+    # via msrest
 jmespath==1.0.0
     # via
     #   boto3
@@ -157,10 +166,14 @@ markdown==3.3.6
     # via -r dependencies/pip/requirements.in
 modilabs-python-utils==0.1.5
     # via -r dependencies/pip/requirements.in
+msrest==0.6.21
+    # via azure-storage-blob
 numpy==1.22.3
     # via pandas
 oauthlib==3.2.0
-    # via django-oauth-toolkit
+    # via
+    #   django-oauth-toolkit
+    #   requests-oauthlib
 openpyxl==3.0.9
     # via
     #   -r dependencies/pip/requirements.in
@@ -205,7 +218,13 @@ redis==4.2.2
     #   celery
     #   django-redis-sessions
 requests==2.27.1
-    # via django-oauth-toolkit
+    # via
+    #   azure-core
+    #   django-oauth-toolkit
+    #   msrest
+    #   requests-oauthlib
+requests-oauthlib==1.3.1
+    # via msrest
 s3transfer==0.5.2
     # via boto3
 savreaderwriter @ https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip
@@ -216,14 +235,18 @@ simplejson==3.17.6
     # via -r dependencies/pip/requirements.in
 six==1.16.0
     # via
+    #   azure-core
     #   click-repl
     #   djangorestframework-csv
     #   ecdsa
+    #   isodate
     #   python-dateutil
 sqlparse==0.4.2
     # via django
 tlslite-ng==0.7.6
     # via gdata-python3
+typing-extensions==4.2.0
+    # via azure-core
 unicodecsv==0.14.1
     # via djangorestframework-csv
 urllib3==1.26.9