merge release/1.14

.bumpversion.cfg

@@ -0,0 +1,30 @@
+[bumpversion]
+current_version = 1.14
+commit = True
+tag = False
+allow_dirty = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)((?P<release>[a-z]+)(?P<num>\d+))?
+serialize = 
+	{major}.{minor}{release}{num}
+	{major}.{minor}
+message = 
+	Bump version: {current_version} → {new_version}
+
+[bumpversion:part:release]
+optional_value = a
+first_value = a
+values = 
+	a
+
+[bumpversion:file:CHANGES]
+serialize = 
+	{major}.{minor}
+
+[bumpversion:file:docker/Makefile]
+serialize =
+	{major}.{minor}{release}{num}
+
+[bumpversion:file:src/etools_datamart/__init__.py]
+serialize = 
+	{major}.{minor}
+

.pre-commit-config.yaml

@@ -61,4 +61,3 @@ repos:
         args:
         - src
         - tests
-        stages: [push]

CHANGES

@@ -1,3 +1,35 @@
+1.14
+----
+* Fix loading Intervention
+* migrations reset
+
+
+1.14
+---------
+* new endpoint DPIndicator
+* preload helpers
+
+1.14
+---------
+* add impersonation
+* fixes schema permission check
+
+
+1.10
+----
+* Loader refactoring
+* new endpoint 'Funds Reservation'
+* add budget informations to interventions
+
+
+1.9 (dev)
+---------
+* WARNINGS: migration reset
+* Location/GatewayType endpoints
+* add action to queue multiple tasks
+* updates schema to eTools v6.5.1
+
+
 1.8
 ---
 * WARNINGS: migration reset

MANIFEST.in

@@ -45,3 +45,4 @@ exclude hooks
 recursive-exclude docker *
 recursive-exclude deploy *
 recursive-exclude hooks *
+recursive-exclude src *.scss

Makefile

@@ -70,3 +70,19 @@ demo-stop:
 	-kill `cat beat.pid`
 	-kill `cat celery.pid`
 	-docker stop datamart-flower
+
+reset-migrations:
+	find src -name '000[1,2,3,4,5,6,7,8,9]*' | xargs rm -f
+
+	psql -h 127.0.0.1 -p 5432 -U postgres -c "DROP DATABASE IF EXISTS test_etools_datamart"
+	psql -h 127.0.0.1 -p 5432 -U postgres -c "DROP DATABASE IF EXISTS etools_datamart"
+	psql -h 127.0.0.1 -p 5432 -U postgres -c "CREATE DATABASE etools_datamart"
+
+	./manage.py reset-migrations
+	./manage.py init-setup --all
+
+new-data-migration:
+	./manage.py migrate data 0001
+	find src/etools_datamart/apps/data/migrations -name '000[2,3,4,5,6,7,8,9]*' | xargs rm -f
+	./manage.py makemigrations data
+	./manage.py migrate data

Pipfile

@@ -1,84 +1,87 @@
-[[source]]
+ [[source]]
 url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
 [packages]
-psycopg2 = "*"
+"django-rest-framework-social-oauth2" = "*"
+"xhtml2pdf" = "*"
 admin-extra-urls = ">=2.1"
+azure-storage = "*"
 celery = "*"
 coreapi = "*"
-django = ">=2.1.4"
+cryptography = "==2.4.1"
+django = ">=2.1.5,<2.2a"
+django-adminactions = "*"
 django-adminfilters = ">=1.1"
-django-celery-beat = "==1.1.1"
+django-celery-beat = "==1.4.0"
+django-celery-email = "*"
 django-concurrency = "*"
 django-constance = "*"
 django-cors-headers = "*"
+django-countries = "*"
 django-crashlog = "*"
+django-crispy-forms = "*"
+django-db-logging = "*"
+django-dbtemplates = {file = "https://github.com/jazzband/django-dbtemplates/archive/2.0.1.tar.gz"}
 django-environ = "*"
+django-filter = "*"
+django-model-utils = "*"
+django-mptt = "*"
 django-picklefield = "*"
+django-post-office = "*"
 django-redis = "*"
+django-redisboard = "*"
 django-regex = "*"
+django-storages = {extras = ["azure"],version = "*"}
 django-strategy-field = "*"
-django-sysinfo = "*"
+django-sysinfo = "==1.4"
 djangorestframework-csv = "*"
+djangorestframework-gis = "*"
 djangorestframework-jwt = "*"
+djangorestframework-xml = "*"
+djangorestframework-yaml = "*"
 drf-dynamic-serializer = ">=1.2.0"
 drf-extensions = "*"
-drf-yasg = {version = "*", extras = ["validation"]}
+drf-renderer-xlsx = "*"
+drf-yasg = {version = "*",extras = ["validation"]}
 gunicorn = "*"
 humanize = "*"
+onedrivesdk = "*"
+openpyxl = "==2.5.12"
+psycopg2-binary = "*"
 pyparsing = "*"
+python-social-auth = "*"
 raven = "*"
+redis = "==2.10.6"
+social-auth-app-django = "*"
 sqlparse = "*"
 whitenoise = "*"
-django-model-utils = "*"
-python-social-auth = "*"
-social-auth-app-django = "*"
-django-db-logging = "*"
-cryptography = "==2.4.1"
-#rest-social-auth = "*"
-"django-rest-framework-social-oauth2" = "*"
-django-countries = "*"
-django-filter = "*"
-drf-renderer-xlsx = "*"
-django-redisboard = "*"
-djangorestframework-xml = "*"
-redis = "==2.10.6"
-djangorestframework-yaml = "*"
-django-storages = {extras = ["azure"], version = "*"}
-onedrivesdk = "*"
-azure-storage = "*"
-django-post-office = "*"
-django-celery-email = "*"
-"xhtml2pdf" = "*"
-django-crispy-forms = "*"
-django-adminactions = "*"
-django-dbtemplates = {file = "https://github.com/jazzband/django-dbtemplates/archive/2.0.1.tar.gz"}
-django-mptt = "*"
+django-impersonate = "*"
 
 [dev-packages]
-"flake8" = ">=3.6.0"
+bumpversion = "*"
 check-manifest= "*"
 django-extensions = "*"
 django-webtest = "*"
 docker = "*"
 drf-api-checker = ">=0.3"
 factory-boy = "*"
+freezegun = "*"
 ipython = "*"
 isort = "*"
 pdbpp = "*"
+pre-commit = "*"
 pytest = "*"
 pytest-coverage = "*"
 pytest-django = "*"
 pytest-echo = "*"
+pytest-ignore-flaky = "*"
 pytest-pythonpath = "*"
-yapf = "*"
+tox = "*"
 vcrpy = "*"
-pre-commit = "*"
-freezegun = "*"
-pytest-ignore-flaky = "*"
-bumpversion = "*"
+yapf = "*"
+fancycompleter = {file = "https://github.com/theY4Kman/fancycompleter/archive/0.8.tar.gz"}
 
 [requires]
 python_version = "3.6"