From 6041c1e03b3c9353391ccb69619eae541d9515fc Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Mon, 14 Feb 2022 23:51:03 +0100
Subject: [PATCH] Drop Python 2.6 support

---
 .github/workflows/test.yml | 2 +-
 Jenkinsfile                | 1 -
 README.md                  | 2 +-
 setup.cfg                  | 3 +--
 tox.ini                    | 9 ++++-----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 981b29bee..9ce90730f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/Jenkinsfile b/Jenkinsfile
index c01a1625a..2c46c5e02 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,6 @@ def pys = [
     [name: 'Python 3.9',  docker: 'python:3.9-buster',  tox:'py39', main: false],
     [name: 'Python 3.8',  docker: 'python:3.8-buster',  tox:'py38', main: false],
     [name: 'Python 3.7',  docker: 'python:3.7-buster',  tox:'py37', main: false],
-    [name: 'Python 3.6',  docker: 'python:3.6-buster',  tox:'py36', main: false],
 ]
 
 properties([
diff --git a/README.md b/README.md
index c78cc1e54..5dccf5fe2 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ are old enough to view them.
 ### Dependencies
 
 Since dosage is written in [Python](http://www.python.org/), a Python
-installation is required: Dosage needs at least Python 3.6. Dosage requires
+installation is required: Dosage needs at least Python 3.7. Dosage requires
 some Python modules from PyPI, so installation with `pip` is recommended.
 
 ### Using the Windows binary
diff --git a/setup.cfg b/setup.cfg
index 7a0547010..ebaa4aaf9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -41,7 +40,7 @@ install_requires =
     cached_property;python_version<'3.8'
     importlib_metadata;python_version<'3.8'
 include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
 setup_requires =
     setuptools>=38.3.0
     setuptools_scm
diff --git a/tox.ini b/tox.ini
index c0b17467c..49105fbfc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py36, py37, py38, py39, py310, flake8
+envlist = py37, py38, py39, py310, flake8
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
@@ -35,15 +34,15 @@ commands =
 [flake8]
 # we aim for 79, but this suppresses warnings for now...
 max-line-length = 100
-ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W504
+ignore = E127,E128,E241,FI12,FI14,FI15,FI18,FI50,FI51,FI53,FI54,FI55,W504
 require-code = True
 no-accept-encodings = True
-min-version = 3.6
+min-version = 3.7
 
 # Duplicated for CodeClimate...
 [pep8]
 max-line-length = 100
-ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W504
+ignore = E127,E128,E241,FI12,FI14,FI15,FI18,FI50,FI51,FI53,FI54,FI55,W504
 
 [pytest]
 filterwarnings = default