Glymur 0.14.1.post1__tar.gz → 0.14.2__tar.gz

{glymur-0.14.1.post1 → glymur-0.14.2}/.circleci/config.yml

@@ -42,6 +42,8 @@ test-template: &test-template
           export PATH=$HOME/miniconda/bin:$PATH
           source activate glymur
           pytest -n 4 -x
+          pytest --doctest-glob='*.rst' docs/source/how_do_i.rst
+          pytest --doctest-modules glymur
 
 jobs:
   travis-311-no-gdal:

{glymur-0.14.1.post1 → glymur-0.14.2}/CHANGES.txt

@@ -1,5 +1,9 @@
-Apr 06, 2025 - v0.14.1post1
-    Fix pyproject.toml for pillow, not PIL
+Jun 12, 2025 - v0.14.2
+    Fix test suite for python 3.14 regular expressions
+    Remove long-since-deprecated Jp2kr.read method
+    Make Jp2kr.parse method private
+    Make glymur.lib.tiff module private
+    Add doctests into circleci config
 
 Apr 06, 2025 - v0.14.1
     Fix doc builds for API

{glymur-0.14.1.post1 → glymur-0.14.2}/Glymur.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Glymur
-Version: 0.14.1.post1
+Version: 0.14.2
 Summary: Read and write JPEG 2000 files
 Author-email: John Evans <jevans667cc@proton.me>
 License-Expression: MIT

{glymur-0.14.1.post1 → glymur-0.14.2}/Glymur.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ glymur/data/goodstuff.j2k
 glymur/data/heliov.jpx
 glymur/data/nemo.jp2
 glymur/lib/__init__.py
+glymur/lib/_tiff.py
 glymur/lib/openjp2.py
 glymur/lib/tiff.py
 tests/__init__.py

{glymur-0.14.1.post1 → glymur-0.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Glymur
-Version: 0.14.1.post1
+Version: 0.14.2
 Summary: Read and write JPEG 2000 files
 Author-email: John Evans <jevans667cc@proton.me>
 License-Expression: MIT

{glymur-0.14.1.post1 → glymur-0.14.2}/docs/source/conf.py

@@ -81,7 +81,7 @@ copyright = '2013-2025, John Evans'
 # The short X.Y version.
 version = '0.14'
 # The full version, including alpha/beta/rc tags.
-release = '0.14.1post1'
+release = '0.14.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{glymur-0.14.1.post1 → glymur-0.14.2}/docs/source/how_do_i.rst

@@ -771,7 +771,7 @@ are wrapped in a BytesIO object, which is fed to the most-excellent Pillow packa
     >>> from PIL import ImageCms
     >>> from io import BytesIO
     >>> # this assumes you have access to the test suite
-    >>> p = pathlib.Path('tests/data/text_GBR.jp2')
+    >>> p = pathlib.Path('tests/data/from-openjpeg/text_GBR.jp2')
     >>> # This next step may produce a harmless warning that has nothing to do with ICC profiles.
     >>> j = Jp2k(p)
     >>> # The 2nd sub box of the 4th box is a ColourSpecification box.

{glymur-0.14.1.post1 → glymur-0.14.2}/docs/source/whatsnew/0.14.rst

@@ -2,11 +2,15 @@
 Changes in glymur 0.14
 ######################
 
-**********************
-Changes in 0.14.1post1
-**********************
+*****************
+Changes in 0.14.2
+*****************
 
-    * Fix pyproject.toml for pillow requirement
+    * Fix test suite for python 3.14 regular expressions
+    * Remove long-since-deprecated Jp2kr.read method
+    * Make Jp2kr.parse method private
+    * Make glymur.lib.tiff module private
+    * Add doctests into circleci config
 
 *****************
 Changes in 0.14.1

{glymur-0.14.1.post1 → glymur-0.14.2}/glymur/jp2k.py

@@ -216,7 +216,7 @@ class Jp2k(Jp2kr):
         force : bool
             If true, then run finalize operations
         """
-        self.parse(force=force_parse)
+        self._parse(force=force_parse)
 
         if (
             self._capture_resolution is None
@@ -256,7 +256,7 @@ class Jp2k(Jp2kr):
         temp_filename = self.filename + ".tmp"
         self.wrap(temp_filename, boxes=self.box)
         shutil.move(temp_filename, self.filename)
-        self.parse(force=True)
+        self._parse(force=True)
 
     def _validate_kwargs(self):
         """Validate keyword parameters passed to the constructor."""
@@ -817,7 +817,7 @@ class Jp2k(Jp2kr):
         with self.path.open("ab") as ofile:
             box.write(ofile)
 
-        self.parse(force=True)
+        self._parse(force=True)
 
     def wrap(self, filename, boxes=None):
         """

{glymur-0.14.1.post1 → glymur-0.14.2}/glymur/jp2kr.py

@@ -107,7 +107,7 @@ class Jp2kr(Jp2kBox):
         if not self.path.exists():
             raise FileNotFoundError(f"{self.filename} does not exist.")
 
-        self.parse()
+        self._parse()
         self._initialize_shape()
 
     def _initialize_shape(self):
@@ -393,6 +393,15 @@ class Jp2kr(Jp2kBox):
         return "\n".join(metadata)
 
     def parse(self, force=False):
+        """
+        .. deprecated:: 0.15.0
+        """
+        breakpoint()
+        msg = "Deprecated, do not use."
+        warnings.warn(msg, DeprecationWarning)
+        self._parse(force=force)
+
+    def _parse(self, force=False):
         """Parses the JPEG 2000 file.
 
         Parameters
@@ -633,25 +642,6 @@ class Jp2kr(Jp2kBox):
         # Ok, 3 arguments in pargs.
         return data[:, :, bands]
 
-    def read(self, **kwargs):
-        """Read a JPEG 2000 image.
-
-        .. deprecated:: 0.13.5
-           Use numpy-style slicing instead.
-
-        Returns
-        -------
-        img_array : ndarray
-            The image data.
-        """
-
-        if "ignore_pclr_cmap_cdef" in kwargs:
-            self.ignore_pclr_cmap_cdef = kwargs["ignore_pclr_cmap_cdef"]
-            kwargs.pop("ignore_pclr_cmap_cdef")
-        warnings.warn("Use array-style slicing instead.", DeprecationWarning)
-        img = self._read(**kwargs)
-        return img
-
     def _subsampling_sanity_check(self):
         """Check for differing subsample factors."""
         if self._decoded_components is None:
@@ -854,7 +844,7 @@ class Jp2kr(Jp2kBox):
 
         The only time you should ever use this method is when the image has
         different subsampling factors across components.  Otherwise you should
-        use the read method.
+        use numpy-style slicing.
 
         Parameters
         ----------
@@ -966,7 +956,7 @@ class Jp2kr(Jp2kBox):
         return image
 
     def _component2dtype(self, component):
-        """Determin the appropriate numpy datatype for an OpenJPEG component.
+        """Determine the appropriate numpy datatype for an OpenJPEG component.
 
         Parameters
         ----------

glymur-0.14.2/glymur/lib/tiff.py

@@ -0,0 +1,10 @@
+"""
+This module is deprecated.  No external use, please.
+"""
+# standard library imports
+import warnings
+
+from ._tiff import *  # noqa : F401, F403
+
+msg = "glymur.lib.tiff is for internal use only.  Please do not use it."
+warnings.warn(msg, DeprecationWarning)

{glymur-0.14.1.post1 → glymur-0.14.2}/glymur/tiff.py

@@ -14,7 +14,7 @@ import numpy as np
 from glymur import Jp2k, set_option
 from glymur.core import SRGB
 from ._core_converter import _2JP2Converter
-from .lib import tiff as libtiff
+from .lib import _tiff as libtiff
 from . import jp2box
 
 # we need a lower case mapping from the tag name to the tag number
@@ -243,7 +243,7 @@ class Tiff2Jp2k(_2JP2Converter):
         temp_filename = str(self.jp2_path) + ".tmp"
         self.jp2.wrap(temp_filename, boxes=self.jp2.box)
         shutil.move(temp_filename, self.jp2_path)
-        self.jp2.parse()
+        self.jp2._parse()
 
     def append_extra_jp2_boxes(self):
         """Copy over the TIFF IFD.  Place it in a UUID box.  Append to the JPEG

{glymur-0.14.1.post1 → glymur-0.14.2}/glymur/version.py

@@ -20,7 +20,7 @@ from .lib import tiff
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-version = "0.14.1post1"
+version = "0.14.2"
 
 version_tuple = parse(version).release
 

{glymur-0.14.1.post1 → glymur-0.14.2}/pyproject.toml

@@ -21,7 +21,7 @@ license = 'MIT'
 name = 'Glymur'
 readme = 'README.md'
 requires-python = '>=3.11'
-version = '0.14.1post1'
+version = '0.14.2'
 
 [project.scripts]
 jp2dump = 'glymur.command_line:main'

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_callbacks.py

@@ -33,7 +33,7 @@ class TestSuite(fixtures.TestCommon):
         with warnings.catch_warnings():
             # Ignore a library warning.
             warnings.simplefilter("ignore")
-            tiledata = j.read(tile=0)
+            tiledata = j._read(tile=0)
 
         with patch("sys.stdout", new=StringIO()) as fake_out:
             glymur.Jp2k(self.temp_j2k_filename, data=tiledata, verbose=True)

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_jp2k.py

@@ -368,7 +368,7 @@ class TestJp2k(fixtures.TestCommon):
         with warnings.catch_warnings():
             # Suppress the DeprecationWarning
             warnings.simplefilter("ignore")
-            thumbnail1 = j.read(rlevel=-1)
+            thumbnail1 = j._read(rlevel=-1)
         thumbnail2 = j[::32, ::32]
         np.testing.assert_array_equal(thumbnail1, thumbnail2)
         self.assertEqual(thumbnail1.shape, (25, 15, 3))
@@ -975,7 +975,7 @@ class TestVersion(fixtures.TestCommon):
                     with warnings.catch_warnings():
                         # Suppress a deprecation warning for raw read method.
                         warnings.simplefilter("ignore")
-                        glymur.Jp2k(self.jp2file).read()
+                        glymur.Jp2k(self.jp2file)._read()
                 with self.assertRaises(RuntimeError):
                     glymur.Jp2k(self.jp2file)[:]
 

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_jp2k_writes.py

@@ -1546,7 +1546,8 @@ class TestSuite(fixtures.TestCommon):
     def test_ignore_pclr_cmap_cdef_on_old_read(self):
         """
         The old "read" interface allowed for passing ignore_pclr_cmap_cdef
-        to read a palette dataset "uninterpolated".
+        to read a palette dataset "uninterpolated", but we have to
+        use properties now.
         """
         jpx = Jp2k(self.jpxfile)
         jpx.ignore_pclr_cmap_cdef = True
@@ -1556,7 +1557,8 @@ class TestSuite(fixtures.TestCommon):
         with warnings.catch_warnings():
             # Ignore a deprecation warning.
             warnings.simplefilter('ignore')
-            actual = jpx2.read(ignore_pclr_cmap_cdef=True)
+            jpx2.ignore_pclr_cmap_cdef = True
+            actual = jpx2._read()
 
         np.testing.assert_array_equal(actual, expected)
 

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_jp2kr.py

@@ -276,7 +276,7 @@ class TestJp2kr(fixtures.TestCommon):
         with warnings.catch_warnings():
             # Suppress the DeprecationWarning
             warnings.simplefilter("ignore")
-            thumbnail1 = j.read(rlevel=-1)
+            thumbnail1 = j._read(rlevel=-1)
         thumbnail2 = j[::32, ::32]
         np.testing.assert_array_equal(thumbnail1, thumbnail2)
         self.assertEqual(thumbnail1.shape, (25, 15, 3))
@@ -894,7 +894,7 @@ class TestVersion(fixtures.TestCommon):
                     with warnings.catch_warnings():
                         # Suppress a deprecation warning for raw read method.
                         warnings.simplefilter("ignore")
-                        glymur.Jp2kr(self.jp2file).read()
+                        glymur.Jp2kr(self.jp2file)._read()
                 with self.assertRaises(RuntimeError):
                     glymur.Jp2kr(self.jp2file)[:]
 

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_libtiff.py

@@ -12,7 +12,7 @@ import skimage
 
 # local imports
 from . import fixtures
-from glymur.lib import tiff as libtiff
+from glymur.lib import _tiff as libtiff
 
 
 @unittest.skipIf(

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_printing.py

@@ -1673,16 +1673,17 @@ class TestJp2dump(fixtures.TestCommon):
         with patch('sys.stdout', new=StringIO()) as fake_out:
             print(icpt)
             actual = fake_out.getvalue().strip()
-        expected = ("<class 'glymur.lib.openjp2.ImageComptParmType'>:\n"
-                    "    dx: 0\n"
-                    "    dy: 0\n"
-                    "    w: 0\n"
-                    "    h: 0\n"
-                    "    x0: 0\n"
-                    "    y0: 0\n"
-                    "    prec: 0\n"
-                    "    bpp: 0\n"
-                    "    sgnd: 0")
+        expected = (
+            "<class 'glymur.lib.openjp2.ImageComptParmType'>:\n"
+            "    dx: 0\n"
+            "    dy: 0\n"
+            "    w: 0\n"
+            "    h: 0\n"
+            "    x0: 0\n"
+            "    y0: 0\n"
+            "    prec: 0\n"
+            "    bpp: 0\n"
+            "    sgnd: 0")
         self.assertEqual(actual, expected)
 
     def test_default_image_type(self):
@@ -1693,14 +1694,16 @@ class TestJp2dump(fixtures.TestCommon):
             actual = fake_out.getvalue().strip()
 
         expected = (
-            "<class 'glymur.lib.openjp2.ImageType'>:\n"
+            "<class 'glymur\\.lib\\.openjp2\\.ImageType'>:\n"
             "    x0: 0\n"
             "    y0: 0\n"
             "    x1: 0\n"
             "    y1: 0\n"
             "    numcomps: 0\n"
             "    color_space: 0\n"
-            "    icc_profile_buf: <(glymur.lib.openjp2|ctypes.wintypes).LP_c_ubyte object at 0x[0-9A-Fa-f]*>\n"  # noqa : E501
+            "    icc_profile_buf: "
+            "<(glymur\\.lib\\.openjp2|ctypes(\\.wintypes)?)\\.LP_c_ubyte "
+            "object at 0x[0-9A-Fa-f]*>\n"
             "    icc_profile_len: 0")
         self.assertRegex(actual, expected)
 
@@ -1709,22 +1712,22 @@ class TestJp2dump(fixtures.TestCommon):
         obj = opj2.ImageCompType()
         actual = str(obj)
         expected = (
-            r'''<class 'glymur.lib.openjp2.ImageCompType'>:\n'''
-            '''    dx: 0\n'''
-            '''    dy: 0\n'''
-            '''    w: 0\n'''
-            '''    h: 0\n'''
-            '''    x0: 0\n'''
-            '''    y0: 0\n'''
-            '''    prec: 0\n'''
-            '''    bpp: 0\n'''
-            '''    sgnd: 0\n'''
-            '''    resno_decoded: 0\n'''
-            '''    factor: 0\n'''
-            '''    data: '''
-            '''<(glymur.lib.openjp2|ctypes.wintypes).LP_c_(int|long) '''
-            '''object at 0x[a-fA-F0-9]+>\n'''
-            '''    alpha: 0\n'''
+            "<class 'glymur\\.lib\\.openjp2\\.ImageCompType'>:\n"
+            "    dx: 0\n"
+            "    dy: 0\n"
+            "    w: 0\n"
+            "    h: 0\n"
+            "    x0: 0\n"
+            "    y0: 0\n"
+            "    prec: 0\n"
+            "    bpp: 0\n"
+            "    sgnd: 0\n"
+            "    resno_decoded: 0\n"
+            "    factor: 0\n"
+            "    data: "
+            "<(glymur\\.lib\\.openjp2|ctypes(\\.wintypes)?)\\.LP_c_(int|long) "
+            "object at 0x[a-fA-F0-9]+>\n"
+            "    alpha: 0\n"
         )
         self.assertRegex(actual, expected)
 

{glymur-0.14.1.post1 → glymur-0.14.2}/tests/test_warnings.py

@@ -601,12 +601,6 @@ class TestSuite(fixtures.TestCommon):
             with self.assertWarns(UserWarning):
                 glymur.Jp2k(tfile.name)
 
-    @unittest.skipIf(OPENJPEG_NOT_AVAILABLE, OPENJPEG_NOT_AVAILABLE_MSG)
-    def test_warn_if_using_read_method(self):
-        """Should warn if deprecated read method is called"""
-        with self.assertWarns(DeprecationWarning):
-            Jp2k(self.jp2file).read()
-
     def test_bad_rsiz(self):
         """
         SCENARIO:  The SIZ value parsed from the SIZ segment is invalid.