From d87a3d889d7ea86dd9b3acfa8a319eb47e83a13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 18 Dec 2021 16:34:37 +0100
Subject: [PATCH] Add support for Python 3.10

and remove support for Python 3.6.

issue11048
review364451002
---
 .drone.yml | 12 ++++++------
 CHANGELOG  |  3 +++
 setup.py   |  4 ++--
 tox.ini    |  6 ++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 3c40b09b24..54fbe6947c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,12 +43,6 @@ services:
 
 matrix:
     include:
-        - IMAGE: python:3.6
-          TOXENV: py36
-          DATABASE: sqlite
-        - IMAGE: python:3.6
-          TOXENV: py36
-          DATABASE: postgresql
         - IMAGE: python:3.7
           TOXENV: py37
           DATABASE: sqlite
@@ -67,3 +61,9 @@ matrix:
         - IMAGE: python:3.9
           TOXENV: py39
           DATABASE: postgresql
+        - IMAGE: python:3.10
+          TOXENV: py310
+          DATABASE: sqlite
+        - IMAGE: python:3.10
+          TOXENV: py310
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 04b164999b..1193c79204 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+* Add support for Python 3.10
+* Remove support for Python 3.6
+
 Version 6.2.0 - 2021-11-01
 * Initial release
diff --git a/setup.py b/setup.py
index 4fbb19aa1f..5d9c8ff446 100755
--- a/setup.py
+++ b/setup.py
@@ -142,16 +142,16 @@ setup(name=name,
         'Natural Language :: Turkish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index ba6dbbf5c2..beb8d1eacc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py37,py38,py39,py310}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands =
@@ -7,13 +7,11 @@ commands =
     coverage report --include=.*/web_shop_shopify/* --omit=*/tests/*
 deps =
     coverage
-    {py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5
+    {py37,py38,py39,py310}-postgresql: psycopg2 >= 2.5
     pypy3-postgresql: psycopg2cffi >= 2.5
-    py36-sqlite: sqlitebck
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
     postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
     sqlite: DB_NAME={env:SQLITE_NAME::memory:}
     postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
-passenv = SHOPIFY_PASSWORD SHOPIFY_URL TRYTOND_WEB_SHOP_SHOPIFY__API_BACKOFF_TIME
 install_command = pip install --pre --find-links https://trydevpi.tryton.org/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER:}.{env:CI_JOB_NUMBER:}} {opts} {packages}