From 0f7b1c1e173207d6fccda04e8764e26314da6eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 22 Oct 2017 14:57:04 +0200
Subject: [PATCH] Remove support of Python 3.3 and add Python 3.6

issue6843
review41611002
---
 .drone.yml | 12 ++++++------
 CHANGELOG  |  2 ++
 setup.py   |  2 +-
 tox.ini    |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 6f8f1deacc..e0bc2f7026 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,12 +31,6 @@ matrix:
         - IMAGE: python:2.7
           TOXENV: py27
           DATABASE: postgresql
-        - IMAGE: python:3.3
-          TOXENV: py33
-          DATABASE: sqlite
-        - IMAGE: python:3.3
-          TOXENV: py33
-          DATABASE: postgresql
         - IMAGE: python:3.4
           TOXENV: py34
           DATABASE: sqlite
@@ -49,3 +43,9 @@ matrix:
         - IMAGE: python:3.5
           TOXENV: py35
           DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 5de4ca5c79..418e027f2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Add support for Python 3.6
+* Remove support for Python 3.3
 * Move handling of sequences to the Database object
 * Allow to add tests through entry points
 * Add translated descriptor for Reference field
diff --git a/setup.py b/setup.py
index 52c292c172..cfcb93d805 100644
--- a/setup.py
+++ b/setup.py
@@ -83,9 +83,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.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 :: Libraries :: Application Frameworks',
diff --git a/tox.ini b/tox.ini
index 4dabc67636..bd4664aec3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
     mock
-    {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5
+    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
     pypy-postgresql: psycopg2cffi >= 2.5
     mysql: MySQL-python
     sqlite: sqlitebck