Glymur 0.14.2__py3-none-any.whl → 0.14.5__py3-none-any.whl

glymur/_core_converter.py

@@ -9,7 +9,7 @@ from uuid import UUID
 
 # local imports
 from . import jp2box
-from .lib.tiff import DATATYPE2FMT
+from .lib._tiff import DATATYPE2FMT
 from .jp2k import Jp2k
 from glymur.core import RESTRICTED_ICC_PROFILE
 
@@ -276,11 +276,7 @@ class _2JP2Converter(object):
 
             b.seek(tag_offset)
 
-            try:
-                dtype = tags[tag]["dtype"]
-            except IndexError:
-                breakpoint()
-                pass
+            dtype = tags[tag]["dtype"]
 
             nvalues = tags[tag]["nvalues"]
             payload = tags[tag]["payload"]

glymur/jp2box.py

@@ -51,7 +51,7 @@ from .core import (
     ANY_ICC_PROFILE,
     VENDOR_COLOR_METHOD,
 )
-from .lib.tiff import tiff_header, BadTiffTagDatatype
+from .lib._tiff import tiff_header, BadTiffTagDatatype
 from . import get_option
 from ._iccprofile import _ICCProfile
 

glymur/jp2k.py

@@ -526,10 +526,10 @@ class Jp2k(Jp2kr):
         This method can only be used to create JPEG 2000 images that can fit
         in memory.
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                "You must have at least version 2.3.0 of OpenJPEG in order to "
-                "write images."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 
@@ -741,6 +741,7 @@ class Jp2k(Jp2kr):
 
         Examples
         --------
+        # noqa : W291
         >>> import io, shutil, lxml.etree as ET
         >>> _ = shutil.copyfile(glymur.data.nemo(), 'new-nemo.jp2')
         >>> j = glymur.Jp2k('new-nemo.jp2')
@@ -1463,10 +1464,10 @@ class _TileWriter(object):
         """Write image data to a JP2/JPX/J2k file.  Intended usage of the
         various parameters follows that of OpenJPEG's opj_compress utility.
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                "You must have at least version 2.3.0 of OpenJPEG "
-                "in order to write images."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 

glymur/jp2kr.py

@@ -12,7 +12,6 @@ from __future__ import annotations
 from contextlib import ExitStack
 import ctypes
 import pathlib
-import re
 import struct
 import sys
 import warnings
@@ -396,7 +395,6 @@ class Jp2kr(Jp2kBox):
         """
         .. deprecated:: 0.15.0
         """
-        breakpoint()
         msg = "Deprecated, do not use."
         warnings.warn(msg, DeprecationWarning)
         self._parse(force=force)
@@ -694,11 +692,10 @@ class Jp2kr(Jp2kBox):
         RuntimeError
             If the image has differing subsample factors.
         """
-        if re.match("0|1|2.[012]", version.openjpeg_version):
+        if version.openjpeg_version < '2.4.0':
             msg = (
-                f"You must have a version of OpenJPEG at least as high as "
-                f"2.3.0 before you can read JPEG2000 images with glymur.  "
-                f"Your version is {version.openjpeg_version}"
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 
@@ -878,11 +875,10 @@ class Jp2kr(Jp2kBox):
         >>> jp = glymur.Jp2k(jfile)
         >>> components_lst = jp.read_bands(rlevel=1)
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                f"You must have at least version 2.3.0 of OpenJPEG installed "
-                f"before using this method.  Your version of OpenJPEG is "
-                f"{version.openjpeg_version}."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 

glymur/options.py

@@ -71,11 +71,10 @@ def set_option(key, value):
         raise KeyError(f"{key} not valid.")
 
     if key == "lib.num_threads":
-        if version.openjpeg_version < "2.2.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                f"Thread support is not available on versions of OpenJPEG "
-                f"prior to 2.2.0.  Your version is "
-                f"{version.openjpeg_version}."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
         if not opj2.has_thread_support():

glymur/version.py

@@ -16,11 +16,11 @@ import numpy as np
 
 # Local imports ...
 from .lib import openjp2 as opj2
-from .lib import tiff
+from .lib import _tiff as tiff
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-version = "0.14.2"
+version = "0.14.5"
 
 version_tuple = parse(version).release
 

{glymur-0.14.2.dist-info → glymur-0.14.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Glymur
-Version: 0.14.2
+Version: 0.14.5
 Summary: Read and write JPEG 2000 files
 Author-email: John Evans <jevans667cc@proton.me>
 License-Expression: MIT
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent

{glymur-0.14.2.dist-info → glymur-0.14.5.dist-info}/RECORD

@@ -1,17 +1,17 @@
 glymur/__init__.py,sha256=8kFoLkxAFhVEsgR0WCEaF0iXE5GZSp47nPlheGMpP-c,625
-glymur/_core_converter.py,sha256=tOCxgbZReS47vyCNrfFYaEM9hM9U6ei-PvQdwFXY5mk,13042
+glymur/_core_converter.py,sha256=clwEsIHKA4AFprf6pyT0j2Nt4nczKTr4mv8W1_ngidU,12941
 glymur/_iccprofile.py,sha256=v0nOhJuZsKViBUYCf8TWVJvs1k0vC9PGYdbkEIfGuI4,4156
 glymur/codestream.py,sha256=JQUVS8nENdf-rgMDuGwsrg0UakhN_kIShfZEzIV7IT4,62695
 glymur/command_line.py,sha256=3Wngx3wfAvP2PEf4-XRbmm43Bz8zywIL3Gd-6k-wMvY,11485
 glymur/config.py,sha256=lVunNA-A475BX27L_qmrec_lm1InzHuL4_jkG8v_1FA,4140
 glymur/core.py,sha256=O07TfaRW2YmurkFMiurl0DkDSGB0slDAAzP83K1HPFA,3613
-glymur/jp2box.py,sha256=9tBCbLqqwO-CP587a_dAW88W3MJLJMz-cAyQ_LSUO6A,113852
-glymur/jp2k.py,sha256=gcYXL9kO2HQP4BGU2yUWb1f5oyIL0oQ4k0Cf8wb_B7Y,56895
-glymur/jp2kr.py,sha256=6Taw9EkohB5DibsNTMf5IJXDuFH6CU4ZuIfLKxKDDOY,35577
+glymur/jp2box.py,sha256=hkhs_rE0yYpgnl4cvt4KXGJzzXfJ_HLBL74TvkZpoN4,113853
+glymur/jp2k.py,sha256=NaFzpuj4Ul4anfu4eZfjR0E1zRdG4ugeUp-nzMxHdQc,56963
+glymur/jp2kr.py,sha256=p_O5Tc_m96476zhk9svHAJzeVBOdw0lxgxwG8aCOB4M,35386
 glymur/jpeg.py,sha256=PSsyv4ZQTMXGQnpX9Y5-JGxHa0t6QZPZvd5BsnOhahQ,5560
-glymur/options.py,sha256=TZApl6r_qCERHSIcTdM0iGvYuQLrZMbOtyFJB7XkvK0,4413
+glymur/options.py,sha256=avZ2ba6yoLWZZ2J8-BI1h0k5Jy1bW0SuRq5guj3yNlo,4372
 glymur/tiff.py,sha256=tLFBuKlMxbMPphAZ-RWLQMWC0lYzB0cJVQmBlGRYpbo,29552
-glymur/version.py,sha256=ZBW7UJ51M0JenE0HMhstb04Yfmvs-L_Y8JoiUB5pgXE,981
+glymur/version.py,sha256=xaEYS1IGYsDWrtCer-gcp9MvZCAv5mfGU5grYGixsIA,990
 glymur/data/__init__.py,sha256=n2KZrHV15it7Wu4YCaBLXui1ZleQ30dnZ92dyP6q05k,955
 glymur/data/goodstuff.j2k,sha256=xKQG68KMu33gYjRUDTQvam1Cue2tdio85rNp5J-rYZE,115220
 glymur/data/heliov.jpx,sha256=KXnYdBZgl25jcGLu-m-QfhuP9pqUXV0Hp9HHEdJqr34,1399071
@@ -20,9 +20,9 @@ glymur/lib/__init__.py,sha256=JnM9oPfcZhBDLKo7_yLS-lIRQ1wXb1N9hKKQ-G7vYVk,127
 glymur/lib/_tiff.py,sha256=t8XfgwX2jX0qSU8RuTkNvWLe2390Bp7TiVlr8K2Ku68,51828
 glymur/lib/openjp2.py,sha256=0UWPp2mto8G43yRUhGfpcS1RV6l3ac1YQrlVyBhxvjs,44064
 glymur/lib/tiff.py,sha256=H9hgYh-gBx8LFec4LYReQOpscY51hpK6TIU27-zY8gg,260
-glymur-0.14.2.dist-info/licenses/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
-glymur-0.14.2.dist-info/METADATA,sha256=shnQVp0ugOqRoBuuo-H1YKATQg1y39YVZ6M32JXlGa0,1274
-glymur-0.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-glymur-0.14.2.dist-info/entry_points.txt,sha256=v_9O2V_6M5ir6_nYmtkpgY9QvN1H-CMVg6tKqcUN4v0,133
-glymur-0.14.2.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
-glymur-0.14.2.dist-info/RECORD,,
+glymur-0.14.5.dist-info/licenses/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
+glymur-0.14.5.dist-info/METADATA,sha256=NjbtRSi_NjWaLzfE5r-wN65A-LAYpHa9FVW_XAXUNaY,1325
+glymur-0.14.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+glymur-0.14.5.dist-info/entry_points.txt,sha256=v_9O2V_6M5ir6_nYmtkpgY9QvN1H-CMVg6tKqcUN4v0,133
+glymur-0.14.5.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
+glymur-0.14.5.dist-info/RECORD,,

{glymur-0.14.2.dist-info → glymur-0.14.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any