Merge branch 'develop' into feature/refactor-address

apps/collection/tests.py

@@ -1,15 +1,15 @@
-import json, pytz
+import json
+import pytz
 from datetime import datetime
-from rest_framework.test import APITestCase
-from account.models import User
-from rest_framework import status
 from http.cookies import SimpleCookie
 
-from collection.models import Collection, Guide
+from rest_framework import status
-from location.models import Country
+from rest_framework.test import APITestCase
 
+from account.models import User
+from collection.models import Collection, Guide
 from establishment.models import Establishment, EstablishmentType
-# Create your tests here.
+from location.models import Country
 
 
 class BaseTestCase(APITestCase):

docker-compose.yml

@@ -12,8 +12,6 @@ services:
       - POSTGRES_DB=postgres
     ports:
       - "5436:5432"
-    networks:
-      - db-net
     volumes:
       - gm-db:/var/lib/postgresql/data/
   elasticsearch:
@@ -28,8 +26,7 @@ services:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       - discovery.type=single-node
       - xpack.security.enabled=false
-    networks:
+
-      - app-net
   # RabbitMQ
   rabbitmq:
     image: rabbitmq:latest
@@ -83,19 +80,12 @@ services:
       - worker
       - worker_beat
       - elasticsearch
-    networks:
-      - app-net
-      - db-net
     volumes:
       - .:/code
       - gm-media:/media-data
     ports:
       - "8000:8000"
 
-networks:
-  app-net:
-  db-net:
-
 volumes:
   gm-db:
     name: gm-db