Add Support Python3.6 (#674)

awesto · Oct 25, 2017 · 16af409 · 16af409
1 parent e4087d9
commit 16af409
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
 
 env:
   - DJANGOVER=django19
@@ -18,4 +19,5 @@ script:
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' && $DJANGOVER ]]; then export TOX_ENV=py27-$DJANGOVER; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' && $DJANGOVER ]]; then export TOX_ENV=py34-$DJANGOVER; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' && $DJANGOVER ]]; then export TOX_ENV=py35-$DJANGOVER; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' && $DJANGOVER ]]; then export TOX_ENV=py36-$DJANGOVER; fi"
   - tox -r -e "$TOX_ENV"
diff --git a/requirements/common.txt b/requirements/common.txt
@@ -44,7 +44,7 @@ pytz==2015.7
 redis==2.10.3
 requests==2.7.0
 requests-oauthlib==0.5.0
-six==1.10.0
+six==1.11.0
 stripe==1.37.0
 Unidecode==0.4.18
 urllib3==1.12

diff --git a/setup.py b/setup.py
@@ -25,6 +25,7 @@ def convert(filename, fmt):
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
     'Topic :: Software Development :: Libraries :: Application Frameworks',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
 ]

diff --git a/shop/models/fields.py b/shop/models/fields.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import enum
+import six
 
 from django.conf import settings
 from django.db import models
@@ -42,7 +43,7 @@ def __call__(cls, value, *args, **kwargs):
 
 
 @python_2_unicode_compatible
-class ChoiceEnum(with_metaclass(ChoiceEnumMeta, enum.Enum)):
+class ChoiceEnum(six.with_metaclass(ChoiceEnumMeta, enum.Enum)):
     """
     Utility class to handle choices in Django model fields
     """

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean, py{27,34,35}-django{19,110}, coverage-report
+envlist = coverage-clean, py{27,34,35,36}-django{19,110}, coverage-report
 
 [testenv]
 # usedevelop is needed to collect coverage data.
@@ -12,6 +12,7 @@ deps =
     py27: -r{toxinidir}/requirements/test_py2.txt
     py34: -r{toxinidir}/requirements/test_py3.txt
     py35: -r{toxinidir}/requirements/test_py3.txt
+    py36: -r{toxinidir}/requirements/test_py3.txt
 setenv =
     DJANGO_SHOP_TUTORIAL = i18n_polymorphic
     DJANGO_DEBUG = 1