Skip to content

Commit

Permalink
merge release/2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
CI committed Sep 17, 2019
2 parents bbe3762 + 1d5f92a commit 510d2e0
Show file tree
Hide file tree
Showing 240 changed files with 3,503 additions and 6,654 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.1
current_version = 2.1
commit = False
tag = False
allow_dirty = True
Expand Down
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2.1
---
* Fixes TripLoader
* add lat/lng info to datamart/interventions/
* add centroid/lat/lng info to datamart/locations/
* add extra filter to datamart/t2f/trips/
* add 'vendor_number' to datamart/audit/engagements
* add 'reference_number' to datamart/audit/engagements
* raise default timeout value


2.0
---
* add PRP source endpoints
Expand Down
11 changes: 7 additions & 4 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ celery = "*"
#coreapi = ""
cryptography = "==2.7"
django = "*"
django-adminactions = ">=1.7.1"
django-adminactions = ">=1.8"
django-adminfilters = ">=1.1"
django-celery-beat = "*"
django-celery-email = "*"
Expand Down Expand Up @@ -43,7 +43,7 @@ djangorestframework-gis = "*"
djangorestframework-jwt = "*"
djangorestframework-xml = "*"
djangorestframework-yaml = "*"
drf-dynamic-serializer = ">=1.2.0"
drf-dynamic-serializer = ">=2.1"
drf-extensions = "*"
drf-renderer-xlsx = "*"
drf-yasg = {version = "*",extras = ["validation"]}
Expand All @@ -68,13 +68,15 @@ django-sql-explorer = "*"
uwsgi = "*"
packaging = "*"
circus = "*"
rapidpro-python = "*"
django-jsoneditor = "*"
pygments = "*"

[dev-packages]
bumpversion = "*"
check-manifest= "*"
django-extensions = "*"
django-webtest = "*"
drf-api-checker = ">=0.7"
drf-api-checker = ">=0.8"
factory-boy = "*"
freezegun = "*"
isort = "*"
Expand All @@ -90,6 +92,7 @@ vcrpy = "*"
#fancycompleter = {file = "https://github.com/theY4Kman/fancycompleter/archive/0.8.tar.gz"}
flake8 = "*"
ipdb = "*"
bump2version = "*"

[requires]
python_version = "3.7"
Expand Down
127 changes: 80 additions & 47 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ ENV UWSGI_PROTOCOL=http \
UWSGI_DISABLE_LOGGING=false \
UWSGI_DISABLE_WRITE_EXCEPTION=true \
UWSGI_FREEBIND=true \
UWSGI_HARAKIRI=120 \
UWSGI_HTTP_TIMEOUT=60 \
UWSGI_HARAKIRI=180 \
UWSGI_HTTP_TIMEOUT=180 \
UWSGI_IGNORE_SIGPIPE=true \
UWSGI_IGNORE_WRITE_ERRORS=true \
UWSGI_LIMIT_POST=20971520 \
Expand Down
4 changes: 1 addition & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DATABASE_URL_ETOOLS?=
DEVELOP?=1
DOCKER_PASS?=
DOCKER_USER?=
TARGET?=2.0.1
TARGET?=2.1
BASE=2.0
# below vars are used internally
BUILD_OPTIONS?=--squash
Expand Down Expand Up @@ -162,8 +162,6 @@ beat:

test:
RUN_OPTIONS="-e DEBUG=0 \
-e SENTRY_DSN=https://[email protected]/1434933 \
-e SENTRY_ENABLED=true \
-e X_FRAME_OPTIONS=DENY \
-e SESSION_COOKIE_SECURE=1 \
-e CSRF_COOKIE_SECURE=1 \
Expand Down
Loading

0 comments on commit 510d2e0

Please sign in to comment.