Skip to content

Commit f51206e

Browse files
committed
Drop support for Python 3.6, part 1
* Document that typeshed support 3.7+. * Don't run tests on Python 3.6. * Remove Python 3.6 allow lists. * Merge common allowlist items. Part of python#6189
1 parent b941cff commit f51206e

27 files changed

+51
-411
lines changed

.github/workflows/daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
# macos-11 does not have tcl/tk installed, needed for stubtesting tkinter
2323
os: ["ubuntu-latest", "windows-latest", "macos-10.15"]
24-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev"]
24+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
2525
fail-fast: false
2626

2727
steps:
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@v3
5050
- uses: actions/setup-python@v4
5151
with:
52-
python-version: 3.9
52+
python-version: "3.9"
5353
- name: Install dependencies
5454
run: pip install $(grep tomli== requirements-tests.txt) termcolor
5555
- name: Install apt packages

.github/workflows/stubtest_stdlib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
# macos-11 does not have tcl/tk installed, needed for stubtesting tkinter
2929
os: ["ubuntu-latest", "windows-latest", "macos-10.15"]
30-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev"]
30+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
3131
fail-fast: false
3232

3333
steps:

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
strategy:
6767
matrix:
6868
platform: ["linux", "win32", "darwin"]
69-
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
69+
python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
7070
fail-fast: false
7171
steps:
7272
- uses: actions/checkout@v3
@@ -82,7 +82,7 @@ jobs:
8282
strategy:
8383
matrix:
8484
python-platform: ["Linux", "Windows", "Darwin"]
85-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
85+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
8686
fail-fast: false
8787
env:
8888
PYRIGHT_VERSION: 1.1.255 # Must match pyright_test.py.
@@ -112,7 +112,7 @@ jobs:
112112
fetch-depth: 0
113113
- uses: actions/setup-python@v4
114114
with:
115-
python-version: 3.9
115+
python-version: "3.9"
116116
- name: Install dependencies
117117
run: pip install $(grep tomli== requirements-tests.txt) termcolor
118118
- name: Run stubtest

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ contributors can be found in [CONTRIBUTING.md](CONTRIBUTING.md). **Please read
1717
it before submitting pull requests; do not report issues with annotations to
1818
the project the stubs are for, but instead report them here to typeshed.**
1919

20-
Typeshed supports Python versions 2.7 and 3.6 and up.
20+
Typeshed supports Python versions 2.7 and 3.7 and up.
2121

2222
## Using
2323

tests/mypy_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import tomli
2929
from colors import colored, print_error, print_success_msg
3030

31-
SUPPORTED_VERSIONS = [(3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6), (2, 7)]
31+
SUPPORTED_VERSIONS = [(3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (2, 7)]
3232
SUPPORTED_PLATFORMS = frozenset({"linux", "win32", "darwin"})
3333
TYPESHED_DIRECTORIES = frozenset({"stdlib", "stubs", "tests", "test_cases", "scripts"})
3434

tests/stubtest_allowlists/darwin-py310.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
_?curses.A_ITALIC
21
_?curses.color_pair
32
webbrowser.MacOSXOSAScript.__init__
43
distutils.util.__warningregistry__

tests/stubtest_allowlists/darwin-py311.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
_?curses.A_ITALIC
21
_?curses.color_pair
32
xxlimited.Xxo.x_exports
43
distutils.util.__warningregistry__

tests/stubtest_allowlists/darwin-py36.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

tests/stubtest_allowlists/darwin-py37.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
_?curses.A_ITALIC
21
ctypes.wintypes
32
pwd.getpwnam
43
webbrowser.MacOSXOSAScript.__init__

tests/stubtest_allowlists/darwin-py38.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
_?curses.A_ITALIC
21
webbrowser.MacOSXOSAScript.__init__
32

43
# ==========

0 commit comments

Comments
 (0)