Skip to content

Commit 7cbe3ad

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

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,12 @@ jobs:
129129
fail-fast: false
130130
matrix:
131131
IMAGE:
132-
- {IMAGE: "rhel8", TOXENV: "py36", RUNNER: "ubuntu-latest"}
133-
- {IMAGE: "rhel8-fips", TOXENV: "py36", RUNNER: "ubuntu-latest", FIPS: true}
134132
- {IMAGE: "rhel8", TOXENV: "py38", RUNNER: "ubuntu-latest"}
135133
- {IMAGE: "rhel8-fips", TOXENV: "py38", RUNNER: "ubuntu-latest", FIPS: true}
136134
- {IMAGE: "buster", TOXENV: "py37", RUNNER: "ubuntu-latest"}
137135
- {IMAGE: "bullseye", TOXENV: "py39", RUNNER: "ubuntu-latest"}
138136
- {IMAGE: "bookworm", TOXENV: "py310", RUNNER: "ubuntu-latest"}
139137
- {IMAGE: "sid", TOXENV: "py311", RUNNER: "ubuntu-latest"}
140-
- {IMAGE: "ubuntu-bionic", TOXENV: "py36", RUNNER: "ubuntu-latest"}
141138
- {IMAGE: "ubuntu-focal", TOXENV: "py38", RUNNER: "ubuntu-latest"}
142139
- {IMAGE: "ubuntu-jammy", TOXENV: "py310", RUNNER: "ubuntu-latest"}
143140
- {IMAGE: "ubuntu-rolling", TOXENV: "py310", RUNNER: "ubuntu-latest"}
@@ -355,11 +352,11 @@ jobs:
355352
- {OS: 'macos-12', ARCH: 'x86_64'}
356353
- {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
357354
PYTHON:
358-
- {VERSION: "3.6", TOXENV: "py36", EXTRA_CFLAGS: ""}
355+
- {VERSION: "3.7", TOXENV: "py37", EXTRA_CFLAGS: ""}
359356
- {VERSION: "3.11", TOXENV: "py311", EXTRA_CFLAGS: "-DUSE_OSRANDOM_RNG_FOR_TESTING"}
360357
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: ""}
358+
# We only test latest Python on arm64. The py37 won't work since there's no universal2 binary
359+
- PYTHON: {VERSION: "3.7", TOXENV: "py37", EXTRA_CFLAGS: ""}
363360
RUNNER: {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
364361
name: "${{ matrix.PYTHON.TOXENV }} on macOS ${{ matrix.RUNNER.ARCH }}"
365362
timeout-minutes: 15
@@ -423,7 +420,7 @@ jobs:
423420
- {ARCH: 'x86', WINDOWS: 'win32'}
424421
- {ARCH: 'x64', WINDOWS: 'win64'}
425422
PYTHON:
426-
- {VERSION: "3.6", TOXENV: "py36-nocoverage", CL_FLAGS: ""}
423+
- {VERSION: "3.7", TOXENV: "py37-nocoverage", CL_FLAGS: ""}
427424
- {VERSION: "3.11", TOXENV: "py311", CL_FLAGS: "/D USE_OSRANDOM_RNG_FOR_TESTING"}
428425
JOB_NUMBER: [0, 1, 2]
429426
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:

0 commit comments

Comments
 (0)