Merge remote-tracking branch 'origin/master'

# Conflicts: # .github/workflows/python-package.yml # tox.ini
idlesign · Nov 27, 2022 · 4189534 · 4189534
2 parents 5ee26be + 384920d
commit 4189534
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -14,23 +14,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         django-version: [2.0, 2.1, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1]
 
         exclude:
 
           - python-version: 3.7
             django-version: 4.0
 
-          - python-version: 3.6
-            django-version: 4.0
-
           - python-version: 3.7
             django-version: 4.1
 
-          - python-version: 3.6
-            django-version: 4.1
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }} & Django ${{ matrix.django-version }}

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -11,7 +11,7 @@ This application will handle most common user registration and log in flows for
 Requirements
 ------------
 
-1. Python 3.6+
+1. Python 3.7+
 2. Django 2.0+
 3. Django Auth contrib enabled
 4. Django Admin contrib enabled (optional)

diff --git a/setup.py b/setup.py
@@ -61,7 +61,6 @@ def get_version():
         'Operating System :: OS Independent',
         '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',

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py{36}-django{20,21,22,30,31,32}
     py{37,38,39,310}-django{20,21,22,30,31,32,40,41}
 
 install_command = pip install {opts} {packages}