Skip to content

Commit 264e7a6

Browse files
authored
Merge pull request #319 from peopledoc/py36-support
Added Python 3.6 support
2 parents ba0ac84 + 9a7ef9d commit 264e7a6

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

CHANGELOG.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ChangeLog
55
master (unreleased)
66
===================
77

8-
Nothing here yet.
8+
- Added compatibility with Python 3.6 (#318).
99

1010
Release 1.5.2 (2018-03-30)
1111
==========================

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ edit, delete and use forms.
1313
Warnings
1414
========
1515

16-
* Python Compatibility : Python 2.7, 3.5
16+
* Python Compatibility : Python 2.7, 3.5, 3.6
1717
* Django compatibility : Django 1.8, 1.9, 1.10, 1.11
1818

1919
See the `Deprecation timeline <http://django-formidable.readthedocs.io/en/latest/deprecations.html>`_ document for more information on deprecated versions.

circle.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
machine:
22
post:
3-
- pyenv global 2.7.10 3.5.0
3+
- pyenv global 2.7.10 3.5.3 3.6.2
44

55
dependencies:
6-
override:
7-
- pip install --upgrade tox virtualenv
6+
override:
7+
- pip install --upgrade tox virtualenv tox-pyenv
88

99
test:
10-
override:
11-
- tox -e $(tox -l | grep django18 | tr '\n' ',')
12-
- tox -e $(tox -l | grep django19 | tr '\n' ',')
13-
- tox -e $(tox -l | grep django110 | tr '\n' ',')
14-
- tox -e $(tox -l | grep django111 | tr '\n' ',')
15-
- tox -e flake8
16-
- tox -e isort-check
17-
- tox -e docs
10+
override:
11+
- tox -e $(tox -l | grep django18 | tr '\n' ',')
12+
- tox -e $(tox -l | grep django19 | tr '\n' ',')
13+
- tox -e $(tox -l | grep django110 | tr '\n' ',')
14+
- tox -e $(tox -l | grep django111 | tr '\n' ',')
15+
- tox -e flake8
16+
- tox -e isort-check
17+
- tox -e docs

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
'Programming Language :: Python :: 2.7',
4141
'Programming Language :: Python :: 3',
4242
'Programming Language :: Python :: 3.5',
43+
'Programming Language :: Python :: 3.6',
4344
'Topic :: Internet :: WWW/HTTP',
4445
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
4546
],

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[tox]
22
envlist =
3-
django18-py{27,35}
4-
django19-py{27,35}
5-
django110-py{27,35}
6-
django111-py{27,35}
3+
django18-py{27,35,36}
4+
django19-py{27,35,36}
5+
django110-py{27,35,36}
6+
django111-py{27,35,36}
77
spectest
88
flake8
99
isort-check

0 commit comments

Comments
 (0)