Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1565 Remove Python 3.6 due to EOL #1566

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Fix #1565 Remove Python 3.6 due to EOL #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10']

services:
mariadb:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10']
database: [postgresql, postgis]

services:
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
fail-fast: false
max-parallel: 5
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
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
rev: v2.29.1
hooks:
- id: pyupgrade
args: [--py36-plus]
args: [--py37-plus]
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.4.0
hooks:
Expand Down Expand Up @@ -55,4 +55,4 @@ repos:
hooks:
- id: black
language_version: python3
entry: black --target-version=py36
entry: black --target-version=py37
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ 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
Programming Language :: Python :: 3.10
Topic :: Software Development :: Libraries :: Python Modules

[options]
python_requires = >=3.6
python_requires = >=3.7
install_requires =
Django >= 3.2
sqlparse >= 0.2.0
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist =
docs
packaging
py{36,37}-dj{32}-{sqlite,postgresql,postgis,mysql}
py{37}-dj{32}-{sqlite,postgresql,postgis,mysql}
py{38,39,310}-dj{32,40,main}-{sqlite,postgresql,postgis,mysql}

[testenv]
Expand Down Expand Up @@ -42,25 +42,25 @@ whitelist_externals = make
pip_pre = True
commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}

[testenv:py{36,37,38,39,310}-dj{40,main}-postgresql]
[testenv:py{37,38,39,310}-dj{40,main}-postgresql]
setenv =
{[testenv]setenv}
DB_BACKEND = postgresql
DB_PORT = {env:DB_PORT:5432}

[testenv:py{36,37,38,39,310}-dj{32,40,main}-postgis]
[testenv:py{37,38,39,310}-dj{32,40,main}-postgis]
setenv =
{[testenv]setenv}
DB_BACKEND = postgis
DB_PORT = {env:DB_PORT:5432}

[testenv:py{36,37,38,39,310}-dj{32,40,main}-mysql]
[testenv:py{37,38,39,310}-dj{32,40,main}-mysql]
setenv =
{[testenv]setenv}
DB_BACKEND = mysql
DB_PORT = {env:DB_PORT:3306}

[testenv:py{36,37,38,39,310}-dj{32,40,main}-sqlite]
[testenv:py{37,38,39,310}-dj{32,40,main}-sqlite]
setenv =
{[testenv]setenv}
DB_BACKEND = sqlite3
Expand All @@ -84,7 +84,6 @@ skip_install = true

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
Expand Down