Merge remote-tracking branch 'upstream/main' into images-django-imagekit

2021-08-04 10:00:20 +02:00
parent f3274098b5 6d82bafdc0
commit 843127efa8
84 changed files with 1633 additions and 1869 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -24,3 +24,5 @@ coverage==5.1
 pytest-django==4.1.0
 pytest==6.1.2
 pytest-cov==2.10.1
+pytest-env==0.6.2
+pytest-xdist==2.3.0