Skip to content

Commit f43ca9f

Browse files
authored
Drop py36 support (#672)
* Drop py36 support * Update contributing doc to remove instance of py36 * Remove custom logic for py36.0
1 parent 7d569e0 commit f43ca9f

File tree

6 files changed

+7
-28
lines changed

6 files changed

+7
-28
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest, windows-latest]
18-
python: ['3.6', '3.7', '3.8', '3.9']
18+
python: ['3.7', '3.8', '3.9']
1919
steps:
2020
- uses: actions/checkout@v2
2121
- uses: actions/setup-python@v2

.github/workflows/pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest]
18-
python: ['3.6', '3.7', '3.8', '3.9']
18+
python: ['3.7', '3.8', '3.9']
1919
steps:
2020
- uses: actions/checkout@v2
2121
- uses: actions/setup-python@v2

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ sys 0m2.486s
7070

7171
### Running the Entire Test Suite
7272

73-
You can run the test suite in the interpreter of your choice (in this example, `py36`) by doing:
73+
You can run the test suite in the interpreter of your choice (in this example, `py37`) by doing:
7474

7575
```bash
76-
tox -e py36
76+
tox -e py37
7777
```
7878

7979
This will also run the code through our series of coverage tests, `mypy` rules and other linting

detect_secrets/types.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,6 @@
99
from .exceptions import SecretNotFoundOnSpecifiedLineError
1010
from .util.code_snippet import CodeSnippet
1111

12-
try:
13-
from typing import NoReturn # noqa: F811
14-
except ImportError: # pragma: no cover
15-
# NOTE: NoReturn was introduced in Python3.6.2. However, we need to support Python3.6.0.
16-
# This section of code is inline imported from `typing-extensions`, so that we don't need
17-
# to introduce an additional package for such an edge case.
18-
from typing import _FinalTypingBase # type: ignore
19-
20-
class _NoReturn(_FinalTypingBase):
21-
__slots__ = ()
22-
23-
def __instancecheck__(self, obj: Any) -> None:
24-
raise TypeError('NoReturn cannot be used with isinstance().')
25-
26-
def __subclasscheck__(self, cls: Any) -> None:
27-
raise TypeError('NoReturn cannot be used with issubclass().')
28-
29-
NoReturn = _NoReturn(_root=True)
30-
3112

3213
class SelfAwareCallable:
3314
"""

requirements-dev-minimal.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# coveragepy==5.0 fails with `Safety level may not be changed inside a transaction
2-
# on python 3.6.0 (xenial)
3-
coverage<5
1+
coverage
42
flake8==3.5.0
53
gibberish-detector>=0.1.1
64
monotonic

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[tox]
22
project = detect_secrets
33
# These should match the ci python env list
4-
envlist = py{36,37,38,39},mypy
4+
envlist = py{37,38,39},mypy
55
skip_missing_interpreters = true
66
tox_pip_extensions_ext_venv_update = true
77

88
[testenv]
99
passenv = SSH_AUTH_SOCK
1010
# NO_PROXY is needed to call requests API within a forked process
11-
# when using macOS and python version 3.6/3.7
11+
# when using macOS and python version 3.7
1212
setenv =
1313
NO_PROXY = '*'
1414
deps = -rrequirements-dev.txt

0 commit comments

Comments
 (0)