From 7779c726a07088b56dfabca12579dbd1bb4ea77f Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrioneuvo da Luz" Date: Mon, 1 Feb 2016 18:10:14 -0300 Subject: [PATCH] update django, django-floppyforms, hitchpython and selenium version --- CHANGELOG.md | 25 +++++++++++-------- setup.py | 2 +- .../requirements/base.txt | 4 +-- .../tests/hitchreqs.txt | 4 +-- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5f108e..9ca2ce9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,16 @@ All enhancements and patches to cookiecutter-django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2016-1-30] +## [2016-02-01] +### Changed +- Update version of Django and django-floppyforms (@luzfcb) +- Update version of Hitch tests dependencies: hitchpython and selenium (@luzfcb) + +## [2016-01-30] ### Changed - Update flake8 to 2.5.2 (@luzfcb) -## [2016-1-29] +## [2016-01-29] ### Changed - Update AngularJS version to 1.4.9 (@luzfcb) - Update jQuery version to 2.2.0 (@luzfcb) @@ -15,7 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Update version of Hitch tests dependencies: colorama, decorator, hitchpostgres, hitchpython, hitchredis, hitchselenium, hitchserve, hitchsystem, hitchtest, ipython, patool, pickleshare, psutil, python-build, requests, selenium, tblib, traitlets (@luzfcb) -## [2016-1-26] +## [2016-01-26] ### Changed - Fixed NEW_RELIC_APP_NAME environment variable (@jayfk) @@ -27,24 +32,24 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Removed the $-sign from allowed chars to generate the secret key (@jayfk) -## [2016-1-17] +## [2016-01-17] ### Added - Adding a section on third party articles referencing `cookiecutter-django` (@mjheo) ### Changed - Add celerybeat db to gitignore (@originell) -## [2016-1-16] +## [2016-01-16] ### Added - Adding an explanation for having `django.contrib.sites`. (@pydanny) -## [2016-1-13] +## [2016-01-13] ### Changed - Update setup.py version to 1.9.1 to match Django version. (@Collederas) - Require Wheel 0.26.0. Needed to install certain packages on CPython 3.5+ like Pillow and psycopg2 (@audreyr) -## [2016-1-9] +## [2016-01-09] ### Changed - Upgraded django-extensions to 1.6.1 as it fixes a [JSONField bug](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md#161) (@burhan) - Upgraded Pillow to version 3.1.0 ([upstream changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst#310-2016-01-04)) (@burhan) @@ -52,19 +57,19 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Upgraded django-crispy-forms to 1.6 for [BS4 and django 1.9 compatibility fixes](https://github.com/maraujop/django-crispy-forms/blob/dev/CHANGELOG.md#160-201617) (@burhan) - Upgraded django-model-utils to 2.4, to enable [support for django 1.9](https://github.com/carljm/django-model-utils/blob/master/CHANGES.rst#24-2015-12-03) (@burhan) -## [2016-1-8] +## [2016-01-08] ### Changed - Fixed redis url on docker (@jayfk) - Fixed docker on windows (@burhan) -## [2016-1-6] +## [2016-01-06] ### Added - You can now enable or disable user registration using the ACCOUNT_ALLOW_REGISTRATION setting. (@ddiazpinto) ### Changed - Use Postgres 9.5 on docker (@jayfk) -## [2016-1-4] +## [2016-01-04] ### Added - Add Tether.js because [is needed](http://v4-alpha.getbootstrap.com/components/tooltips/#overview) for proper positioning of Bootstrap tooltips (@EricZaporzan) diff --git a/setup.py b/setup.py index 29c20e2d..152c6f82 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,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.1" +version = "1.9.2" if sys.argv[-1] == 'tag': os.system("git tag -a %s -m 'version %s'" % (version, version)) diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index 18ce90cc..7e54c726 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.26.0 {%- endif %} # Bleeding edge Django -django==1.9.1 +django==1.9.2 # Configuration django-environ==0.4.0 @@ -20,7 +20,7 @@ whitenoise==2.0.6 # Forms django-braces==1.8.1 django-crispy-forms==1.6.0 -django-floppyforms==1.6.0 +django-floppyforms==1.6.1 # Models django-model-utils==2.4 diff --git a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt index 29353452..a52c8540 100644 --- a/{{cookiecutter.repo_name}}/tests/hitchreqs.txt +++ b/{{cookiecutter.repo_name}}/tests/hitchreqs.txt @@ -5,7 +5,7 @@ docopt==0.6.2 faketime==0.9.6.3 hitchcron==0.2 hitchpostgres==0.7.0 -hitchpython==0.5.2 +hitchpython==0.5.3 hitchredis==0.4.6 hitchselenium==0.5.0 hitchserve==0.4.8 @@ -29,7 +29,7 @@ python-dateutil==2.4.2 pyuv==1.2.0 PyYAML==3.11 requests==2.9.1 -selenium==2.50.0 +selenium==2.50.1 simplegeneric==0.8.1 six==1.10.0 tblib==1.2.0