Feature/upgrade (#1)

* fixed user creation in tests

* upgrated libs, docker image versions

* improved Makefile

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 ENV PYTHONUNBUFFERED 1
 WORKDIR /code
 COPY Pipfile /code/

Makefile

@@ -8,11 +8,23 @@ build_test:
 	@docker-compose \
 		-f docker-compose.yaml \
 		-f docker-compose.test.yaml \
-		build web
+		build --parallel web
 
 .PHONY: test
 test: build_test
 	@docker-compose \
 		-f docker-compose.yaml \
 		-f docker-compose.test.yaml \
-		run web dockerize -timeout 20s -wait tcp://db:5432 bash -c "test/test.sh"
+		run web dockerize -timeout 20s -wait tcp://db:5432 bash -c "test/test.sh"
+
+run:
+	@docker-compose up
+
+run+rebuild:
+	@docker-compose up --build
+
+clear_all:
+	@docker-compose \
+		-f docker-compose.yaml \
+		-f docker-compose.test.yaml \
+		down -v

Pipfile

@@ -4,32 +4,32 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-pytest = "==5.1.2"
+pytest = "==6.1.2"
 pytest-factoryboy = "==2.0.3"
-pytest-django = "==3.5.1"
-localstack = "==0.10.2.5"
-awscli = "==1.16.236"
-boto3 = "==1.9.226"
+pytest-django = "==4.1.0"
+localstack = "==0.12.2"
+awscli = "==1.18.178"
+boto3 = "==1.16.18"
 
 [packages]
-botocore = "==1.12.226"
-boto3 = "==1.9.226"
-pillow = "==6.1.0"
-Django = "==2.2.4"
-djangorestframework = "==3.10.2"
+botocore = "==1.19.18"
+boto3 = "==1.16.18"
+Pillow = "==8.0.1"
+Django = "==3.1.3"
+djangorestframework = "==3.12.2"
 psycopg2-binary = ">=2.7,<3.0"
-django-filter = "==2.2.0"
-factory-boy = "==2.12.0"
+django-filter = "==2.4.0"
+factory-boy = "==3.1.0"
 django-rest-auth = "==0.9.5"
-drf-extensions = "==0.5.0"
-django-redis = "==4.10.0"
-celery = "==4.3.0"
-drf-yasg = "==1.16.1"
-packaging = "==19.2"
-django-storages = "==1.9.1"
-python-dotenv = "==0.13.0"
-django-cors-headers = "==3.2.1"
-djangorestframework-camel-case = "==1.1.2"
+django-redis = "==4.12.1"
+celery = "==5.0.2"
+drf-yasg = "==1.20.0"
+packaging = "==20.4"
+django-storages = "==1.10.1"
+python-dotenv = "==0.15.0"
+django-cors-headers = "==3.5.0"
+djangorestframework-camel-case = "==1.2.0"
+drf-extensions = {git = "https://github.com/chibisov/drf-extensions.git", ref = "002a67cec4159cbd691580b6e7fa42a701f0d2dd"}
 
 [requires]
-python_version = "3.7"
+python_version = "3.8"