Skip to content

Commit

Permalink
Drop support for py36 and py37
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea committed Feb 25, 2022
1 parent 1b281c3 commit a556cef
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 26 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ jobs:
matrix:
python-version:
# keep list sorted as it determines UI order too
- 3.6
- 3.7
- 3.8
- 3.9
- "3.10"
Expand All @@ -112,12 +110,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
Expand All @@ -130,9 +122,9 @@ jobs:
os: ubuntu-20.04
python-version: "3.10"
devel: 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"
Expand Down
2 changes: 1 addition & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mypy]
python_version = 3.6
python_version = 3.8
color_output = True
error_summary = True
disallow_untyped_calls = True
Expand Down
5 changes: 1 addition & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ classifiers =

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
Expand All @@ -50,15 +48,14 @@ keywords =

[options]
use_scm_version = True
python_requires = >=3.6
python_requires = >=3.8
package_dir =
= src
packages = find:
zip_safe = False

# These are required in actual runtime:
install_requires =
cached_property ~= 1.5; python_version<="3.7"
PyYAML
subprocess-tee >= 0.3.5

Expand Down
11 changes: 1 addition & 10 deletions src/ansible_compat/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,14 @@
import os
import re
import subprocess
import sys
from collections import UserDict
from typing import TYPE_CHECKING, Dict, List, Optional, Union
from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union

from packaging.version import Version

from ansible_compat.errors import InvalidPrerequisiteError, MissingAnsibleError
from ansible_compat.ports import cache

# mypy/pylint idiom for py36-py38 compatibility
# https://github.com/python/typeshed/issues/3500#issuecomment-560958608
if sys.version_info >= (3, 8):
from typing import Literal # pylint: disable=no-name-in-module
else:
from typing_extensions import Literal


if TYPE_CHECKING:
# https://github.com/PyCQA/pylint/issues/3285
_UserDict = UserDict[str, object] # pylint: disable=unsubscriptable-object
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ envlist =
lint
packaging
docs
py{39,38,37,36}-{ansible29,ansible210,ansible211}
py{39,38}-{ansible29,ansible210,ansible211}
py310-{ansible210,ansible211}
py{310,39,38}-devel
isolated_build = true
Expand Down

0 comments on commit a556cef

Please sign in to comment.