PyMuPDF 1.24.14__tar.gz → 1.25.1__tar.gz

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyMuPDF
-Version: 1.24.14
+Version: 1.25.1
 Summary: A high performance Python library for data extraction, analysis, conversion & manipulation of PDF (and other) documents.
 Description-Content-Type: text/markdown
 Author: Artifex

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/changes.txt

@@ -2,6 +2,27 @@ Change Log
 ==========
 
 
+**Changes in version 1.25.1 (2024-12-11)**
+
+* Use MuPDF-1.25.2.
+
+* Fixed issues:
+
+  * **Fixed** `4125 <https://github.com/pymupdf/PyMuPDF/issues/4125>`_: memory leak while convert Pixmap's colorspace
+  * **Fixed** `4034 <https://github.com/pymupdf/PyMuPDF/issues/4034>`_: Possible regression in pdf cleaning during save.
+
+
+**Changes in version 1.25.0 (2024-12-05)**
+
+* Use MuPDF-1.25.1.
+
+* Fixed issues:
+
+  * **Fixed** `4026 <https://github.com/pymupdf/PyMuPDF/issues/4026>`_: page.get_text('blocks') output two piece of very similar text with different bbox
+  * **Fixed** `4004 <https://github.com/pymupdf/PyMuPDF/issues/4004>`_: Segmentation Fault When Updating PDF Form Field Value
+  * **Fixed** `3751 <https://github.com/pymupdf/PyMuPDF/issues/3751>`_: apply_redactions causes part of the page content to be hidden / transparent
+
+
 **Changes in version 1.24.14 (2024-11-19)**
 
 * Use MuPDF-1.24.11.

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/pipcl.py

@@ -690,7 +690,7 @@ class Package:
             else:
                 items = self.fn_sdist()
 
-        prefix = f'{self.name}-{self.version}'
+        prefix = f'{_normalise(self.name)}-{self.version}'
         os.makedirs(sdist_directory, exist_ok=True)
         tarpath = f'{sdist_directory}/{prefix}.tar.gz'
         log2(f'Creating sdist: {tarpath}')
@@ -823,7 +823,7 @@ class Package:
         return ret
 
     def wheel_name(self):
-        return f'{self.name}-{self.version}-{self.tag_python()}-{self.tag_abi()}-{self.tag_platform()}.whl'
+        return f'{_normalise(self.name)}-{self.version}-{self.tag_python()}-{self.tag_abi()}-{self.tag_platform()}.whl'
 
     def wheel_name_match(self, wheel):
         '''
@@ -852,7 +852,7 @@ class Package:
                 log2(f'py_limited_api; {tag_python=} compatible with {self.tag_python()=}.')
                 py_limited_api_compatible = True
             
-        log2(f'{self.name == name=}')
+        log2(f'{_normalise(self.name) == name=}')
         log2(f'{self.version == version=}')
         log2(f'{self.tag_python() == tag_python=} {self.tag_python()=} {tag_python=}')
         log2(f'{py_limited_api_compatible=}')
@@ -861,7 +861,7 @@ class Package:
         log2(f'{self.tag_platform()=}')
         log2(f'{tag_platform.split(".")=}')
         ret = (1
-                and self.name == name
+                and _normalise(self.name) == name
                 and self.version == version
                 and (self.tag_python() == tag_python or py_limited_api_compatible)
                 and self.tag_abi() == tag_abi
@@ -1245,7 +1245,7 @@ class Package:
             )
 
     def _dist_info_dir( self):
-        return f'{self.name}-{self.version}.dist-info'
+        return f'{_normalise(self.name)}-{self.version}.dist-info'
 
     def _metainfo(self):
         '''
@@ -2373,6 +2373,11 @@ def _fs_mtime( filename, default=0):
         return default
 
 
+def _normalise(name):
+    # https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
+    return re.sub(r"[-_.]+", "-", name).lower()
+
+
 def _assert_version_pep_440(version):
     assert re.match(
                 r'^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$',
@@ -2439,6 +2444,50 @@ def relpath(path, start=None):
     else:
         return os.path.relpath(path, start)
 
+
+def number_sep( s):
+    '''
+    Simple number formatter, adds commas in-between thousands. `s` can be a
+    number or a string. Returns a string.
+
+    >>> number_sep(1)
+    '1'
+    >>> number_sep(12)
+    '12'
+    >>> number_sep(123)
+    '123'
+    >>> number_sep(1234)
+    '1,234'
+    >>> number_sep(12345)
+    '12,345'
+    >>> number_sep(123456)
+    '123,456'
+    >>> number_sep(1234567)
+    '1,234,567'
+    >>> number_sep(-131072)
+    '-131,072'
+    '''
+    if not isinstance( s, str):
+        s = str( s)
+    ret = ''
+    if s.startswith('-'):
+        ret += '-'
+        s = s[1:]
+    c = s.find( '.')
+    if c==-1:   c = len(s)
+    end = s.find('e')
+    if end == -1:   end = s.find('E')
+    if end == -1:   end = len(s)
+    for i in range( end):
+        ret += s[i]
+        if i<c-1 and (c-i-1)%3==0:
+            ret += ','
+        elif i>c and i<end-1 and (i-c)%3==0:
+            ret += ','
+    ret += s[end:]
+    return ret
+
+
 def _so_suffix(use_so_versioning=True):
     '''
     Filename suffix for shared libraries is defined in pep-3149.  The

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/scripts/gh_release.py

@@ -245,14 +245,14 @@ def build( platform_=None, valgrind=False):
             os.chdir( pymupdf_dir)
         # Create PyMuPDF sdist.
         run(f'{sys.executable} setup.py sdist')
-        assert glob.glob('dist/PyMuPDF-*.tar.gz')
+        assert glob.glob('dist/pymupdf-*.tar.gz')
         if inputs_flavours:
             # Create PyMuPDFb sdist.
             run(
                     f'{sys.executable} setup.py sdist',
                     env_extra=dict(PYMUPDF_SETUP_FLAVOUR='b'),
                     )
-            assert glob.glob('dist/PyMuPDFb-*.tar.gz')
+            assert glob.glob('dist/pymupdfb-*.tar.gz')
     
     # Build wheels.
     #
@@ -292,11 +292,11 @@ def build( platform_=None, valgrind=False):
                     ret.append(item)
             return ' '.join(ret)
     
-        cps = inputs_wheels_cps if inputs_wheels_cps else 'cp39* cp310* cp311* cp312* cp313'
+        cps = inputs_wheels_cps if inputs_wheels_cps else 'cp39* cp310* cp311* cp312* cp313*'
         set_if_unset( 'CIBW_BUILD', cps)
         for cp in cps.split():
             m = re.match('cp([0-9]+)[*]', cp)
-            assert m
+            assert m, f'{cps=} {cp=}'
             v = int(m.group(1))
             if v == 314:
                 # Need to set CIBW_PRERELEASE_PYTHONS, otherwise cibuildwheel
@@ -359,6 +359,8 @@ def build( platform_=None, valgrind=False):
             if pass_:
                 env_pass(name)
 
+        env_pass('PYMUPDF_SETUP_PY_LIMITED_API')
+        
         if os.environ.get('PYMUPDF_SETUP_LIBCLANG'):
             env_pass('PYMUPDF_SETUP_LIBCLANG')
     
@@ -473,7 +475,7 @@ def build( platform_=None, valgrind=False):
             # careful to avoid incompatible wheels, e.g. 32 vs 64-bit wheels
             # coexist during Windows builds.
             #
-            env_set('CIBW_BEFORE_TEST', f'python scripts/gh_release.py pip_install wheelhouse/PyMuPDFb')
+            env_set('CIBW_BEFORE_TEST', f'python scripts/gh_release.py pip_install wheelhouse/pymupdfb')
         
             set_cibuild_test()
         

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/scripts/sysinstall.py

@@ -190,8 +190,8 @@ def main():
     sudo = ''
     if root == '/':
         sudo = f'sudo PATH={os.environ["PATH"]} '
-    def run(command):
-        return run_command(command, doit=mupdf_do)
+    def run(command, env_extra=None):
+        return run_command(command, doit=mupdf_do, env_extra=env_extra)
     # Get MuPDF from git if specified.
     #
     if mupdf_git:
@@ -334,8 +334,8 @@ def main():
     # Run pytest tests.
     #
     log('## Run PyMuPDF pytest tests.')
-    def run(command):
-        return run_command(command, doit=pytest_do)
+    def run(command, env_extra=None):
+        return run_command(command, doit=pytest_do, env_extra=env_extra)
     import gh_release
     if pip == 'venv':
         # Create venv.
@@ -387,12 +387,12 @@ def main():
         command += f' -p {shlex.quote(pytest_args)}'
     if pytest_do:
         command += ' test'
-    run(command)
+    run(command, env_extra=dict(PYMUPDF_SYSINSTALL_TEST='1'))
 
 
-def run_command(command, capture=False, check=True, doit=True):
+def run_command(command, capture=False, check=True, doit=True, env_extra=None):
     if doit:
-        return pipcl.run(command, capture=capture, check=check, caller=2)
+        return pipcl.run(command, capture=capture, check=check, caller=2, env_extra=env_extra)
     else:
         log(f'## Would have run: {command}', caller=2)
 

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/scripts/test.py

@@ -13,8 +13,8 @@ Examples:
     ./PyMuPDF/scripts/test.py --mupdf 'git:https://git.ghostscript.com/mupdf.git' buildtest
         Build and test with internal checkout of mupdf master.
 
-    ./PyMuPDF/scripts/test.py --mupdf 'git:--branch 1.24.x https://github.com/ArtifexSoftware/mupdf.git' buildtest
-        Build and test using internal checkout of mupdf 1.24.x branch from Github.
+    ./PyMuPDF/scripts/test.py --mupdf 'git:--branch 1.25.x https://github.com/ArtifexSoftware/mupdf.git' buildtest
+        Build and test using internal checkout of mupdf 1.25.x branch from Github.
 
 Usage:
     scripts/test.py <options> <command(s)>

{PyMuPDF-1.24.14 → pymupdf-1.25.1}/setup.py

@@ -425,7 +425,7 @@ def get_mupdf_internal(out, location=None, sha=None, local_tgz=None):
     log(f'get_mupdf_internal(): {out=} {location=} {sha=}')
     assert out in ('dir', 'tgz')
     if location is None:
-        location = f'https://mupdf.com/downloads/archive/mupdf-{version_b}-source.tar.gz'
+        location = f'https://mupdf.com/downloads/archive/mupdf-{version_mupdf}-source.tar.gz'
         #location = 'git:--branch master https://github.com/ArtifexSoftware/mupdf.git'
     
     if location == '':
@@ -647,7 +647,7 @@ def build():
             # Add Windows .lib files.
             mupdf_build_dir2 = _windows_lib_directory(mupdf_local, build_type)
             add('d', f'{mupdf_build_dir2}/mupdfcpp{wp.cpu.windows_suffix}.lib', f'{to_dir_d}/lib/')
-            if mupdf_version_tuple >= (1, 25):
+            if mupdf_version_tuple >= (1, 26):
                 # MuPDF-1.25+ language bindings build also builds libmuthreads.
                 add('d', f'{mupdf_build_dir2}/libmuthreads.lib', f'{to_dir_d}/lib/')
         elif darwin:
@@ -1157,8 +1157,9 @@ classifier = [
 # We generate different wheels depending on PYMUPDF_SETUP_FLAVOUR.
 #
 
-version_p = '1.24.14'
-version_b = '1.24.11'
+version_p = '1.25.1'
+version_b = '1.25.1'
+version_mupdf = '1.25.2'
 
 if os.path.exists(f'{g_root}/{g_pymupdfb_sdist_marker}'):