Skip to content

Commit

Permalink
Merge pull request #840 from messense/drop-py3.6
Browse files Browse the repository at this point in the history
Stop testing Python 3.6 on CI
  • Loading branch information
messense authored Mar 11, 2022
2 parents 8b1ae68 + c645f58 commit 9d9ee0e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.6"
- uses: actions/setup-python@v2
with:
python-version: "3.7"
Expand Down Expand Up @@ -218,7 +215,7 @@ jobs:
# CPython
- target: aarch64-unknown-linux-gnu
arch: aarch64
abi: cp36-cp36m
abi: cp37-cp37m
- target: armv7-unknown-linux-gnueabihf
arch: armv7
abi: cp39-cp39
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PATH /root/.cargo/bin:$PATH
# Use an explicit version to actually install the version we require instead of using the cache
# It would be even cooler to invalidate the cache depending on when the official rust image changes,
# but I don't know how to do that
RUN curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.57.0 -y
RUN curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.59.0 -y

# Compile dependencies only for build caching
ADD Cargo.toml /maturin/Cargo.toml
Expand All @@ -28,7 +28,7 @@ FROM quay.io/pypa/manylinux2010_x86_64

ENV PATH /root/.cargo/bin:$PATH
# Add all supported python versions
ENV PATH /opt/python/cp36-cp36m/bin/:/opt/python/cp37-cp37m/bin/:/opt/python/cp38-cp38/bin/:/opt/python/cp39-cp39/bin/:$PATH
ENV PATH /opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:$PATH
# Otherwise `cargo new` errors
ENV USER root

Expand All @@ -37,6 +37,7 @@ RUN curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
&& python3.7 -m pip install --no-cache-dir cffi \
&& python3.8 -m pip install --no-cache-dir cffi \
&& python3.9 -m pip install --no-cache-dir cffi \
&& python3.10 -m pip install --no-cache-dir cffi \
&& mkdir /io

COPY --from=builder /usr/bin/maturin /usr/bin/maturin
Expand Down
2 changes: 1 addition & 1 deletion guide/src/platform_support.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ supported by [manylinux](https://github.com/pypa/manylinux).

## Python Support

CPython 3.6 to 3.9 are supported and tested on CI, though the entire 3.x series should work.
CPython 3.7 to 3.10 are supported and tested on CI, though the entire 3.x series should work.
This will be changed as new python versions are released and others have their end of life.

PyPy 3.6 and later also works.

0 comments on commit 9d9ee0e

Please sign in to comment.