merge release/1.0

.gitignore

@@ -28,3 +28,4 @@ db/db1.bz2
 .env
 .venv
 docker/cache
+src/etools_datamart/apps/core/static/api-doc.css.map

.pre-commit-config.yaml

@@ -21,13 +21,6 @@ repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks
     rev: v1.4.0
     hooks:
-#    -   id: autopep8-wrapper
-#        args:
-#        - -i
-#        - --ignore=E309,E501
-#    -   id: check-json
-#    -   id: check-yaml
-#    -   id: fix-encoding-pragma
     -   id: debug-statements
         exclude: manage.py
     -   id: end-of-file-fixer

CHANGES

@@ -1,3 +1,15 @@
+1.0
+---
+* SystemFilters. Ability to force per user/service filters
+* User ACL can grant/demy access to specific serializers
+* Internally log any exceptions (django-crashlog)
+* Improved endpoint documentation. (Filtering / Lookups )
+* removes MultiTenantMiddleware
+* everywhere use 'country_name' as schema/tenant selection
+* add tracking informations
+* allows selection multiple schemas in admin
+
+
 0.3
 ---
 * TaskLog to monitor ETL task

MANIFEST.in

@@ -1,37 +1,40 @@
-include README.md
-include CONTRIBUTING.md
 include CHANGES
+include CONTRIBUTING.md
 include MANIFEST.in
-include tox.ini
-include Pipfile.lock
 include Pipfile
+include Pipfile.lock
+include README.md
 include src
+include tox.ini
 
-exclude .tox
 exclude .dockerignore
-exclude .style.yapf
+exclude .env
+exclude .env.tpl
 exclude .jshintrc
+exclude .pre-commit-config.yaml
+exclude .secrets.baseline
+exclude .style.yapf
+exclude .tox
+exclude docker-compose.yml
 exclude Dockerfile.dev
+exclude entrypoint.sh
 exclude Makefile
 exclude manage.py
-exclude tests
 exclude manage.py
-exclude entrypoint.sh
-exclude .env
-exclude .env.tpl
-exclude docker-compose.yml
-exclude .pre-commit-config.yaml
-exclude .secrets.baseline
+exclude tests
+exclude TODO
 
 prune .circleci
-prune tests
 prune db
 prune docker
+prune tests
 
-recursive-include src/etools_datamart *.*
-recursive-include src/unicef_rest_framework *.*
 recursive-exclude tests *
 recursive-include docs *
+recursive-include src *.sql
+recursive-include src *.sqldump
+recursive-include src/etools_datamart *.*
+recursive-include src/unicef_rest_framework *.*
 
 exclude deploy
 exclude docker

Makefile

@@ -13,8 +13,8 @@ help:
 
 
 develop:
-	@pipenv install -d
-	pre-commit install
+	@pipenv sync --dev
+	pipenv run pre-commit install
 	$(MAKE) .init-db
 
 
@@ -37,47 +37,20 @@ clean:
 	find src/concurrency/locale -name django.mo | xargs rm -f
 
 fullclean:
-	rm -fr .tox .cache
+	rm -fr .tox .cache .pytest_cache .venv
 	$(MAKE) clean
 
 
 sync-etools:
-	pg_dump --inserts -O \
-		${PG_ETOOLS_PARAMS} -d etools -n public \
-		--format c \
-		--blobs \
-		--exclude-table-data celery_* \
-		--exclude-table-data django_admin_log \
-		--exclude-table-data django_celery_* \
-		--exclude-table-data django_migrations \
-		--exclude-table-data django_session \
-		--exclude-table-data djcelery_* \
-		--exclude-table-data drfpasswordless_* \
-		--exclude-table-data easy_* \
-		--exclude-table-data environment_* \
-		--exclude-table-data filer_* \
-		--exclude-table-data locations_location \
-		--exclude-table-data generic_* \
-		--exclude-table-data notification_* \
-		--exclude-table-data permissions2_* \
-		--exclude-table-data post_office_* \
-		--exclude-table-data purchase_order_* \
-		--exclude-table-data registration_* \
-		--exclude-table-data reversion_* \
-		--exclude-table-data social_account_* \
-		--exclude-table-data spatial_* \
-		--exclude-table-data tpm_partners_* \
-		--exclude-table-data unicef_notification_* \
-		--exclude-table-data vision_* \
-		--exclude-table-data waffle_* \
-		-f src/etools_datamart/apps/multitenant/postgresql/public.sqldump
-	pg_dump --inserts -O -U postgres -p 15432 -d etools -h 127.0.0.1 -n zambia | sed 's/zambia/[[schema]]/g' >src/etools_datamart/apps/multitenant/postgresql/tenant.sql
-	ls -aslkG src/etools_datamart/apps/multitenant/postgresql/*.sql*
-
+	sh src/etools_datamart/apps/multitenant/postgresql/dump.sh ${PG_ETOOLS_PARAMS}
 
 docs: .mkbuilddir
 	mkdir -p ${BUILDDIR}/docs
 	sphinx-build -aE docs/ ${BUILDDIR}/docs
 ifdef BROWSE
 	firefox ${BUILDDIR}/docs/index.html
 endif
+
+
+urf:
+	pipenv run pytest tests/urf --cov-config tests/urf/.coveragerc

Pipfile

@@ -4,57 +4,57 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
+"psycopg2-binary" = "*"
+admin-extra-urls = ">=2.1"
+celery = "*"
+coreapi = "*"
+django = ">=2.0,<2.1"
+django-adminfilters = ">=1.1"
+django-celery-beat = "*"
 django-concurrency = "*"
-django-environ = "*"
 django-constance = "*"
-drf-querystringfilter = ">=1.0.0"
 django-cors-headers = "*"
-gunicorn = "*"
-"psycopg2-binary" = "*"
-raven = "*"
-whitenoise = "*"
+django-crashlog = "*"
+django-environ = "*"
 django-picklefield = "*"
-drf-dynamic-serializer = ">=1.2.0"
-djangorestframework-jwt = "*"
-coreapi = "*"
-django-tenant-schemas = "*"
+django-redis = "*"
 django-regex = "*"
-sqlparse = "*"
-pyparsing = "*"
-admin-extra-urls = "*"
-drf-yasg = {version = "*", extras = ["validation"]}
 django-strategy-field = "*"
-humanize = "*"
-celery = "*"
-django-adminfilters = "==1.1"
-flower = "*"
-django-celery-beat = "*"
-django-redis = "*"
-django = "==2.0"
-pytest-pythonpath = "*"
+django-sysinfo = "*"
+django-tenant-schemas = "*"
 djangorestframework-csv = "*"
+djangorestframework-jwt = "*"
+drf-dynamic-serializer = ">=1.2.0"
 drf-extensions = "*"
-django-sysinfo = "*"
-pre-commit = "*"
+drf-querystringfilter = ">=1.0.0"
+drf-yasg = {version = "*", extras = ["validation"]}
+flower = "*"
+gunicorn = "*"
+humanize = "*"
+pyparsing = "*"
+raven = "*"
+sqlparse = "*"
+whitenoise = "*"
 
 [dev-packages]
-pytest = "*"
-yapf = "*"
+"flake8" = "*"
 check-manifest= "*"
+django-extensions = "*"
+django-webtest = "*"
+docker = "*"
+drf-api-checker = ">=0.3"
+factory-boy = "*"
+ipython = "*"
+isort = "*"
+pdbpp = "*"
+pre-commit = "*"
+pytest = "*"
 pytest-coverage = "*"
 pytest-django = "*"
 pytest-echo = "*"
-"flake8" = "*"
-isort = "*"
 pytest-pythonpath = "*"
-pdbpp = "*"
-factory-boy = "*"
-drf-api-checker = ">=0.3"
-django-webtest = "*"
-docker = "*"
-django-extensions = "*"
 tox-pipenv = "==1.6.0"
-ipython = "*"
+yapf = "*"
 
 [requires]
 python_version = "3.6"