Merge pull request #156 from openzim/libzim8.1

Libzim 8.1

Author: rgaudin

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - v*
 
 env:
-  LIBZIM_VERSION: 8.0.0
+  LIBZIM_VERSION: 8.1.0
   LIBZIM_INCLUDE_PATH: include/zim
   TWINE_USERNAME: __token__
   TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12]
-        python-version: ["3.6.15", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.6.15", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: test
 on: [push]
 
 env:
-  LIBZIM_VERSION: 8.0.0
+  LIBZIM_VERSION: 8.1.0
   LIBZIM_INCLUDE_PATH: include/zim
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   PROFILE: 1
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v1
         with:
-          python-version: 3.6
+          python-version: "3.10"
           architecture: x64
 
       - name: Check formatting and linting
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12]
-        python: ["3.6.15", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.6.15", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -5,15 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+* `Archive.media_count`
+* Python 3.11 Support
+
+### Changed
+
+* Using libzim 8.1.0
+* Exceptions in getIndexData dont crash interpreter (#153)
+
 ## [2.0.0] - 2022-09-06
 
 ### Removed
 
-- Removed `lzma` compression option (#150)
+* Removed `lzma` compression option (#150)
 
 ### Changed
 
-- Using libzim 8.0.0
+* Using libzim 8.0.0
 
 ## [1.1.1] – 2022-06-17
 

MANIFEST.in

@@ -5,8 +5,8 @@ include pyproject.toml
 include setup.cfg
 include requirements-dev.txt
 include tasks.py
-include lib/libzim.7.dylib
-include lib/libzim.so.7
+include lib/libzim.8.dylib
+include lib/libzim.so.8
 include libzim/*.cxx
 include libzim/*.h
 include libzim/*.py

libzim/libwrapper.h

@@ -158,6 +158,7 @@ class Archive : public Wrapper<zim::Archive>
     FORWARD(zim::size_type, getEntryCount)
     FORWARD(zim::size_type, getAllEntryCount)
     FORWARD(zim::size_type, getArticleCount)
+    FORWARD(zim::size_type, getMediaCount)
     FORWARD(std::string, getChecksum)
     FORWARD(std::string, getFilename)
     FORWARD(bool, hasMainEntry)

libzim/libzim.pyx

@@ -987,6 +987,13 @@ cdef class Archive:
             listing, resulting in this returning all entries."""
         return self.c_archive.getArticleCount()
 
+    @property
+    def media_count(self) -> pyint:
+        """Number of media in the Archive
+
+            This definition of "media" is based on the mimetype."""
+        return self.c_archive.getMediaCount()
+
     def get_illustration_sizes(self) -> Set[pyint]:
         """Sizes for which an illustration is available (@1 scale only)"""
         return self.c_archive.getIllustrationSizes()

libzim/zim.pxd

@@ -156,6 +156,7 @@ cdef extern from "libwrapper.h" namespace "wrapper":
         size_type getEntryCount() except +
         size_type getAllEntryCount() except +
         size_type getArticleCount() except +
+        size_type getMediaCount() except +
 
         string getChecksum() except +
         string getFilename() except +

pyproject.toml

@@ -1,9 +1,9 @@
 [build-system]
-requires = [ "setuptools >= 35.0.2", "wheel >= 0.29.0", "twine", "cython >= 0.29.30,<3.0" ]
+requires = [ "setuptools >= 35.0.2", "wheel >= 0.29.0", "twine", "cython >= 0.29.32,<3.0" ]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
-target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311']
 
 
 [tool.pytest.ini_options]

requirements-dev.txt

@@ -1,8 +1,8 @@
-isort>=5.9,<6.0
-black>=21.9b0,<22.0
-flake8>=3.9,<4.0
-invoke>=1.5,<2.0
-coverage>=5.0,<7.0
-pytest>=6.2,<7.0
-pytest-cov>=2.10,<4.0
-Cython>=0.29.30
+isort>=5.10.1,<6.0
+black>=22.10.0,<23.0
+flake8>=6.0.0,<7.0
+invoke>=1.7.3,<2.0
+coverage>=6.5.0,<7.0
+pytest>=7.2,<8.0
+pytest-cov>=4.0.0,<5.0
+Cython>=0.29.32

setup.cfg

@@ -29,6 +29,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Typing :: Stubs Only
     License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
     Operating System :: MacOS
@@ -40,9 +41,9 @@ zim_safe = False
 packages =
     libzim
 python_requires =
-    >=3.6,<3.11
+    >=3.6,<3.12
 setup_requires =
-    cython >= 0.29.30,<0.30
+    cython >= 0.29.32,<0.30
 test_requires =
     pytest