From f3ee6f89153b063eef6e8ad417ed8519ab979e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 1 Aug 2023 10:46:35 +0200
Subject: [PATCH] deps: Drop support for old Python versions

Drop support for Python versions not supported upstream.
---
 .github/workflows/test.yml | 2 --
 .pre-commit-config.yaml    | 2 +-
 docker-compose.yml         | 4 ++--
 setup.py                   | 6 +++---
 tox.ini                    | 8 ++++----
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fc056eba..f2e8b4770 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,8 +8,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - '3.6'
-        - '3.7'
         - '3.8'
         - '3.9'
         - '3.10'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f2dfe05f4..aa127f6b4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
   rev: v3.10.1
   hooks:
   - id: pyupgrade
-    args: [--py36-plus]
+    args: [--py38-plus]
 - repo: https://github.com/psf/black
   rev: 23.7.0
   hooks:
diff --git a/docker-compose.yml b/docker-compose.yml
index d9e05a994..2d4acc679 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,8 @@ services:
       context: .
       dockerfile: ./files/tests/Dockerfile
       args:
-      - PYTHON_VERSIONS=3.6.12 3.7.16 3.8.16 3.9.16 3.10.10 3.11.2
+      - PYTHON_VERSIONS=3.8.17 3.9.17 3.10.12 3.11.4
     environment:
-    - PYTHON_VERSIONS=3.6.12 3.7.16 3.8.16 3.9.16 3.10.10 3.11.2
+    - PYTHON_VERSIONS=3.8.17 3.9.17 3.10.12 3.11.4
     volumes:
     - .:/code
diff --git a/setup.py b/setup.py
index 2e9c46abc..9fc6cdf21 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ def read_tests_requirements(filename):
     long_description=long_description() or LONG_DESCRIPTION,
     long_description_content_type="text/markdown",
     install_requires=requirements,
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     extras_require={
         "openidconnect": [requirements_openidconnect],
         "saml": [requirements_saml],
@@ -88,10 +88,10 @@ def read_tests_requirements(filename):
         "Environment :: Web Environment",
         "Programming Language :: Python",
         "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 :: 3.11",
     ],
     package_data={
         "social_core/tests": [
diff --git a/tox.ini b/tox.ini
index cdef1c47a..bd541273a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,13 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36,py37,py38,py39,py310,py311
+envlist = py38,py39,py310,py311
 
 [testenv]
 passenv = *
 deps =
-  py{36,37,38,39,310,311}: -rsocial_core/tests/requirements.txt
+  py{38,39,310,311}: -rsocial_core/tests/requirements.txt
 commands =
-  py{36,37,38,39,310,311}: pip install -e .[all]
-  py{36,37,38,39,310,311}: pip install --force-reinstall --no-binary lxml lxml
+  py{38,39,310,311}: pip install -e .[all]
+  py{38,39,310,311}: pip install --force-reinstall --no-binary lxml lxml
   pytest {posargs:-v --cov=social_core}