Skip to content

Commit fc8005a

Browse files
committed
Drop py36 for CI
1 parent 724b1a3 commit fc8005a

File tree

3 files changed

+10
-23
lines changed

3 files changed

+10
-23
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- {VERSION: "3.11", TOXENV: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.0.8"}}
2929
- {VERSION: "pypy-3.8", TOXENV: "pypy3-nocoverage"}
3030
- {VERSION: "pypy-3.9", TOXENV: "pypy3-nocoverage"}
31+
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1c"}}
3132
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1t"}}
3233
- {VERSION: "3.11", TOXENV: "py311-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1t"}}
3334
- {VERSION: "3.11", TOXENV: "py311", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1t", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}}
@@ -124,15 +125,12 @@ jobs:
124125
fail-fast: false
125126
matrix:
126127
IMAGE:
127-
- {IMAGE: "rhel8", TOXENV: "py36", RUNNER: "ubuntu-latest"}
128-
- {IMAGE: "rhel8-fips", TOXENV: "py36", RUNNER: "ubuntu-latest", FIPS: true}
129128
- {IMAGE: "rhel8", TOXENV: "py38", RUNNER: "ubuntu-latest"}
130129
- {IMAGE: "rhel8-fips", TOXENV: "py38", RUNNER: "ubuntu-latest", FIPS: true}
131130
- {IMAGE: "buster", TOXENV: "py37", RUNNER: "ubuntu-latest"}
132131
- {IMAGE: "bullseye", TOXENV: "py39", RUNNER: "ubuntu-latest"}
133132
- {IMAGE: "bookworm", TOXENV: "py311", RUNNER: "ubuntu-latest"}
134133
- {IMAGE: "sid", TOXENV: "py311", RUNNER: "ubuntu-latest"}
135-
- {IMAGE: "ubuntu-bionic", TOXENV: "py36", RUNNER: "ubuntu-latest"}
136134
- {IMAGE: "ubuntu-focal", TOXENV: "py38", RUNNER: "ubuntu-latest"}
137135
- {IMAGE: "ubuntu-jammy", TOXENV: "py310", RUNNER: "ubuntu-latest"}
138136
- {IMAGE: "ubuntu-rolling", TOXENV: "py310", RUNNER: "ubuntu-latest"}
@@ -350,11 +348,12 @@ jobs:
350348
- {OS: 'macos-12', ARCH: 'x86_64'}
351349
- {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
352350
PYTHON:
353-
- {VERSION: "3.6", TOXENV: "py36-nocoverage", EXTRA_CFLAGS: ""}
351+
- {VERSION: "3.7", TOXENV: "py37-nocoverage", EXTRA_CFLAGS: ""}
354352
- {VERSION: "3.11", TOXENV: "py311", EXTRA_CFLAGS: "-DUSE_OSRANDOM_RNG_FOR_TESTING"}
355353
exclude:
356-
# We only test latest Python on arm64. The py36 won't work since there's no universal2 binary
357-
- PYTHON: {VERSION: "3.6", TOXENV: "py36-nocoverage", EXTRA_CFLAGS: ""}
354+
# We only test latest Python on arm64. The py37 won't work since
355+
# there's no universal2 binary
356+
- PYTHON: {VERSION: "3.7", TOXENV: "py37-nocoverage", EXTRA_CFLAGS: ""}
358357
RUNNER: {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
359358
name: "${{ matrix.PYTHON.TOXENV }} on macOS ${{ matrix.RUNNER.ARCH }}"
360359
timeout-minutes: 15
@@ -415,7 +414,7 @@ jobs:
415414
- {ARCH: 'x86', WINDOWS: 'win32'}
416415
- {ARCH: 'x64', WINDOWS: 'win64'}
417416
PYTHON:
418-
- {VERSION: "3.6", TOXENV: "py36-nocoverage", CL_FLAGS: ""}
417+
- {VERSION: "3.7", TOXENV: "py37-nocoverage", CL_FLAGS: ""}
419418
- {VERSION: "3.11", TOXENV: "py311", CL_FLAGS: "/D USE_OSRANDOM_RNG_FOR_TESTING"}
420419
JOB_NUMBER: [0, 1]
421420
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:
@@ -141,7 +141,7 @@ jobs:
141141
matrix:
142142
PYTHON:
143143
- VERSION: '3.10'
144-
ABI_VERSION: 'cp36'
144+
ABI_VERSION: 'cp37'
145145
# Despite the name, this is built for the macOS 11 SDK on arm64 and 10.9+ on intel
146146
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.10.9/python-3.10.9-macos11.pkg'
147147
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3'
@@ -153,7 +153,7 @@ jobs:
153153
# build against
154154
_PYTHON_HOST_PLATFORM: 'macosx-10.9-universal2'
155155
- VERSION: '3.10'
156-
ABI_VERSION: 'cp36'
156+
ABI_VERSION: 'cp37'
157157
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.10.9/python-3.10.9-macos11.pkg'
158158
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3'
159159
DEPLOYMENT_TARGET: '10.12'
@@ -248,7 +248,7 @@ jobs:
248248
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
249249
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
250250
PYTHON:
251-
- {VERSION: "3.8", "ABI_VERSION": "cp36"}
251+
- {VERSION: "3.8", "ABI_VERSION": "cp37"}
252252
- {VERSION: "pypy-3.8"}
253253
- {VERSION: "pypy-3.9"}
254254
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)