Skip to content

Commit 24bc373

Browse files
committed
drop 3.7 it's no longer supported, or available on GHA
1 parent 8e27c66 commit 24bc373

File tree

4 files changed

+24
-34
lines changed

4 files changed

+24
-34
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-latest, macos-latest, windows-latest]
25-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
25+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
2626
steps:
2727
- name: Set git to use LF on Windows
2828
if: runner.os == 'Windows'
@@ -91,13 +91,13 @@ jobs:
9191
if: runner.os == 'Windows'
9292
run: python -m cibuildwheel --output-dir wheelhouse
9393
env:
94-
CIBW_BUILD: cp37-${{ matrix.name }}* pp*-${{ matrix.name }}*
94+
CIBW_BUILD: cp38-${{ matrix.name }}* pp*-${{ matrix.name }}*
9595

9696
- name: Build wheels for Linux and macOS
9797
if: runner.os != 'Windows'
9898
run: python -m cibuildwheel --output-dir wheelhouse
9999
env:
100-
CIBW_BUILD: cp37-${{ matrix.name }}* pp*-${{ matrix.name }}*
100+
CIBW_BUILD: cp38-${{ matrix.name }}* pp*-${{ matrix.name }}*
101101
CIBW_ARCHS_LINUX: auto aarch64
102102
CIBW_BEFORE_BUILD_LINUX: yum install -y libffi-devel
103103
- uses: actions/upload-artifact@v2

example/README.md

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,30 @@ Build the project sdist locally
4444

4545
```
4646
$ cd example/
47-
$ python setup.py sdist
47+
$ pipx run build
4848
$ ls dist/
49-
example-brotli-project-0.1.0.tar.gz
49+
example_brotli_project-0.1.0-py3-none-any.whl example_brotli_project-0.1.0.tar.gz
5050
```
5151

5252
### Installing on CPython
5353

54-
Run `python:3.7-slim` Docker image to test against CPython
54+
Run `python:3.12-slim` Docker image to test against CPython
5555

5656
```
57-
$ docker run --rm -it -v $(pwd)/dist:/dist python:3.7-slim /bin/bash
57+
$ docker run --rm -it -v $(pwd)/dist:/dist python:3.12-slim /bin/bash
5858
```
5959

6060
Install the example project
6161

6262
```
63-
$ python -m pip install /dist/example-brotli-project-0.1.0.tar.gz
64-
Processing /dist/example-brotli-project-0.1.0.tar.gz
65-
Collecting brotli
66-
Downloading Brotli-1.0.9-cp37-cp37-manylinux1_x86_64.whl (357 kB)
67-
|████████████████████████████████| 357 kB 1.9 MB/s
68-
Building wheels for collected packages: example-brotli-project
69-
Building wheel for example-brotli-project (setup.py) ... done
70-
Created wheel for example-brotli-project: filename=example_brotli_project-0.1.0-py3-none-any.whl size=1976 sha256=b94975444c08cf82f395c8277e29b5b6f3b3270dd4f7d224482e4493be89c6bd
71-
Stored in directory: /root/.cache/pip/wheels/be/67/36/911a88789436560de345984e6c4c3785098e98b92dcbab5980
72-
Successfully built example-brotli-project
63+
$ python -m pip install /dist/example_brotli_project-0.1.0-py3-none-any.whl
64+
Processing /dist/example_brotli_project-0.1.0-py3-none-any.whl
65+
Collecting brotli (from example-brotli-project==0.1.0)
66+
Downloading Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (5.5 kB)
67+
Downloading Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (2.9 MB)
68+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 2.9/2.9 MB 10.5 MB/s eta 0:00:00
7369
Installing collected packages: brotli, example-brotli-project
74-
Successfully installed brotli-1.0.9 example-brotli-project-0.1.0
70+
Successfully installed brotli-1.1.0 example-brotli-project-0.1.0
7571
```
7672

7773
Notice that `Brotli` is installed from PyPI instead of `brotlicffi` on CPython.
@@ -87,23 +83,18 @@ Decompressed data: b'Hello, world!'
8783

8884
### Installing on PyPy
8985

90-
Run `pypy:3.7-slim` Docker image to test against PyPy
86+
Run `pypy:3.10-slim` Docker image to test against PyPy
9187

9288
```
93-
$ docker run --rm -it -v $(pwd)/dist:/dist pypy:3.7-slim /bin/bash
94-
$ pypy -m pip install /dist/example-brotli-project-0.1.0.tar.gz
95-
Processing /dist/example-brotli-project-0.1.0.tar.gz
89+
$ docker run --rm -it -v $(pwd)/dist:/dist pypy:3.10-slim /bin/bash
90+
$ pypy -m pip install /dist/example_brotli_project-0.1.0-py3-none-any.whl
91+
Processing /dist/example_brotli_project-0.1.0-py3-none-any.whl
9692
Collecting brotlicffi
97-
Downloading brotlicffi-0.8.0-pp37-pypy37_pp73-manylinux1_x86_64.whl (341 kB)
98-
|████████████████████████████████| 341 kB 2.8 MB/s
99-
Requirement already satisfied: cffi>=1.0.0 in /opt/pypy/lib_pypy (from brotlicffi->example-brotli-project==0.1.0) (1.14.2)
100-
Building wheels for collected packages: example-brotli-project
101-
Building wheel for example-brotli-project (setup.py) ... done
102-
Created wheel for example-brotli-project: filename=example_brotli_project-0.1.0-py3-none-any.whl size=1976 sha256=566f5bfb3a0d74d11485b02b929a09d6e6cc8bab7c409cf30ff50f2067692356
103-
Stored in directory: /root/.cache/pip/wheels/cb/e1/0f/337346ea74252e5b652824bb0f2fc82e81208f9f8e3de42465
104-
Successfully built example-brotli-project
93+
Downloading brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (378 kB)
94+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 378.6/378.6 kB 4.8 MB/s eta 0:00:00
95+
Requirement already satisfied: cffi>=1.0.0 in /opt/pypy/lib/pypy3.10 (from brotlicffi->example-brotli-project==0.1.0) (1.17.0.dev0)
10596
Installing collected packages: brotlicffi, example-brotli-project
106-
Successfully installed brotlicffi-0.8.0 example-brotli-project-0.1.0
97+
Successfully installed brotlicffi-1.1.0.0 example-brotli-project-0.1.0
10798
```
10899

109100
Notice now that `brotlicffi` is installed from PyPI instead of `Brotli` on CPython.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def finalize_options(self):
9898
install_requires=[
9999
"cffi>=1.0.0",
100100
],
101-
python_requires=">=3.7",
101+
python_requires=">=3.8",
102102
cffi_modules=["src/brotlicffi/_build.py:ffi"],
103103
packages=find_packages('src'),
104104
package_dir={'': 'src'},
@@ -113,7 +113,6 @@ def finalize_options(self):
113113
"Programming Language :: Python :: Implementation :: CPython",
114114
"Programming Language :: Python :: Implementation :: PyPy",
115115
"Programming Language :: Python :: 3",
116-
"Programming Language :: Python :: 3.7",
117116
"Programming Language :: Python :: 3.8",
118117
"Programming Language :: Python :: 3.9",
119118
"Programming Language :: Python :: 3.10",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py37, py38, py39, py310, py311, py312, pypy, lint
2+
envlist = py38, py39, py310, py311, py312, pypy, lint
33

44
[testenv]
55
deps= -r{toxinidir}/test_requirements.txt

0 commit comments

Comments
 (0)