diff --git a/CHANGELOG.md b/CHANGELOG.md index e2a87664..38352150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2016-05-03] +### Changed +- Update version of Django, django-extensions, django-mailgun (@luzfcb) + ### [2016-05-01] ### Changed - Restored the Pycharm project configuration files, that was accidentally removed in [15f350f](https://github.com/pydanny/cookiecutter-django/commit/15f350f05e2b49b4bdff0bdaa2b2ff260606e0f6) (@luzfcb @Newton715) diff --git a/setup.py b/setup.py index 7c4347cf..e52d1b3b 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ except ImportError: # Our version ALWAYS matches the version of Django we support # If Django has a new release, we branch, tag, then update this setting after the tag. -version = '1.9.4' +version = '1.9.6' if sys.argv[-1] == 'tag': os.system('git tag -a %s -m "version %s"' % (version, version)) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e2d4c7fc..f5e35acd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.9.5 +django==1.9.6 # Configuration django-environ==0.4.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 760019a0..4711c0a3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ coverage==4.0.3 django_coverage_plugin==1.3 Sphinx -django-extensions==1.6.3 +django-extensions==1.6.6 Werkzeug==0.11.9 django-test-plus==1.0.12 factory_boy==2.7.0 diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index d33f4232..f6b1eaa3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.2.3 # Mailgun Support # --------------- -django-mailgun==0.8.0 +django-mailgun==0.9.1 {% if cookiecutter.use_sentry == "y" -%} # Raven is the Sentry client