From 9e6a1b8c845e80596a5aa152e9037e199160332c Mon Sep 17 00:00:00 2001
From: Domenico DiNicola <dom.dinicola@gmail.com>
Date: Fri, 13 Dec 2019 13:09:29 -0500
Subject: [PATCH] flake

---
 .env_template                                 | 23 +++++++++++++++++++
 CHANGES                                       |  4 ++++
 README.rst                                    | 22 ++++++++++++++----
 docker/Dockerfile.base                        |  4 ++--
 docker/Makefile                               |  2 +-
 .../api/views/sharepoint.py                   |  2 +-
 6 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 .env_template

diff --git a/.env_template b/.env_template
new file mode 100644
index 00000000..155c2dcf
--- /dev/null
+++ b/.env_template
@@ -0,0 +1,23 @@
+DJANGO_SETTINGS_MODULE=donor_reporting_portal.config.settings
+DATABASE_URL=psql://postgres:pass@127.0.0.1:5432/donor_reporting_portal
+SECRET_KEY=
+SESSION_COOKIE_SECURE=False
+REDIS_URL=redis://redis:6379/1
+HOST=http://localhost:8082
+CELERY_TASK_ALWAYS_EAGER=True
+DEBUG=True
+
+AZURE_CLIENT_ID=
+AZURE_CLIENT_SECRET=
+AZURE_TENANT=unicef.org
+
+AZURE_B2C_CLIENT_ID=
+AZURE_B2C_CLIENT_SECRET=
+AZURE_B2C_TENANT=
+
+VISION_URL=https://unibiapitest.azure-api.net/biapi/v1/
+INSIGHT_URL=https://unibiapitest.azure-api.net/biapi/v1/
+INSIGHT_SUB_KEY=
+
+SHAREPOINT_USERNAME=
+SHAREPOINT_PASSWORD=
diff --git a/CHANGES b/CHANGES
index 58e6a03b..fa206532 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Release 0.6 (in development)
+----------------
+
+
 Release 0.5
 ----------------
 * added external reference as dependency
diff --git a/README.rst b/README.rst
index 08be624b..96778fe7 100644
--- a/README.rst
+++ b/README.rst
@@ -35,8 +35,22 @@ Troubleshoot
 
 Get Started
 --------------------
-from unicef_security.tasks import sync_business_area
-from donor_reporting_portal.apps.report_metadata.tasks import *
+* populate your .env file from template .env_template
+* python manage.py init-setup --all
 
-sync_business_area()
-grant_sync()
+
+Development Release
+--------------------
+init version
+* update requirements (sys - python)
+* `make build-base`
+
+develop features
+* develop features
+* `make build release`
+
+finish version
+* `git flow release start`
+* update CHANGES
+* update version (__init__.py)
+* update makefile version
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index d14c5b46..d8b07403 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -22,7 +22,7 @@ RUN apk add --no-cache --virtual .build-deps \
 RUN apk add --no-cache --virtual .build-deps-edge \
         --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
         --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-        proj-dev \
+        # proj-dev \
         protobuf-c-dev
 
 RUN apk add --no-cache --virtual .postgis-rundeps \
@@ -43,7 +43,7 @@ RUN apk add --no-cache --virtual .postgis-rundeps-edge \
         libxslt \
         libzmq \
         jpeg \
-        proj \
+        # proj \
         protobuf-c \
         zlib
 
diff --git a/docker/Makefile b/docker/Makefile
index 0baa6297..54e79219 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -3,7 +3,7 @@ DATABASE_URL?=
 DEVELOP?=1
 DOCKER_PASS?=
 DOCKER_USER?=
-TARGET?=0.5.0a6
+TARGET?=0.6.0a0
 BASE?=$(shell echo "${TARGET}" | sed "s/\([0-9]\)\.\([0-9]\)\.\(.*\)/\1.\2/g" )
 # below vars are used internally
 BUILD_OPTIONS?=
diff --git a/src/donor_reporting_portal/api/views/sharepoint.py b/src/donor_reporting_portal/api/views/sharepoint.py
index 3797015f..9da95c64 100644
--- a/src/donor_reporting_portal/api/views/sharepoint.py
+++ b/src/donor_reporting_portal/api/views/sharepoint.py
@@ -115,7 +115,7 @@ def get_object(self):
         filename = self.kwargs.get('filename', None)
         try:
             filename, *extension = filename.split('__ext__')
-            if extension and len(extension)==1:
+            if extension and len(extension) == 1:
                 extension = extension[0]
             else:
                 extension = 'pdf'