Merge f5c7113 into 6ef902c

barseghyanartur · Nov 26, 2022 · 697cb00 · 697cb00
2 parents 6ef902c + f5c7113
commit 697cb00
Show file tree

Hide file tree

Showing 33 changed files with 517 additions and 116 deletions.
diff --git a/Makefile b/Makefile
@@ -63,6 +63,9 @@ build-%: prepare-required-files
 stop:
 	docker-compose -f docker-compose.yml stop;
 
+touch:
+	docker-compose -f docker-compose.yml exec backend touch manage.py
+
 make-migrations:
 	docker-compose -f docker-compose.yml exec backend ./manage.py makemigrations $(APP);
 
@@ -72,6 +75,12 @@ migrate:
 test:
 	docker-compose -f docker-compose.yml exec backend pytest /backend/src/$(TEST_PATH);
 
+tox-test:
+	docker-compose -f docker-compose.yml exec backend tox -e $(ARGS);
+
+tox-list:
+	docker-compose -f docker-compose.yml exec backend tox -l;
+
 show-migrations:
 	docker-compose -f docker-compose.yml exec backend ./manage.py showmigrations
 

diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
@@ -30,7 +30,7 @@ RUN pip install virtualenv
 RUN mkdir /backend
 WORKDIR /backend
 ADD examples/requirements/ /backend/requirements/
-RUN pip install -r /backend/requirements/django_3_2.in
+RUN pip install -r /backend/requirements/django_4_1.in
 #RUN python -c "import geckodriver_autoinstaller; print(geckodriver_autoinstaller.install())"
 RUN python -c "from chromedriver_py import binary_path; print(binary_path)"
 COPY . /backend/

diff --git a/examples/requirements/captcha.txt b/examples/requirements/captcha.txt
@@ -18,5 +18,7 @@ pillow==8.2.0
     # via django-simple-captcha
 pytz==2021.1
     # via django
+six==1.16.0
+    # via django-simple-captcha
 sqlparse==0.4.1
     # via django
diff --git a/examples/requirements/common.in b/examples/requirements/common.in
@@ -4,6 +4,7 @@ bleach>=2.1.2
 decorator>=4.0.4
 docopt>=0.4.0
 docutils>=0.12
+importlib-metadata<5.0.0
 Jinja2>=2.8
 mailchimp>=2.0.9
 markdown

diff --git a/examples/requirements/demo.txt b/examples/requirements/demo.txt
@@ -244,6 +244,7 @@ six==1.16.0
     # via
     #   -r common.in
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/dev.txt b/examples/requirements/dev.txt
@@ -223,7 +223,7 @@ pluggy==0.13.1
     #   tox
 pre-commit==2.13.0
     # via -r django_3_2.txt
-psycopg2-binary==2.9.1
+psycopg2-binary==2.8.6
     # via -r django_3_2.txt
 ptyprocess==0.7.0
     # via
@@ -300,6 +300,7 @@ six==1.16.0
     # via
     #   -r django_3_2.txt
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/django_2_2.txt b/examples/requirements/django_2_2.txt
@@ -238,6 +238,7 @@ six==1.16.0
     # via
     #   -r common.in
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/django_3_0.txt b/examples/requirements/django_3_0.txt
@@ -244,6 +244,7 @@ six==1.16.0
     # via
     #   -r common.in
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/django_3_1.txt b/examples/requirements/django_3_1.txt
@@ -244,6 +244,7 @@ six==1.16.0
     # via
     #   -r common.in
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/django_3_2.txt b/examples/requirements/django_3_2.txt
@@ -244,6 +244,7 @@ six==1.16.0
     # via
     #   -r common.in
     #   bleach
+    #   django-simple-captcha
     #   feincms
     #   python-dateutil
     #   tox

diff --git a/examples/requirements/django_4_1.in b/examples/requirements/django_4_1.in
@@ -0,0 +1,15 @@
+-r common.in
+-r test.in
+-r style_checkers.in
+-r feincms_1_20.in
+
+Django>=4.1,<4.2
+django-admin-tools>=0.8.0
+django-autoslug>=1.9.6
+django-ckeditor>=5.8.0
+django-debug-toolbar>=2.1
+django-formtools>=2.2
+django-registration>=3.1.1
+django-simple-captcha>=0.5.12
+djangorestframework>=3.10
+easy-thumbnails>=2.7.0