diff --git a/backend/Pipfile b/backend/Pipfile index 1c2192f2a..dbf8c8670 100644 --- a/backend/Pipfile +++ b/backend/Pipfile @@ -6,22 +6,20 @@ name = "pypi" [packages] "argon2_cffi" = "==19.1.0" dj-database-url = "==0.5.0" -django = {extras = ["argon2"],version = "==2.2.8"} -django-memoize = "==2.2.0" -django-storages = "==1.7.1" +django = {extras = ["argon2"],version = "==3.0"} "psycopg2-binary" = "==2.8.2" ptvsd = "==4.2.8" pytz = "==2019.1" requests = "==2.21.0" -djangorestframework = "==3.9.2" +djangorestframework = "==3.11.0" celery = {extras = ["sqs", "redis"],version = "==4.3.0"} -django-celery-beat = "==1.4.0" -djangorestframework-simplejwt = "==4.3.0" -djoser = "==1.5.1" -django-fernet-fields = "==0.5" -whitenoise = "*" -django-heroku = "*" -drf-yasg = "*" +django-celery-beat = "==1.5.0" +djangorestframework-simplejwt = "==4.4.0" +djoser = "==2.0.3" +django-fernet-fields = "==0.6" +whitenoise = "==5.0.1" +django-heroku = "==0.3.1" +drf-yasg = "==1.17.0" [dev-packages] "flake8" = "==3.7.7" diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock index d457ce290..629c35c3b 100644 --- a/backend/Pipfile.lock +++ b/backend/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "568b4035c8c494a5e9e410d3fca0a822394f412ef6a8ad8f14717fafa96d3e6e" + "sha256": "d3de8675b6f32d8a70caf66e9b27b125e6bcca9f49f9e7abc3a0eb59436f2020" }, "pipfile-spec": 6, "requires": { @@ -47,6 +47,13 @@ "index": "pypi", "version": "==19.1.0" }, + "asgiref": { + "hashes": [ + "sha256:7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0", + "sha256:ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5" + ], + "version": "==3.2.3" + }, "billiard": { "hashes": [ "sha256:01afcb4e7c4fd6480940cfbd4d9edc19d7a7509d6ada533984d0d0f49901ec82", @@ -56,17 +63,17 @@ }, "boto3": { "hashes": [ - "sha256:4cb17e406a1e18a5691e4f76c456e538ec04e46e5211158714d66a12fe824dad", - "sha256:f5cdbd853736175db5b23cd2bbfde9abe30152e68b16efa59a0456014c446782" + "sha256:67211b7454183a4b61a269003f8b3add76bbaf282236221632eafa0e2ec62e09", + "sha256:c53f274991616dc6d84d1b3b4e57a86f146df2132e3bd1b02ce10209bf7a2c49" ], - "version": "==1.10.32" + "version": "==1.10.39" }, "botocore": { "hashes": [ - "sha256:9ed03c200578f5b4d498403ba4e8deaa5b6d52d5e055a96fb4e9fe2101a7ac43", - "sha256:e6d108c8ce9349e5d5a56034d5606ce9e6b81557a94e73c0e4137c0ecd13d4d9" + "sha256:2d2b0bf77c417e5fa42b64acfc5501f11537c3a3bc05a93ea3893d1d18c7a1c2", + "sha256:9a993f7650e9a6eabb12cb3cc14b339a0d1ca14a80a9f539a6d5a63f2392a781" ], - "version": "==1.13.32" + "version": "==1.13.39" }, "celery": { "extras": [ @@ -185,26 +192,26 @@ "argon2" ], "hashes": [ - "sha256:a4ad4f6f9c6a4b7af7e2deec8d0cbff28501852e5010d6c2dc695d3d1fae7ca0", - "sha256:fa98ec9cc9bf5d72a08ebf3654a9452e761fbb8566e3f80de199cbc15477e891" + "sha256:6f857bd4e574442ba35a7172f1397b303167dae964cf18e53db5e85fe248d000", + "sha256:d98c9b6e5eed147bc51f47c014ff6826bd1ab50b166956776ee13db5a58804ae" ], "index": "pypi", - "version": "==2.2.8" + "version": "==3.0" }, "django-celery-beat": { "hashes": [ - "sha256:3c2c22647455be5503aca7450db64ea53acacee2d0aef3d7ac49aa3ef3845724", - "sha256:bfc22dad2884524697e1fcdfa63c0555a65151a97902c3045cd2cf7bf63970e4" + "sha256:61c92d4b600a9f24406ee0b8d01a9b192253e15d047e3325e1d81e2cacf7aba6", + "sha256:659b39232c454ac27022bf679939bce0471fd482f3ee9276f5199716cb4afad9" ], "index": "pypi", - "version": "==1.4.0" + "version": "==1.5.0" }, "django-fernet-fields": { "hashes": [ - "sha256:817fe7281f79c508472efa02840f7e17d0f615ad5ca72d32277a33c9f6b96efa" + "sha256:7f7e03c86d9473a42031ebade2b15be1484aad18ef5576ddab156c4667e04c4a" ], "index": "pypi", - "version": "==0.5" + "version": "==0.6" }, "django-heroku": { "hashes": [ @@ -214,22 +221,6 @@ "index": "pypi", "version": "==0.3.1" }, - "django-memoize": { - "hashes": [ - "sha256:32b1a14224f0a63cd73c02d369d076dc6433e39a36720ef99629f41dd840cec5", - "sha256:f03f4cae91034ea35ff80355b143c97ab4dc52d93cc08a893cb56defddd8b819" - ], - "index": "pypi", - "version": "==2.2.0" - }, - "django-storages": { - "hashes": [ - "sha256:8e35d2c7baeda5dc6f0b4f9a0fc142d25f9a1bf72b8cebfcbc5db4863abc552d", - "sha256:b1a63cd5ea286ee5a9fb45de6c3c5c0ae132d58308d06f1ce9865cfcd5e470a7" - ], - "index": "pypi", - "version": "==1.7.1" - }, "django-templated-mail": { "hashes": [ "sha256:8db807effebb42a532622e2d142dfd453dafcd0d7794c4c3332acb90656315f9", @@ -246,27 +237,27 @@ }, "djangorestframework": { "hashes": [ - "sha256:8a435df9007c8b7d8e69a21ef06650e3c0cbe0d4b09e55dd1bd74c89a75a9fcd", - "sha256:f7a266260d656e1cf4ca54d7a7349609dc8af4fe2590edd0ecd7d7643ea94a17" + "sha256:05809fc66e1c997fd9a32ea5730d9f4ba28b109b9da71fccfa5ff241201fd0a4", + "sha256:e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f" ], "index": "pypi", - "version": "==3.9.2" + "version": "==3.11.0" }, "djangorestframework-simplejwt": { "hashes": [ - "sha256:4cb1a51bf9b098b983e1326a1cfc65fb0b3c5a2aa0fa43effdbf05dd6da5e8cb", - "sha256:d025211806622c53020aa4f66029f1f7305e38de6439116b4a842661fc02cf36" + "sha256:288ee78618d906f26abf6282b639b8f1806ce1d9a7578897a125cf79c609f259", + "sha256:c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c" ], "index": "pypi", - "version": "==4.3.0" + "version": "==4.4.0" }, "djoser": { "hashes": [ - "sha256:a9eaf1b172c40f14be82fd145bfc02de7b3470b085b53169755c2c08fb7bd0a2", - "sha256:f311248eda5f14dcfe839b9481721a701aa9b67195b4e7606c234d476cb24cdf" + "sha256:36e06fdfc429a3aa8647289ee0e50806114d89f781de9245a68c6a44575d1bdd", + "sha256:e08570cc691caab6bf708e884b98fe3aeda61d5f84eca2d5781dfd9601ee04cf" ], "index": "pypi", - "version": "==1.5.1" + "version": "==2.0.3" }, "docutils": { "hashes": [ @@ -293,10 +284,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:1a299d126ea54757010a3b0f796400142eb19556141c880992fedf83687640d4", - "sha256:1cfe62b59c518d49dbf4ba81807b9e2bad025a5d14c31f201b0fe6404ccaf96e" + "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45", + "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f" ], - "version": "==1.1.1" + "markers": "python_version < '3.8'", + "version": "==1.3.0" }, "inflection": { "hashes": [ @@ -326,10 +318,10 @@ }, "kombu": { "hashes": [ - "sha256:1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86", - "sha256:e7465aa85a1db889116819f08c5de29520d2fa103324dcdca5e90af345f01771" + "sha256:2a9e7adff14d046c9996752b2c48b6d9185d0b992106d5160e1a179907a5d4ac", + "sha256:67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1" ], - "version": "==4.6.6" + "version": "==4.6.7" }, "markupsafe": { "hashes": [ @@ -366,10 +358,10 @@ }, "more-itertools": { "hashes": [ - "sha256:53ff73f186307d9c8ef17a9600309154a6ae27f25579e80af4db8f047ba14bc2", - "sha256:a0ea684c39bc4315ba7aae406596ef191fd84f873d2d2751f84d64e81a7a2d45" + "sha256:b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d", + "sha256:c833ef592a0324bcc6a60e48440da07645063c453880c9477ceb22490aec1564" ], - "version": "==8.0.0" + "version": "==8.0.2" }, "packaging": { "hashes": [ @@ -546,6 +538,7 @@ "sha256:a0ff786d2a7dbe55f9544b3f6ebbcc495d7e730df92a08434604f6f470b899c5", "sha256:b1b7fcee6aedcdc7e62c3a73f238b3d080c7ba6650cd808bce8d7761ec484070", "sha256:b66832ea8077d9b3f6e311c4a53d06273db5dc2db6e8a908550f3c14d67e718c", + "sha256:be018933c2f4ee7de55e7bd7d0d801b3dfb09d21dad0cce8a97995fd3e44be30", "sha256:d0d3ac228c9bbab08134b4004d748cf9f8743504875b3603b3afbb97e3472947", "sha256:d10e9dd744cf85c219bf747c75194b624cc7a94f0c80ead624b06bfa9f61d3bc", "sha256:ea4362548ee0cbc266949d8a441238d9ad3600ca9910c3fe4e82ee3a50706973", @@ -601,11 +594,11 @@ }, "whitenoise": { "hashes": [ - "sha256:22f79cf8f1f509639330f93886acaece8ec5ac5e9600c3b981d33c34e8a42dfd", - "sha256:6dfea214b7c12efd689007abf9afa87a426586e9dbc051873ad2c8e535e2a1ac" + "sha256:0f9137f74bd95fa54329ace88d8dc695fbe895369a632e35f7a136e003e41d73", + "sha256:62556265ec1011bd87113fb81b7516f52688887b7a010ee899ff1fd18fd22700" ], "index": "pypi", - "version": "==4.1.4" + "version": "==5.0.1" }, "zipp": { "hashes": [ @@ -694,11 +687,11 @@ "argon2" ], "hashes": [ - "sha256:a4ad4f6f9c6a4b7af7e2deec8d0cbff28501852e5010d6c2dc695d3d1fae7ca0", - "sha256:fa98ec9cc9bf5d72a08ebf3654a9452e761fbb8566e3f80de199cbc15477e891" + "sha256:6f857bd4e574442ba35a7172f1397b303167dae964cf18e53db5e85fe248d000", + "sha256:d98c9b6e5eed147bc51f47c014ff6826bd1ab50b166956776ee13db5a58804ae" ], "index": "pypi", - "version": "==2.2.8" + "version": "==3.0" }, "django-cors-headers": { "hashes": [ diff --git a/backend/fixtures/fixtures.json b/backend/fixtures/fixtures.json index 41f4c5828..7522da7d6 100644 --- a/backend/fixtures/fixtures.json +++ b/backend/fixtures/fixtures.json @@ -60,11 +60,6 @@ "timezone": "UTC" } }, - { - "model": "django_celery_beat.periodictasks", - "pk": 1, - "fields": { "last_update": "2019-10-19T15:39:02.652Z" } - }, { "model": "django_celery_beat.periodictask", "pk": 1, diff --git a/backend/root/settings/base.py b/backend/root/settings/base.py index 3c493c17c..5574030fa 100644 --- a/backend/root/settings/base.py +++ b/backend/root/settings/base.py @@ -26,7 +26,6 @@ "django.contrib.sessions", "django.contrib.messages", "django_celery_beat", - "memoize", "rest_framework", "djoser", "drf_yasg",