Skip to content

Commit

Permalink
flake
Browse files Browse the repository at this point in the history
  • Loading branch information
domdinicola committed Dec 13, 2019
1 parent 978727c commit 9e6a1b8
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 8 deletions.
23 changes: 23 additions & 0 deletions .env_template
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
DJANGO_SETTINGS_MODULE=donor_reporting_portal.config.settings
DATABASE_URL=psql://postgres:[email protected]: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=
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Release 0.6 (in development)
----------------


Release 0.5
----------------
* added external reference as dependency
Expand Down
22 changes: 18 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -43,7 +43,7 @@ RUN apk add --no-cache --virtual .postgis-rundeps-edge \
libxslt \
libzmq \
jpeg \
proj \
# proj \
protobuf-c \
zlib

Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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?=
Expand Down
2 changes: 1 addition & 1 deletion src/donor_reporting_portal/api/views/sharepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 9e6a1b8

Please sign in to comment.