Skip to content

Update to zlib-ng 2.1.5, add python 3.12 support. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- uses: actions/[email protected]
with:
submodules: recursive
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/[email protected]
with:
python-version: 3.7
python-version: "3.8"
- name: Install tox
run: pip install tox
- name: Lint
Expand All @@ -39,10 +39,10 @@ jobs:
- uses: actions/[email protected]
with:
submodules: recursive
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/[email protected]
with:
python-version: 3.7
python-version: 3.8
- name: Install tox and upgrade setuptools and pip
run: pip install --upgrade tox setuptools pip
- name: Run tox -e ${{ matrix.tox_env }}
Expand All @@ -53,20 +53,19 @@ jobs:
strategy:
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "pypy-3.7"
- "pypy-3.8"
- "3.12"
- "pypy-3.9"
- "pypy-3.10"
os: ["ubuntu-latest"]
include:
- os: "macos-latest"
python-version: 3.7
python-version: "3.8"
- os: "windows-latest"
python-version: 3.7
python-version: "3.8"
steps:
- uses: actions/[email protected]
with:
Expand Down
27 changes: 17 additions & 10 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
version: 2
formats: [] # Do not build epub and pdf

# This adds mambaforge for the installation
build:
os: "ubuntu-20.04"
tools:
python: "mambaforge-4.10"

python:
install:
- method: pip
path: .
conda:
environment: docs/conda-environment.yml
- requirements: "requirements-docs.txt"
- method: "pip"
path: "."

sphinx:
configuration: docs/conf.py

build:
os: "ubuntu-22.04"
tools:
python: "3"
apt_packages:
- python3
- python3-pip
- cmake
- git
- googletest
14 changes: 11 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@ Changelog

version 0.3.0-dev
-----------------
+ Python 3.12 support was added. Python 3.7 support was dropped as it is end
of life.
+ Enabled installation on BSD
+ Update embedded zlib-ng version to 2.1.2. This comes with some speed
improvements and changes with regards to the compression levels. For full
+ Update embedded zlib-ng version to 2.1.5. This comes with some speed
improvements and changes with regards to the compression levels. Also
several bugs were fixed. For full
details checkout the `zlib-ng 2.1.2 release notes
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.2>`_.
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.2>`_ as well as
those for the bugfix releases `2.1.3
<https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.3>`_,
`2.1.4 <https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.4>`_ and
`2.1.5 <https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.5>`_.


version 0.2.0
-----------------
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ def build_zlib_ng():
classifiers=[
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: C",
Expand All @@ -157,6 +157,6 @@ def build_zlib_ng():
"Operating System :: MacOS",
"Operating System :: Microsoft :: Windows",
],
python_requires=">=3.7", # uses METH_FASTCALL
python_requires=">=3.8", # Earliest version still tested.
ext_modules=EXTENSIONS
)
2 changes: 1 addition & 1 deletion src/zlib_ng/zlib-ng
Submodule zlib-ng updated 95 files
+6 −2 .github/workflows/analyze.yml
+34 −2 .github/workflows/cmake.yml
+3 −1 .github/workflows/codeql.yml
+3 −1 .github/workflows/configure.yml
+5 −2 .github/workflows/libpng.yml
+8 −3 .github/workflows/link.yml
+3 −1 .github/workflows/nmake.yml
+5 −2 .github/workflows/pigz.yml
+3 −8 .github/workflows/pkgcheck.yml
+3 −1 .github/workflows/release.yml
+115 −93 CMakeLists.txt
+2 −2 Makefile.in
+19 −6 README.md
+8 −0 arch/arm/Makefile.in
+27 −0 arch/arm/acle_intrins.h
+20 −2 arch/arm/arm_features.c
+1 −0 arch/arm/arm_features.h
+1 −3 arch/arm/chunkset_neon.c
+1 −1 arch/arm/crc32_acle.c
+3 −2 arch/arm/neon_intrins.h
+47 −0 arch/arm/slide_hash_armv6.c
+6 −1 arch/power/adler32_vmx.c
+1 −1 arch/power/chunkset_power8.c
+7 −9 arch/power/compare256_power9.c
+4 −0 arch/power/power_features.c
+3 −3 arch/riscv/README.md
+117 −0 arch/riscv/adler32_rvv.c
+121 −0 arch/riscv/chunkset_rvv.c
+47 −0 arch/riscv/compare256_rvv.c
+32 −2 arch/riscv/riscv_features.c
+1 −1 arch/riscv/riscv_features.h
+34 −0 arch/riscv/slide_hash_rvv.c
+0 −4 arch/s390/dfltcc_detail.h
+1 −1 arch/x86/adler32_avx2_tpl.h
+1 −1 arch/x86/adler32_avx512_tpl.h
+1 −1 arch/x86/adler32_avx512_vnni.c
+1 −1 arch/x86/adler32_ssse3.c
+0 −2 arch/x86/chunkset_avx2.c
+0 −2 arch/x86/chunkset_ssse3.c
+1 −1 arch/x86/crc32_pclmulqdq_tpl.h
+5 −31 arch/x86/insert_string_sse42.c
+4 −4 arch/x86/x86_features.c
+87 −0 arch/x86/x86_intrins.h
+5 −1 cmake/detect-arch.c
+5 −2 cmake/detect-arch.cmake
+114 −119 cmake/detect-intrinsics.cmake
+41 −0 cmake/toolchain-llvm-mingw-aarch64.cmake
+41 −0 cmake/toolchain-llvm-mingw-armv7.cmake
+41 −0 cmake/toolchain-llvm-mingw-i686.cmake
+41 −0 cmake/toolchain-llvm-mingw-x86_64.cmake
+16 −0 cmake/toolchain-powerpc64-clang.cmake
+25 −0 cmake/toolchain-powerpc64-power9.cmake
+16 −0 cmake/toolchain-powerpc64le-clang.cmake
+25 −0 cmake/toolchain-powerpc64le-power9.cmake
+288 −420 configure
+27 −1 cpu_features.h
+13 −33 deflate.c
+13 −8 deflate.h
+1 −84 fallback_builtins.h
+24 −0 functable.c
+2 −3 gzguts.h
+2 −2 gzlib.c
+4 −0 gzread.c.in
+18 −16 inflate.c
+5 −0 inflate_p.h
+1 −1 inftrees.h
+2 −2 insert_string_tpl.h
+4 −2 test/CMakeLists.txt
+ test/GH-1600/packobj.gz
+4 −5 test/benchmarks/CMakeLists.txt
+2 −2 test/benchmarks/README.md
+4 −0 test/benchmarks/benchmark_adler32.cc
+5 −0 test/benchmarks/benchmark_adler32_copy.cc
+3 −0 test/benchmarks/benchmark_compare256.cc
+1 −1 test/benchmarks/benchmark_crc32.cc
+10 −10 test/benchmarks/benchmark_png_shared.h
+6 −1 test/benchmarks/benchmark_slidehash.cc
+8 −0 test/cmake/test-issues.cmake
+2 −2 test/example.c
+1 −1 test/fuzz/fuzzer_minigzip.c
+26 −18 test/minideflate.c
+11 −11 test/minigzip.c
+6 −8 test/pkgcheck.sh
+1 −1 test/switchlevels.c
+2 −0 test/test_adler32.cc
+3 −0 test/test_compare256.cc
+8 −0 win32/Makefile.arm
+0 −1 win32/Makefile.msc
+19 −1 zbuild.h
+1 −1 zendian.h
+18 −14 zlib-ng.h.in
+23 −19 zlib.h.in
+1 −1 zlib.pc.cmakein
+1 −1 zlib.pc.in
+1 −1 zutil.c