feat: improve requirements file structure

.gitignore

@@ -86,3 +86,6 @@ super-csv-env/
 
 # test output
 csv/
+
+venv
+

Makefile

@@ -43,22 +43,12 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)  ## update the requirements/*.txt files with
 	pip install -qr requirements/pip.txt
 	pip install -qr requirements/pip-tools.txt
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
-	pip-compile --upgrade -o requirements/test.txt requirements/test.in
-	pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
-	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
+	pip-compile --upgrade -o requirements/test_layer.txt requirements/test_layer.in
+	pip-compile --upgrade -o requirements/doc_layer.txt requirements/doc_layer.in
+	pip-compile --upgrade -o requirements/quality_layer.txt requirements/quality_layer.in
 	pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
-	pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
+	pip-compile --upgrade -o requirements/dev_layer.txt requirements/dev_layer.in
 	grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery44.txt
-	# Let tox control the versions for Django, DRF and celery for testing
-	sed -i.tmp '/^django==/d' requirements/test.txt
-	sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
-	sed -i.tmp '/^amqp==/d' requirements/test.txt
-	sed -i.tmp '/^anyjson==/d' requirements/test.txt
-	sed -i.tmp '/^billiard==/d' requirements/test.txt
-	sed -i.tmp '/^celery==/d' requirements/test.txt
-	sed -i.tmp '/^kombu==/d' requirements/test.txt
-	sed -i.tmp '/^vine==/d' requirements/test.txt
-	rm requirements/test.txt.tmp
 
 quality: ## check coding style with pycodestyle and pylint
 	tox -e quality

requirements/base.txt

@@ -38,11 +38,11 @@ django-model-utils==4.2.0
     #   edx-celeryutils
 django-waffle==3.0.0
     # via edx-django-utils
-djangorestframework==3.13.1
+djangorestframework==3.14.0
     # via -r requirements/base.in
 edx-celeryutils==1.2.1
     # via -r requirements/base.in
-edx-django-utils==5.0.1
+edx-django-utils==5.1.0
     # via -r requirements/base.in
 future==0.18.2
     # via edx-celeryutils

requirements/ci.in

@@ -4,3 +4,4 @@
 codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
 tox-battery               # Makes tox aware of requirements file changes
+tox-run-before

requirements/ci.txt

@@ -40,8 +40,11 @@ tox==3.26.0
     # via
     #   -r requirements/ci.in
     #   tox-battery
+    #   tox-run-before
 tox-battery==0.6.1
     # via -r requirements/ci.in
+tox-run-before==0.1
+    # via -r requirements/ci.in
 urllib3==1.26.12
     # via requests
 virtualenv==20.16.5