Skip to content

Commit a9b39eb

Browse files
committed
Drop py36 for CI
1 parent 49c46ad commit a9b39eb

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- {VERSION: "3.11", TOXENV: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.0.7"}}
3232
- {VERSION: "pypy-3.8", TOXENV: "pypy3-nocoverage"}
3333
- {VERSION: "pypy-3.9", TOXENV: "pypy3-nocoverage"}
34+
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1c"}}
3435
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1s"}}
3536
- {VERSION: "3.11", TOXENV: "py311-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1s"}}
3637
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1s", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}}
@@ -129,15 +130,12 @@ jobs:
129130
fail-fast: false
130131
matrix:
131132
IMAGE:
132-
- {IMAGE: "rhel8", TOXENV: "py36", RUNNER: "ubuntu-latest"}
133-
- {IMAGE: "rhel8-fips", TOXENV: "py36", RUNNER: "ubuntu-latest", FIPS: true}
134133
- {IMAGE: "rhel8", TOXENV: "py38", RUNNER: "ubuntu-latest"}
135134
- {IMAGE: "rhel8-fips", TOXENV: "py38", RUNNER: "ubuntu-latest", FIPS: true}
136135
- {IMAGE: "buster", TOXENV: "py37", RUNNER: "ubuntu-latest"}
137136
- {IMAGE: "bullseye", TOXENV: "py39", RUNNER: "ubuntu-latest"}
138137
- {IMAGE: "bookworm", TOXENV: "py310", RUNNER: "ubuntu-latest"}
139138
- {IMAGE: "sid", TOXENV: "py311", RUNNER: "ubuntu-latest"}
140-
- {IMAGE: "ubuntu-bionic", TOXENV: "py36", RUNNER: "ubuntu-latest"}
141139
- {IMAGE: "ubuntu-focal", TOXENV: "py38", RUNNER: "ubuntu-latest"}
142140
- {IMAGE: "ubuntu-jammy", TOXENV: "py310", RUNNER: "ubuntu-latest"}
143141
- {IMAGE: "ubuntu-rolling", TOXENV: "py310", RUNNER: "ubuntu-latest"}
@@ -355,11 +353,11 @@ jobs:
355353
- {OS: 'macos-12', ARCH: 'x86_64'}
356354
- {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
357355
PYTHON:
358-
- {VERSION: "3.6", TOXENV: "py36", EXTRA_CFLAGS: ""}
356+
- {VERSION: "3.7", TOXENV: "py37", EXTRA_CFLAGS: ""}
359357
- {VERSION: "3.11", TOXENV: "py311", EXTRA_CFLAGS: "-DUSE_OSRANDOM_RNG_FOR_TESTING"}
360358
exclude:
361-
# We only test latest Python on arm64. The py36 won't work since there's no universal2 binary
362-
- PYTHON: {VERSION: "3.6", TOXENV: "py36", EXTRA_CFLAGS: ""}
359+
# We only test latest Python on arm64. The py37 won't work since there's no universal2 binary
360+
- PYTHON: {VERSION: "3.7", TOXENV: "py37", EXTRA_CFLAGS: ""}
363361
RUNNER: {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
364362
name: "${{ matrix.PYTHON.TOXENV }} on macOS ${{ matrix.RUNNER.ARCH }}"
365363
timeout-minutes: 15
@@ -423,7 +421,7 @@ jobs:
423421
- {ARCH: 'x86', WINDOWS: 'win32'}
424422
- {ARCH: 'x64', WINDOWS: 'win64'}
425423
PYTHON:
426-
- {VERSION: "3.6", TOXENV: "py36-nocoverage", CL_FLAGS: ""}
424+
- {VERSION: "3.7", TOXENV: "py37-nocoverage", CL_FLAGS: ""}
427425
- {VERSION: "3.11", TOXENV: "py311", CL_FLAGS: "/D USE_OSRANDOM_RNG_FOR_TESTING"}
428426
JOB_NUMBER: [0, 1, 2]
429427
name: "${{ matrix.PYTHON.TOXENV }} on ${{ matrix.WINDOWS.WINDOWS }} (part ${{ matrix.JOB_NUMBER }})"

.github/workflows/wheel-builder.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fail-fast: false
5454
matrix:
5555
PYTHON:
56-
- { VERSION: "cp36-cp36m", ABI_VERSION: 'cp36' }
56+
- { VERSION: "cp37-cp37m", ABI_VERSION: 'cp37' }
5757
- { VERSION: "pp38-pypy38_pp73" }
5858
- { VERSION: "pp39-pypy39_pp73" }
5959
MANYLINUX:
@@ -142,7 +142,7 @@ jobs:
142142
matrix:
143143
PYTHON:
144144
- VERSION: '3.10'
145-
ABI_VERSION: 'cp36'
145+
ABI_VERSION: 'cp37'
146146
# Despite the name, this is built for the macOS 11 SDK on arm64 and 10.9+ on intel
147147
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.10.9/python-3.10.9-macos11.pkg'
148148
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3'
@@ -154,7 +154,7 @@ jobs:
154154
# build against
155155
_PYTHON_HOST_PLATFORM: 'macosx-10.9-universal2'
156156
- VERSION: '3.10'
157-
ABI_VERSION: 'cp36'
157+
ABI_VERSION: 'cp37'
158158
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.10.9/python-3.10.9-macos11.pkg'
159159
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3'
160160
DEPLOYMENT_TARGET: '10.12'
@@ -249,7 +249,7 @@ jobs:
249249
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
250250
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
251251
PYTHON:
252-
- {VERSION: "3.8", "ABI_VERSION": "cp36"}
252+
- {VERSION: "3.8", "ABI_VERSION": "cp37"}
253253
- {VERSION: "pypy-3.8"}
254254
- {VERSION: "pypy-3.9"}
255255
exclude:

src/cryptography/__init__.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
33
# for complete details.
44

5-
import sys
6-
import warnings
75

86
from cryptography.__about__ import __author__, __copyright__, __version__
9-
from cryptography.utils import CryptographyDeprecationWarning
107

118
__all__ = [
129
"__version__",
1310
"__author__",
1411
"__copyright__",
1512
]
16-
17-
if sys.version_info[:2] == (3, 6):
18-
warnings.warn(
19-
"Python 3.6 is no longer supported by the Python core team. "
20-
"Therefore, support for it is deprecated in cryptography. The next "
21-
"release of cryptography will remove support for Python 3.6.",
22-
CryptographyDeprecationWarning,
23-
stacklevel=2,
24-
)

0 commit comments

Comments
 (0)