Skip to content

Commit

Permalink
merge release/1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
CI committed Nov 30, 2018
2 parents 4581eaf + 1b6f575 commit 8cf29bc
Show file tree
Hide file tree
Showing 102 changed files with 2,886 additions and 665 deletions.
27 changes: 14 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
.DS_Store
*.egg-info
*.pyo
*.sqlite
*.~*
*credentials.*
.cache
.coverage
.DS_Store
.env
.idea
.pydevproject
.tox
.venv
/contacts.json
/dist
/media
Expand All @@ -16,23 +19,21 @@ __pycache__
CACHE
celerybeat-schedule
coverage.
xml
db/clean.sql
db/db1.bz2
db/etools.dump
db/public.sqldump
db/tenant.sql
djcelery.schedulers.DatabaseScheduler
docker/.envrc
docker/cache
docker/superset.db
LOCAL
local.yaml
pytest.xml
settings_local.py
~*
.pydevproject
db/db1.bz2
.env
.venv
docker/cache
src/etools_datamart/apps/core/static/api-doc.css.map
docker/superset.db
db/clean.sql
db/etools.dump
db/public.sqldump
db/tenant.sql
src/etools_datamart/apps/etools/models/public_old.py
src/etools_datamart/apps/etools/models/tenant_old.py
xml
~*
15 changes: 15 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
1.7
---
* WARNINGS: migration reset
* add YAML format
* new 'Monitor' page to check dataset last update date
* add ability to intercept changed/unchanged datamart records
* Azure storage support
* use versioning in API urls
* add email notifications on dataset changes
* add filter by 'last_modify_date'
* add 'updates/' endpoint to fetch only changes from last ETL
* add XHTML renderer
* add PDF renderer


1.6
---
* add ability to invalidate cache directly from admin endpoint
Expand Down
15 changes: 13 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ fullclean:
rm -fr .tox .cache .pytest_cache .venv
$(MAKE) clean


sync-etools:
sh src/etools_datamart/apps/multitenant/postgresql/dump.sh ${PG_ETOOLS_PARAMS}

Expand All @@ -56,6 +55,18 @@ ifdef BROWSE
firefox ${BUILDDIR}/docs/index.html
endif


urf:
pipenv run pytest tests/urf --cov-config tests/urf/.coveragerc


demo:
PYTHONPATH=./src pipenv run celery worker -A etools_datamart --loglevel=DEBUG --concurrency=4 --purge --pidfile celery.pid &
PYTHONPATH=./src pipenv run celery beat -A etools_datamart.celery --loglevel=DEBUG --pidfile beat.pid &
PYTHONPATH=./src pipenv run gunicorn -b 0.0.0.0:8000 etools_datamart.config.wsgi --pid gunicorn.pid &
pipenv run docker run -d -p 5555:5555 -e CELERY_BROKER_URL=$CELERY_BROKER_URL --name datamart-flower --rm saxix/flower

stop-demo:
- kill `cat gunicorn.pid`
- kill `cat beat.pid`
- kill `cat celery.pid`
- docker stop datamart-flower
17 changes: 15 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ django-model-utils = "*"
python-social-auth = "*"
social-auth-app-django = "*"
django-db-logging = "*"
cryptography = "*"
cryptography = "==2.4.1"
#rest-social-auth = "*"
"django-rest-framework-social-oauth2" = "*"
django-countries = "*"
Expand All @@ -46,6 +46,16 @@ drf-renderer-xlsx = "*"
django-redisboard = "*"
djangorestframework-xml = "*"
redis = "==2.10.6"
djangorestframework-yaml = "*"
django-storages = {extras = ["azure"], version = "*"}
onedrivesdk = "*"
azure-storage = "*"
django-basicauth = "*"
django-post-office = "*"
django-celery-email = "*"
"xhtml2pdf" = "*"
pisa = "*"
django-crispy-forms = "*"

[dev-packages]
"flake8" = ">=3.6.0"
Expand All @@ -58,14 +68,17 @@ factory-boy = "*"
ipython = "*"
isort = "*"
pdbpp = "*"
pre-commit = "*"
pytest = "*"
pytest-coverage = "*"
pytest-django = "*"
pytest-echo = "*"
pytest-pythonpath = "*"
yapf = "*"
vcrpy = "*"
pre-commit = "*"
freezegun = "*"
pytest-ignore-flaky = "*"
bumpversion = "*"

[requires]
python_version = "3.6"
Expand Down
Loading

0 comments on commit 8cf29bc

Please sign in to comment.