From e1815f5d11fb4906fa4e8658446511ab5546dd62 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 26 Jan 2021 14:08:15 -0800 Subject: [PATCH] requirements: Use Django extra to pull in argon2-cffi. Signed-off-by: Anders Kaseorg --- requirements/common.in | 5 +---- requirements/dev.txt | 4 ++-- requirements/prod.txt | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/requirements/common.in b/requirements/common.in index aad976daf6..e319ff1a4b 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -3,7 +3,7 @@ # and requirements/prod.txt. # See requirements/README.md for more detail. # Django itself -Django==3.1.* +Django[argon2]==3.1.* # needed for Literal, TypedDict typing-extensions @@ -29,9 +29,6 @@ Pillow # Needed for building complex DB queries SQLAlchemy -# Needed for password hashing -argon2-cffi - # Needed for S3 file uploads boto3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 5909ad400a..0e38746dea 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -40,7 +40,7 @@ argon2-cffi==20.1.0 \ --hash=sha256:d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d \ --hash=sha256:da7f0445b71db6d3a72462e04f36544b0de871289b0bc8a7cc87c0f5ec7079fa \ --hash=sha256:e2db6e85c057c16d0bd3b4d2b04f270a7467c147381e8fd73cbbe5bc719832be - # via -r requirements/common.in + # via django arrow==0.17.0 \ --hash=sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5 \ --hash=sha256:ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4 @@ -402,7 +402,7 @@ django-webpack4-loader==0.0.5 \ --hash=sha256:baa043c4601ed763d161490e2888cf6aa93a2fd9b60681e6b19e35dc7fcb155d \ --hash=sha256:be90257041170f39c025ff674c9064569c9303b464536488b6a6cedd8e3d28be # via -r requirements/common.in -django==3.1.5 \ +django[argon2]==3.1.5 \ --hash=sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7 \ --hash=sha256:efa2ab96b33b20c2182db93147a0c3cd7769d418926f9e9f140a60dca7c64ca9 # via diff --git a/requirements/prod.txt b/requirements/prod.txt index b8362dda1b..60b820123a 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -32,7 +32,7 @@ argon2-cffi==20.1.0 \ --hash=sha256:d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d \ --hash=sha256:da7f0445b71db6d3a72462e04f36544b0de871289b0bc8a7cc87c0f5ec7079fa \ --hash=sha256:e2db6e85c057c16d0bd3b4d2b04f270a7467c147381e8fd73cbbe5bc719832be - # via -r requirements/common.in + # via django asgiref==3.3.1 \ --hash=sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17 \ --hash=sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0 @@ -251,7 +251,7 @@ django-webpack4-loader==0.0.5 \ --hash=sha256:baa043c4601ed763d161490e2888cf6aa93a2fd9b60681e6b19e35dc7fcb155d \ --hash=sha256:be90257041170f39c025ff674c9064569c9303b464536488b6a6cedd8e3d28be # via -r requirements/common.in -django==3.1.5 \ +django[argon2]==3.1.5 \ --hash=sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7 \ --hash=sha256:efa2ab96b33b20c2182db93147a0c3cd7769d418926f9e9f140a60dca7c64ca9 # via