From 575e229514ebbbbe3c031c16e4e5baad7b4cbed0 Mon Sep 17 00:00:00 2001
From: Yannick Jadoul <yannick.jadoul@belgacom.net>
Date: Fri, 10 Apr 2020 02:00:29 +0200
Subject: [PATCH] Drop 3.5 host support and adapt CI configurations

---
 .travis.yml                            | 26 +++++++++++++-------------
 CI.md                                  | 12 ++++++------
 azure-pipelines.yml                    | 10 ----------
 examples/travis-ci-test-and-deploy.yml |  1 -
 setup.py                               |  2 +-
 5 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bda329c..89999e04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,22 +6,22 @@ branches:
 
 jobs:
   include:
-    - name: Linux | x86_64 + i686 | Python 3.5
+    - name: Linux | x86_64 + i686 | Python 3.6
       language: python
-      python: 3.5
+      python: 3.6
       services: docker
       env: PYTHON=python
 
-    - name: Linux | arm64 | Python 3.5
+    - name: Linux | arm64 | Python 3.6
       language: python
-      python: 3.5
+      python: 3.6
       services: docker
       arch: arm64
       env: PYTHON=python
 
-    - name: Linux | ppc64le | Python 3.5
+    - name: Linux | ppc64le | Python 3.6
       language: python
-      python: 3.5
+      python: 3.6
       services: docker
       arch: ppc64le
       env: PYTHON=python
@@ -30,25 +30,25 @@ jobs:
       os: osx
       env: PYTHON=python3
 
-    - name: Windows | x86_64 | Python 3.5
+    - name: Windows | x86_64 | Python 3.6
       os: windows
       language: shell
       before_install:
-       - choco install python3 --version 3.5.4 --no-progress -y
+       - choco install python3 --version 3.6.8 --no-progress -y
       env:
-        - PYTHON=C:\\Python35\\python
+        - PYTHON=C:\\Python36\\python
 
-    - &linux_s390x_35
-      name: Linux | s390x | Python 3.5
+    - &linux_s390x_36
+      name: Linux | s390x | Python 365
       language: python
-      python: 3.5
+      python: 3.6
       services: docker
       arch: s390x
       env: PYTHON=python
 
   allow_failures:
     # must repeat the s390x job above exactly to match
-    - *linux_s390x_35
+    - *linux_s390x_36
 
 install: $PYTHON -m pip install -r requirements-dev.txt
 
diff --git a/CI.md b/CI.md
index abcd6d88..eb990757 100644
--- a/CI.md
+++ b/CI.md
@@ -1,12 +1,12 @@
 This is a summary of the Python versions and platforms covered by the different CI platforms:
 
-|          | 3.5              | 3.6              | 3.7                                                | 3.8              |
-|----------|------------------|------------------|----------------------------------------------------|------------------|
-| Linux    | Travis CI        | CircleCI         | AppVeyor² / GitHub Actions                         | Azure Pipelines  |
-| macOS    | Azure Pipelines  | CircleCI         | AppVeyor² / Travis CI¹ / CircleCI / GitHub Actions | Azure Pipelines  |
-| Windows  | TravisCI         | Azure Pipelines  | AppVeyor² / GitHub Actions                         | Azure Pipelines  |
+|          | 3.6                          | 3.7                                                 | 3.8              |
+|----------|------------------------------|-----------------------------------------------------|------------------|
+| Linux    | Travis CI / CircleCI         | AppVeyor² / GitHub Actions                          | Azure Pipelines  |
+| macOS    | CircleCI                     | AppVeyor² / Travis CI¹ / CircleCI / GitHub Actions  | Azure Pipelines  |
+| Windows  | Travis CI / Azure Pipelines  | AppVeyor² / GitHub Actions                          | Azure Pipelines  |
 
 > ¹ Python version not really pinned, but dependent on the (default) version of image used.
 > ² AppVeyor only runs the "basic" test to reduce load.
 
-Non-x86 architectures are covered on Travis CI using Python 3.5.
+Non-x86 architectures are covered on Travis CI using Python 3.6.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4b5aabd3..b2d324be 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,16 +9,6 @@ jobs:
         python -m pip install -r requirements-dev.txt
         python ./bin/run_tests.py
 
-- job: macos_35
-  pool: {vmImage: 'macOS-10.15'}
-  steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.5'
-    - bash: |
-        python -m pip install -r requirements-dev.txt
-        python ./bin/run_tests.py
-
 - job: macos_38
   pool: {vmImage: 'macOS-10.15'}
   steps:
diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml
index d2218971..eada75c8 100644
--- a/examples/travis-ci-test-and-deploy.yml
+++ b/examples/travis-ci-test-and-deploy.yml
@@ -7,7 +7,6 @@
 
 language: python
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
diff --git a/setup.py b/setup.py
index f6992844..143e313c 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(
         'cibuildwheel': ['resources/*'],
     },
     # Supported python versions
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     keywords='ci wheel packaging pypi travis appveyor macos linux windows',
     classifiers=[
         'Intended Audience :: Developers',