Skip to content

Commit 55e8b1a

Browse files
authored
Merge pull request #21 from pycompression/zlib-ng-2.1.5
Update to zlib-ng 2.1.5, add python 3.12 support.
2 parents 2adcbf2 + 795089b commit 55e8b1a

File tree

5 files changed

+39
-25
lines changed

5 files changed

+39
-25
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- uses: actions/checkout@v2.3.4
2020
with:
2121
submodules: recursive
22-
- name: Set up Python 3.7
22+
- name: Set up Python 3.8
2323
uses: actions/setup-python@v2.2.1
2424
with:
25-
python-version: 3.7
25+
python-version: "3.8"
2626
- name: Install tox
2727
run: pip install tox
2828
- name: Lint
@@ -39,10 +39,10 @@ jobs:
3939
- uses: actions/checkout@v2.3.4
4040
with:
4141
submodules: recursive
42-
- name: Set up Python 3.7
42+
- name: Set up Python 3.8
4343
uses: actions/setup-python@v2.2.1
4444
with:
45-
python-version: 3.7
45+
python-version: 3.8
4646
- name: Install tox and upgrade setuptools and pip
4747
run: pip install --upgrade tox setuptools pip
4848
- name: Run tox -e ${{ matrix.tox_env }}
@@ -53,20 +53,19 @@ jobs:
5353
strategy:
5454
matrix:
5555
python-version:
56-
- "3.7"
5756
- "3.8"
5857
- "3.9"
5958
- "3.10"
6059
- "3.11"
61-
- "pypy-3.7"
62-
- "pypy-3.8"
60+
- "3.12"
6361
- "pypy-3.9"
62+
- "pypy-3.10"
6463
os: ["ubuntu-latest"]
6564
include:
6665
- os: "macos-latest"
67-
python-version: 3.7
66+
python-version: "3.8"
6867
- os: "windows-latest"
69-
python-version: 3.7
68+
python-version: "3.8"
7069
steps:
7170
- uses: actions/checkout@v2.3.4
7271
with:

.readthedocs.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
version: 2
22
formats: [] # Do not build epub and pdf
33

4-
# This adds mambaforge for the installation
5-
build:
6-
os: "ubuntu-20.04"
7-
tools:
8-
python: "mambaforge-4.10"
9-
104
python:
115
install:
12-
- method: pip
13-
path: .
14-
conda:
15-
environment: docs/conda-environment.yml
6+
- requirements: "requirements-docs.txt"
7+
- method: "pip"
8+
path: "."
9+
10+
sphinx:
11+
configuration: docs/conf.py
12+
13+
build:
14+
os: "ubuntu-22.04"
15+
tools:
16+
python: "3"
17+
apt_packages:
18+
- python3
19+
- python3-pip
20+
- cmake
21+
- git
22+
- googletest

CHANGELOG.rst

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@ Changelog
99
1010
version 0.3.0-dev
1111
-----------------
12+
+ Python 3.12 support was added. Python 3.7 support was dropped as it is end
13+
of life.
1214
+ Enabled installation on BSD
13-
+ Update embedded zlib-ng version to 2.1.2. This comes with some speed
14-
improvements and changes with regards to the compression levels. For full
15+
+ Update embedded zlib-ng version to 2.1.5. This comes with some speed
16+
improvements and changes with regards to the compression levels. Also
17+
several bugs were fixed. For full
1518
details checkout the `zlib-ng 2.1.2 release notes
16-
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.2>`_.
19+
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.2>`_ as well as
20+
those for the bugfix releases `2.1.3
21+
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.3>`_,
22+
`2.1.4 <https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.4>`_ and
23+
`2.1.5 <https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.5>`_.
24+
1725

1826
version 0.2.0
1927
-----------------

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ def build_zlib_ng():
142142
classifiers=[
143143
"Programming Language :: Python :: 3 :: Only",
144144
"Programming Language :: Python :: 3",
145-
"Programming Language :: Python :: 3.7",
146145
"Programming Language :: Python :: 3.8",
147146
"Programming Language :: Python :: 3.9",
148147
"Programming Language :: Python :: 3.10",
149148
"Programming Language :: Python :: 3.11",
149+
"Programming Language :: Python :: 3.12",
150150
"Programming Language :: Python :: Implementation :: CPython",
151151
"Programming Language :: Python :: Implementation :: PyPy",
152152
"Programming Language :: C",
@@ -157,6 +157,6 @@ def build_zlib_ng():
157157
"Operating System :: MacOS",
158158
"Operating System :: Microsoft :: Windows",
159159
],
160-
python_requires=">=3.7", # uses METH_FASTCALL
160+
python_requires=">=3.8", # Earliest version still tested.
161161
ext_modules=EXTENSIONS
162162
)

src/zlib_ng/zlib-ng

Submodule zlib-ng updated 95 files

0 commit comments

Comments
 (0)