Skip to content

Commit

Permalink
Support python 3.7 (cookiecutter#2240)
Browse files Browse the repository at this point in the history
Support python 3.7
  • Loading branch information
browniebroke authored Oct 6, 2019
2 parents 99ccd31 + 51bf90c commit 6a9feea
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:

language: python

python: 3.6
python: 3.7

before_install:
- docker-compose -v
Expand All @@ -14,7 +14,7 @@ before_install:
matrix:
include:
- name: Test results
script: tox -e py36
script: tox -e py37
- name: Run flake8 on result
script: tox -e flake8
- name: Run black on result
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
It is possible to test with a specific version of python. To do this, the command
is::

$ tox -e py36
$ tox -e py37

This will run py.test with the python3.6 interpreter, for example.
This will run py.test with the python3.7 interpreter, for example.

To run a particular test with tox for against your current Python version::

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Listed in alphabetical order.
Michael Gecht `@mimischi`_ @_mischi
Min ho Kim `@minho42`_
mozillazg `@mozillazg`_
Nico Stefani `@nicolas471`_ @moby_dick91
Oleg Russkin `@rolep`_
Pablo `@oubiga`_
Parbhat Puri `@parbhat`_
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Features
---------

* For Django 2.2
* Works with Python 3.6
* Works with Python 3.7
* Renders Django projects with 100% starting test coverage
* Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
* 12-Factor_ based settings via django-environ_
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment-on-pythonanywhere.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
git clone <my-repo-url> # you can also use hg
cd my-project-name
mkvirtualenv --python=/usr/bin/python3.6 my-project-name
mkvirtualenv --python=/usr/bin/python3.7 my-project-name
pip install -r requirements/production.txt # may take a few minutes
Expand Down
4 changes: 2 additions & 2 deletions docs/developing-locally.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ Setting Up Development Environment

Make sure to have the following on your host:

* Python 3.6
* Python 3.7
* PostgreSQL_.
* Redis_, if using Celery

First things first.

#. Create a virtualenv: ::

$ python3.6 -m venv <virtual env path>
$ python3.7 -m venv <virtual env path>

#. Activate the virtualenv you have just created: ::

Expand Down
2 changes: 1 addition & 1 deletion hooks/pre_gen_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
if python_major_version == 2:
print(
WARNING + "You're running cookiecutter under Python 2, but the generated "
"project requires Python 3.6+. Do you want to proceed (y/n)? " + TERMINATOR
"project requires Python 3.7+. Do you want to proceed (y/n)? " + TERMINATOR
)
yes_options, no_options = frozenset(["y"]), frozenset(["n"])
while True:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development",
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
skipsdist = true
envlist = py36,flake8,black,black-template
envlist = py37,flake8,black,black-template

[testenv]
deps = -rrequirements.txt
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ before_install:
- sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
language: python
python:
- "3.6"
- "3.7"
install:
- pip install -r requirements/local.txt
script:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6-alpine
FROM python:3.7-alpine

ENV PYTHONUNBUFFERED 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN npm run build

# Python build stage
{%- endif %}
FROM python:3.6-alpine
FROM python:3.7-alpine

ENV PYTHONUNBUFFERED 1

Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.6.8
python-3.7.3
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ max-line-length = 120
exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules

[mypy]
python_version = 3.6
python_version = 3.7
check_untyped_defs = True
ignore_errors = False
ignore_missing_imports = True
Expand Down

0 comments on commit 6a9feea

Please sign in to comment.