From 90bdbab571c0ac8314bbce150d5246556a24bb13 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 4 Feb 2022 18:58:57 +0000
Subject: [PATCH] Remove support for py36 and py37

As part of reduce testing complexy and getting ansible-lint in sync
with  ansible-core, we drop support for older python versions.

This change marks the start of `6.x` and once is merged we will
create a `stable/5.x` for the last comment before it. That branch
will be used to backport changes needed for the older versions, at
least until we can make a full release of 6.x.

One additional reason for making this move is a recent explosion
of dropping support for py36 and sometimes even py37 on other
dependencies, such pytest, coverage, pip-compile, tomli.
---
 .github/workflows/tox.yml | 22 +++-------------------
 docs/contributing.rst     |  2 +-
 setup.cfg                 |  2 +-
 tox.ini                   |  6 ++----
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 9f0d3874f06..cc04bae2b8c 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -105,8 +105,6 @@ jobs:
       matrix:
         python-version:
         # keep list sorted as it determines UI order too
-        - 3.6
-        - 3.7
         - 3.8
         - 3.9
         - "3.10"
@@ -116,12 +114,6 @@ jobs:
         # - windows-latest
         # - windows-2016
         include:
-        - tox_env: py36
-          os: ubuntu-20.04
-          python-version: 3.6
-        - tox_env: py37
-          os: ubuntu-20.04
-          python-version: 3.7
         - tox_env: py38
           os: ubuntu-20.04
           python-version: 3.8
@@ -134,14 +126,12 @@ jobs:
           os: ubuntu-20.04
           python-version: "3.10"
           devel: true
-          skip_ansible29: true
-        - tox_env: py36
+        - tox_env: py38
           os: macOS-latest
-          python-version: 3.6
+          python-version: 3.8
         - tox_env: py310
           os: macOS-latest
           python-version: "3.10"
-          skip_ansible29: true
 
     env:
       TOX_PARALLEL_NO_SPINNER: 1
@@ -191,19 +181,13 @@ jobs:
         --skip-missing-interpreters false
         -vv
       env:
-        TOXENV: ${{ matrix.tox_env }}-core,${{ matrix.tox_env }}-ansible29
+        TOXENV: ${{ matrix.tox_env }}-core
     # sequential run improves browsing experience (almost no speed impact)
     - name: "Test with tox: ${{ matrix.tox_env }}-core"
       run: |
         python3 -m tox
       env:
         TOXENV: ${{ matrix.tox_env }}-core
-    - name: "Test with tox: ${{ matrix.tox_env }}-ansible29"
-      if: ${{ !matrix.skip_ansible29 }}
-      run: |
-        python3 -m tox
-      env:
-        TOXENV: ${{ matrix.tox_env }}-ansible29
     - name: "Test with tox: ${{ matrix.tox_env }}-devel"
       if: ${{ matrix.devel }}
       run: |
diff --git a/docs/contributing.rst b/docs/contributing.rst
index c96197be6a8..ae51722c23c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -38,7 +38,7 @@ to create a new rule by following the steps below:
 * If the rule is task specific, it may be best to include a test to verify its
   use inside blocks as well.
 * Optionally run only the rule specific tests with a command like:
-  :command:`tox -e py38-ansible29 -- -k NewRule`
+  :command:`tox -e py38 -- -k NewRule`
 * Run :command:`tox` in order to run all ansible-lint tests. Adding a new rule
   can break some other tests. Update them if needed.
 * Run :command:`ansible-lint -L` and check that the rule description renders
diff --git a/setup.cfg b/setup.cfg
index 20e8e97fc1f..4e900e1fed4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -57,7 +57,7 @@ keywords =
 
 [options]
 use_scm_version = True
-python_requires = >=3.6
+python_requires = >=3.8
 package_dir =
   = src
 packages = find:
diff --git a/tox.ini b/tox.ini
index 95ab67e98dd..bb891e94cfb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@ envlist =
   lint
   packaging
   py310-{core,devel}
-  py{39,38}-{core,ansible29,devel}
-  py{37,36}-{core,ansible29}
+  py{39,38}-{core,devel}
+  py{37,36}-core
 isolated_build = true
 requires =
   setuptools >= 41.4.0
@@ -16,12 +16,10 @@ skip_missing_interpreters = True
 description =
   Run the tests under {basepython} and
   devel: ansible devel branch
-  ansible29: ansible 2.9
   core: ansible-core 2.11+
 deps =
   --editable .[yamllint,test]
   core: ansible-core
-  ansible29: ansible>=2.9,<2.10
   py: ansible-core>=2.11
   devel: ansible-core @ git+https://github.com/ansible/ansible.git  # GPLv3+
 commands =