Merge pull request #237 from City-of-Helsinki/kk-792-fix-psycopg

Kk-792 Fixes to the dev environment

.gitignore

@@ -78,3 +78,5 @@ var/
 venv/
 .pytest_cache/
 docker-compose.env.yaml
+
+.vscode/

docker-compose.env.yaml.example

@@ -1,4 +1,5 @@
 DEBUG=1
+CORS_ORIGIN_ALLOW_ALL=1
 APPLY_MIGRATIONS=1
 CREATE_SUPERUSER=1
 ADD_DEFAULT_LANGUAGES=1

requirements.in

@@ -12,7 +12,11 @@ drf-oidc-auth==0.10.0
 factory-boy
 graphene-django
 graphene-file-upload
-psycopg2
+# Django 2.2 needs psycopg2 2.8. Mac needs the binary.
+# The psycopg2-binary should be replacesd 
+# with psycopg2 when possible 
+# https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary
+psycopg2-binary < 2.9 
 sentry-sdk
 Pillow
 pycountry

requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
-#    pip-compile requirements.in
+#    pip-compile
 #
 aniso8601==7.0.0
     # via graphene
@@ -26,6 +26,20 @@ chardet==3.0.4
     # via requests
 cryptography==3.3.2
     # via azure-storage-common
+django==2.2.24
+    # via
+    #   -r requirements.in
+    #   django-anymail
+    #   django-cors-headers
+    #   django-filter
+    #   django-graphql-jwt
+    #   django-guardian
+    #   django-helusers
+    #   django-ilmoitin
+    #   django-mailer
+    #   django-storages
+    #   drf-oidc-auth
+    #   graphene-django
 django-anymail==7.0.0
     # via django-ilmoitin
 django-cleanup==4.0.0
@@ -52,20 +66,6 @@ django-parler==2.1
     #   django-ilmoitin
 django-storages[azure,google]==1.9.1
     # via -r requirements.in
-django==2.2.24
-    # via
-    #   -r requirements.in
-    #   django-anymail
-    #   django-cors-headers
-    #   django-filter
-    #   django-graphql-jwt
-    #   django-guardian
-    #   django-helusers
-    #   django-ilmoitin
-    #   django-mailer
-    #   django-storages
-    #   drf-oidc-auth
-    #   graphene-django
 djangorestframework==3.10.3
     # via drf-oidc-auth
 drf-oidc-auth==0.10.0
@@ -96,14 +96,14 @@ google-resumable-media==0.5.0
     # via google-cloud-storage
 googleapis-common-protos==1.51.0
     # via google-api-core
+graphene==2.1.8
+    # via graphene-django
 graphene-django==2.13.0
     # via
     #   -r requirements.in
     #   django-graphql-jwt
 graphene-file-upload==1.2.2
     # via -r requirements.in
-graphene==2.1.8
-    # via graphene-django
 graphql-core==2.2.1
     # via
     #   django-graphql-jwt
@@ -131,14 +131,14 @@ protobuf==3.11.3
     # via
     #   google-api-core
     #   googleapis-common-protos
-psycopg2==2.8.4
+psycopg2-binary==2.8.6
     # via -r requirements.in
-pyasn1-modules==0.2.8
-    # via google-auth
 pyasn1==0.4.7
     # via
     #   pyasn1-modules
     #   rsa
+pyasn1-modules==0.2.8
+    # via google-auth
 pycountry==20.7.3
     # via -r requirements.in
 pycparser==2.20