merge release/1.4

.circleci/config.yml

@@ -145,6 +145,7 @@ jobs:
       - deploy:
           name: dockerize
           command: |
+              export TAG=${TAG:=${CIRCLE_BRANCH#*/}}
               curl --user ${CIRCLE_TOKEN}: \
                 --data build_parameters[TAG]=$TAG \
                 --data build_parameters[JOB]=dockerize \

.pre-commit-config.yaml

@@ -10,30 +10,55 @@ repos:
         entry: isort
         language: system
         types: [python]
+        stages: [commit]
+
       - id: check-manifest
         name: check-manifest
         entry: check-manifest
         language: system
         types: [python]
         files: '^$'
         always_run: true
+        stages: [manual]
 
 -   repo: git://github.com/pre-commit/pre-commit-hooks
     rev: v2.0.0
     hooks:
     -   id: debug-statements
         exclude: manage.py
-    -   id: end-of-file-fixer
+        stages: [commit]
+
+#    -   id: end-of-file-fixer
     -   id: flake8
         args:
         - src/
         - tests/
         - --config=setup.cfg
+        stages: [commit]
+
     -   id: check-merge-conflict
-    -   id: check-case-conflict
+        stages: [commit]
+
+#    -   id: check-case-conflict
 -   repo: git://github.com/Yelp/detect-secrets
     rev: 0.9.1
     hooks:
     -   id: detect-secrets
         args: ['--baseline', '.secrets.baseline']
         exclude: (tests/.*|.*/tenant.sql|Pipfile.lock)
+        stages: [push]
+
+-   repo: https://github.com/saxix/pch
+    rev: 5c9a8e2
+    hooks:
+    -   id: check-version-release-match
+        args:
+        - --pythonpath=src
+        - --package=etools_datamart
+        stages: [push]
+
+    -   id: check-untracked
+        args:
+        - src
+        - tests
+        stages: [push]

CHANGES

@@ -1,3 +1,14 @@
+1.4
+---
+* WARNINGS: migration reset
+* updates corepai documentation
+* refactor api endpoints
+* updates dependencies
+* improved schema/country permission checks (multi-tenant/etools)
+* improved filtering
+* dependencies updates
+
+
 1.3
 ---
 * Aligned with eTools 6.3.1
@@ -10,6 +21,7 @@
 * new endpoint Tpmvisit
 * new endpoint UserStats
 
+
 1.2
 ---
 * add db logging

MANIFEST.in

@@ -22,7 +22,6 @@ exclude Makefile
 exclude manage.py
 exclude manage.py
 exclude tests
-exclude TODO
 
 prune .circleci
 prune db
@@ -36,6 +35,8 @@ recursive-include src *.sqldump
 recursive-include src/etools_datamart *.*
 recursive-include src/unicef_rest_framework *.*
 recursive-include src/unicef_security *.*
+recursive-include src/month_field *.*
+recursive-include src/drf_querystringfilter *.*
 
 exclude deploy
 exclude docker

Makefile

@@ -15,6 +15,7 @@ help:
 develop:
 	@pipenv sync --dev
 	pipenv run pre-commit install
+	pipenv run pre-commit install --hook-type pre-push.
 	$(MAKE) .init-db
 
 
@@ -27,6 +28,8 @@ test:
 
 lint:
 	pipenv run pre-commit run --all-files
+	pipenv run pre-commit run --all-files --hook-stage push
+	pipenv run pre-commit run --all-files --hook-stage manual
 #	pipenv run flake8 src/ tests/
 #	pipenv run isort -rc src/ --check-only
 #	pipenv run check-manifest

Pipfile

@@ -26,7 +26,6 @@ djangorestframework-csv = "*"
 djangorestframework-jwt = "*"
 drf-dynamic-serializer = ">=1.2.0"
 drf-extensions = "*"
-drf-querystringfilter = ">=1.0.0"
 drf-yasg = {version = "*", extras = ["validation"]}
 flower = "*"
 gunicorn = "*"
@@ -44,6 +43,7 @@ cryptography = "*"
 #rest-social-auth = "*"
 "django-rest-framework-social-oauth2" = "*"
 django-countries = "*"
+django-filter = "*"
 
 [dev-packages]
 "flake8" = ">=3.6.0"