Drop support for Python 3.6. It's EOL

This commit is contained in:
Oleh Prypin
2022-08-23 18:52:56 +02:00
parent e485278b55
commit f7307905d4
5 changed files with 9 additions and 16 deletions

View File

@@ -7,11 +7,9 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', pypy-3.7-v7.x] python-version: [3.7, 3.8, 3.9, '3.10', pypy-3.7-v7.x]
os: [ubuntu-latest, windows-latest, macos-latest] os: [ubuntu-latest, windows-latest, macos-latest]
include: include:
- python-version: 3.6
tox-env: py36
- python-version: 3.7 - python-version: 3.7
tox-env: py37 tox-env: py37
- python-version: 3.8 - python-version: 3.8
@@ -24,10 +22,6 @@ jobs:
tox-env: pypy3 tox-env: pypy3
# Just to slim down the test matrix: # Just to slim down the test matrix:
exclude: exclude:
- python-version: 3.7
os: windows-latest
- python-version: 3.7
os: ubuntu-latest
- python-version: 3.8 - python-version: 3.8
os: macos-latest os: macos-latest
- python-version: 3.8 - python-version: 3.8

View File

@@ -16,4 +16,4 @@ mdx_gh_links==0.2
markdown-callouts==0.2 markdown-callouts==0.2
mkdocs-redirects==1.0.1 mkdocs-redirects==1.0.1
pymdown-extensions==8.0.1 pymdown-extensions==8.0.1
mkdocstrings-python==0.7.1; python_version >= '3.7' mkdocstrings-python==0.7.1

View File

@@ -16,4 +16,4 @@ mdx_gh_links>=0.2
markdown-callouts>=0.2 markdown-callouts>=0.2
mkdocs-redirects>=1.0.1 mkdocs-redirects>=1.0.1
pymdown-extensions>=8.0.1 pymdown-extensions>=8.0.1
mkdocstrings-python>=0.7.1; python_version >= '3.7' mkdocstrings-python>=0.7.1

View File

@@ -75,7 +75,7 @@ setup(
'mergedeep>=1.3.4' 'mergedeep>=1.3.4'
], ],
extras_require={"i18n": ['babel>=2.9.0']}, extras_require={"i18n": ['babel>=2.9.0']},
python_requires='>=3.6', python_requires='>=3.7',
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'mkdocs = mkdocs.__main__:cli', 'mkdocs = mkdocs.__main__:cli',

11
tox.ini
View File

@@ -1,6 +1,5 @@
[tox] [tox]
envlist = envlist =
py36-{unittests,min-req},
py{37,38,39,310,py3}-{unittests,min-req,integration,integration-no-babel}, py{37,38,39,310,py3}-{unittests,min-req,integration,integration-no-babel},
black, isort, flake8, markdown-lint, linkchecker, jshint, csslint, nobabel, codespell black, isort, flake8, markdown-lint, linkchecker, jshint, csslint, nobabel, codespell
@@ -9,18 +8,18 @@ passenv = LANG
deps= deps=
py{37,38,39,310,py3}-integration: -rrequirements/project.txt py{37,38,39,310,py3}-integration: -rrequirements/project.txt
py{37,38,39,310,py3}-min-req: -rrequirements/project-min.txt py{37,38,39,310,py3}-min-req: -rrequirements/project-min.txt
py{36,37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt py{37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt
commands= commands=
{envpython} --version {envpython} --version
py{36,37,38,39,310,py3}-{unittests,min-req}: {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs --top-level-directory . py{37,38,39,310,py3}-{unittests,min-req}: {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs --top-level-directory .
py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage xml py{37,38,39,310,py3}-unittests: {envbindir}/coverage xml
py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing py{37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing
py{37,38,39,310,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds py{37,38,39,310,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds
[testenv:black] [testenv:black]
deps=black deps=black
skip_install=true skip_install=true
commands={envbindir}/black -l100 -tpy36 --skip-string-normalization mkdocs commands={envbindir}/black -l100 -tpy37 --skip-string-normalization mkdocs
[testenv:isort] [testenv:isort]
deps=isort deps=isort