diff --git a/CHANGELOG.md b/CHANGELOG.md index 556d2b86..dc56b3c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 4.0.1 + +### Fix +* Don't reject templates with complex syntax (fb56a42aee82f9261596f7546f52f8b9930292de) + ## 4.0.0 diff --git a/document_merge_service/document_merge_service_metadata.py b/document_merge_service/document_merge_service_metadata.py index f2ae549e..610d0516 100644 --- a/document_merge_service/document_merge_service_metadata.py +++ b/document_merge_service/document_merge_service_metadata.py @@ -2,6 +2,6 @@ __title__ = "document_merge_service" __description__ = "Merge Document Template Service" -__version__ = "4.0.0-rc.1" +__version__ = "4.0.1" __author__ = "Adfinis SyGroup AG" __url__ = "https://github.com/adfinis-sygroup/document-merge-service" diff --git a/requirements-dev.txt b/requirements-dev.txt index c4d7de44..873d56f9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ factory-boy==2.12.0 flake8==3.7.9 flake8-debugger==3.2.1 flake8-docstrings==1.5.0 -flake8-isort==2.9.1 +flake8-isort==3.0.0 flake8-string-format==0.3.0 flake8-tuple==0.4.1 isort==4.3.21 @@ -15,7 +15,7 @@ pytest-cov==2.8.1 pytest-django==3.9.0 pytest-env==0.6.2 pytest-factoryboy==2.0.3 -pytest-randomly==3.2.1 +pytest-randomly==3.3.1 requests-mock==1.7.0 -python-semantic-release==5.1.0 +python-semantic-release==6.1.0 snapshottest==0.5.1 diff --git a/requirements.txt b/requirements.txt index 5c33d329..f2f8d16b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ babel==2.8.0 -django==2.2.11 +django==2.2.12 django_cors_headers==3.2.1 django-environ==0.4.5 django-filter==2.2.0 djangorestframework==3.10.3 docx-mailmerge==0.5.0 -docxtpl==0.6.3 +docxtpl==0.9.2 jsonpath==0.82 mysqlclient==1.4.6 psycopg2-binary==2.8.5