Fixing leftovers from migration to Django 1.11 and Python 3.6.

This commit is contained in:
Reggie Riser 2017-12-28 15:52:22 -05:00
parent 3aba5b82db
commit f7bd7a5814
14 changed files with 18 additions and 22 deletions

View File

@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
It is possible to tests with some versions of python, to do this the command
is::
$ tox -e py34,py35
$ tox -e py35,py36
Will run py.test with the python3.4, and python3.5 interpreters, for
Will run py.test with the python3.5, and python3.6 interpreters, for
example.
To run a particular test with tox for against your current Python version::

View File

@ -35,7 +35,7 @@ Make sure your project is fully commited and pushed up to Bitbucket or Github or
git clone <my-repo-url> # you can also use hg
cd my-project-name
mkvirtualenv --python=/usr/bin/python3.5 my-project-name
mkvirtualenv --python=/usr/bin/python3.6 my-project-name
pip install -r requirements/production.txt # may take a few minutes

View File

@ -20,7 +20,7 @@ Instructions
If you haven't done so, create a directory of environments::
eb init -p python3.4 MY_PROJECT_SLUG
eb init -p python3.6 MY_PROJECT_SLUG
Replace `MY_PROJECT_SLUG` with the value you entered for `project_slug`.

View File

@ -16,7 +16,7 @@ if docker == 'n':
python_major_version = sys.version_info[0]
if python_major_version == 2:
sys.stdout.write("WARNING: Cookiecutter Django does not support Python 2! Stability is guaranteed with Python 3.4+ only. Are you sure you want to proceed? (y/n)")
sys.stdout.write("WARNING: Cookiecutter Django does not support Python 2! Stability is guaranteed with Python 3.6+ only. Are you sure you want to proceed? (y/n)")
yes_options = set(['y'])
no_options = set(['n', ''])

View File

@ -1,4 +1,2 @@
# These requirements prevented an upgrade to Django 1.10.
django-coverage-plugin==1.5.0
# These requirements prevented an upgrade to Django 1.11.
django-autoslug==1.9.3

View File

@ -34,14 +34,13 @@ setup(
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Intended Audience :: Developers',
'Natural Language :: English',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development',

View File

@ -8,4 +8,4 @@ before_install:
- sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
language: python
python:
- "3.5"
- "3.6"

View File

@ -1,4 +1,4 @@
FROM python:3.5
FROM python:3.6
ENV PYTHONUNBUFFERED 1

View File

@ -1,4 +1,4 @@
FROM python:3.5
FROM python:3.6
ENV PYTHONUNBUFFERED 1

View File

@ -58,7 +58,7 @@ The `Docker compose documentation`_ explains in detail what you can accomplish i
build: database
webapp:
build: webapp:
command: /usr/bin/python3.4 manage.py runserver 0.0.0.0:8000 # dev setting
command: /usr/bin/python3.6 manage.py runserver 0.0.0.0:8000 # dev setting
# command: gunicorn -b 0.0.0.0:8000 wsgi:application # production setting
volumes:
- webapp/your_project_name:/path/to/container/workdir/

View File

@ -1 +1 @@
python-3.6.2
python-3.6.3

View File

@ -1,6 +1,6 @@
from django.contrib.auth.models import AbstractUser
from django.core.urlresolvers import reverse
from django.db import models
from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _

View File

@ -1,4 +1,4 @@
from django.core.urlresolvers import reverse, resolve
from django.urls import reverse, resolve
from test_plus.test import TestCase

View File

@ -1,7 +1,6 @@
from django.core.urlresolvers import reverse
from django.views.generic import DetailView, ListView, RedirectView, UpdateView
from django.contrib.auth.mixins import LoginRequiredMixin
from django.urls import reverse
from django.views.generic import DetailView, ListView, RedirectView, UpdateView
from .models import User