diff --git a/.travis.yml b/.travis.yml index 8ca40c77..f6e18b52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,10 @@ services: language: python -python: 3.5 +python: 3.6 env: - - TOX_ENV=py34 - - TOX_ENV=py35 + - TOX_ENV=py36 before_install: - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list' diff --git a/CHANGELOG.md b/CHANGELOG.md index 70a142fc..c40bb26b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2015-10-08] +## [2017-12-28] +### Changed +- Upgraded to Django 1.11 (@pydanny) + +## [2017-10-08] ### Changed - Elastic Beanstalk: Added --noinput to migrate command (@MightySCollins ) -## [2015-10-07] +## [2017-10-07] ### Added - Finished first pass at Elastic Beanstalk docs (@pydanny & @audreyr) ### Deleted diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 08bca907..4cf632db 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -127,6 +127,7 @@ Listed in alphabetical order. Pablo `@oubiga`_ Parbhat Puri `@parbhat`_ Peter Bittner `@bittner`_ + Pierre Chiquet `@pchiquet`_ Raphael Pierzina `@hackebrot`_ Raony Guimarães Corrêa `@raonyguimaraes`_ Reggie Riser `@reggieriser`_ diff --git a/README.rst b/README.rst index 589f1c92..838253f4 100644 --- a/README.rst +++ b/README.rst @@ -34,8 +34,8 @@ production-ready Django projects quickly. Features --------- -* For Django 1.10 -* Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental +* For Django 1.11 +* Works with Python 3.6 * Renders Django projects with 100% starting test coverage * Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available) * 12-Factor_ based settings via django-environ_ diff --git a/cookiecutter.json b/cookiecutter.json index 8addeead..184e8796 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,7 +18,7 @@ "use_heroku": "n", "use_elasticbeanstalk_experimental": "n", "use_compressor": "n", - "postgresql_version": ["9.6", "9.5", "9.4", "9.3", "9.2"], + "postgresql_version": ["10", "9.6", "9.5", "9.4", "9.3", "9.2"], "js_task_runner": ["Gulp", "Grunt", "None"], "custom_bootstrap_compilation": "n", "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"] diff --git a/docs/deployment-with-elastic-beanstalk.rst b/docs/deployment-with-elastic-beanstalk.rst index e8aae885..d481c93b 100644 --- a/docs/deployment-with-elastic-beanstalk.rst +++ b/docs/deployment-with-elastic-beanstalk.rst @@ -21,6 +21,9 @@ Instructions If you haven't done so, create a directory of environments:: eb init -p python3.4 MY_PROJECT_SLUG + # Warning: If you use python3.6, you will run into problems later due to some incompatibility with + # mod_wgsi 3.5 (packaged in 64bit Amazon Linux 2017.09 v2.6.1 running Python 3.6). See: + # https://serverfault.com/questions/884469/mod-wsgi-call-to-site-addsitedir-failed-on-aws-elastic-beanstalk-python-3/885445 Replace `MY_PROJECT_SLUG` with the value you entered for `project_slug`. diff --git a/requirements.txt b/requirements.txt index 6d3fa8cd..1790a021 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.14 binaryornot==0.4.4 # Testing -pytest==3.2.5 +pytest==3.3.2 pycodestyle==2.3.1 pyflakes==1.6.0 tox==2.9.1 diff --git a/setup.py b/setup.py index 6dc6635e..a300dc7f 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.10.7' +version = '1.11.8' if sys.argv[-1] == 'tag': os.system('git tag -a %s -m "version %s"' % (version, version)) diff --git a/tox.ini b/tox.ini index 311d80f4..a16b80ed 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py34,py35 +envlist = py36 [testenv] passenv = LC_ALL, LANG, HOME diff --git a/{{cookiecutter.project_slug}}/.ebextensions/10_packages.config b/{{cookiecutter.project_slug}}/.ebextensions/10_packages.config index c0774efa..136be533 100644 --- a/{{cookiecutter.project_slug}}/.ebextensions/10_packages.config +++ b/{{cookiecutter.project_slug}}/.ebextensions/10_packages.config @@ -3,3 +3,5 @@ packages: git: [] postgresql94-devel: [] libjpeg-turbo-devel: [] + libffi: [] + libffi-devel: [] diff --git a/{{cookiecutter.project_slug}}/.ebextensions/40_python.config b/{{cookiecutter.project_slug}}/.ebextensions/40_python.config index 111bf1ca..03b91eb4 100644 --- a/{{cookiecutter.project_slug}}/.ebextensions/40_python.config +++ b/{{cookiecutter.project_slug}}/.ebextensions/40_python.config @@ -10,7 +10,7 @@ option_settings: REDIS_ENDPOINT_ADDRESS: '`{ "Fn::GetAtt" : [ "MyElastiCache", "RedisEndpoint.Address"]}`' REDIS_PORT: '`{ "Fn::GetAtt" : [ "MyElastiCache", "RedisEndpoint.Port"]}`' "aws:elasticbeanstalk:container:python": - WSGIPath: "config/wsgi.py" + WSGIPath: config/wsgi.py NumProcesses: 3 NumThreads: 20 "aws:elasticbeanstalk:container:python:staticfiles": diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml index 95f45bfb..cc2fe0bb 100644 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml @@ -6,7 +6,7 @@ -