Glymur 0.14.2__tar.gz → 0.14.5__tar.gz

{glymur-0.14.2 → glymur-0.14.5}/.circleci/config.yml

@@ -6,11 +6,12 @@ workflows:
   version: 2
   test:
     jobs:
-      - travis-311-no-gdal
-      - travis-311-no-opj
-      - travis-311
-      - travis-312
-      - travis-313
+      - ci-311
+      - ci-312
+      - ci-313
+      - ci-314-no-gdal
+      - ci-314-no-opj
+      - ci-314
 
 test-template: &test-template
   docker:
@@ -46,17 +47,20 @@ test-template: &test-template
           pytest --doctest-modules glymur
 
 jobs:
-  travis-311-no-gdal:
+  ci-311:
     <<: *test-template
 
-  travis-311-no-opj:
+  ci-312:
     <<: *test-template
 
-  travis-311:
+  ci-313:
     <<: *test-template
 
-  travis-312:
+  ci-314-no-gdal:
     <<: *test-template
 
-  travis-313:
+  ci-314-no-opj:
+    <<: *test-template
+
+  ci-314:
     <<: *test-template

{glymur-0.14.2 → glymur-0.14.5}/CHANGES.txt

@@ -1,3 +1,15 @@
+Jan 25, 2025 - v0.14.5
+    Remove two debugging breakpoints
+
+Oct 08, 2025 - v0.14.4
+    Qualify on python 3.14
+    Add User-Agent header to powershell script for Appveyor
+    Remove remaining openjpeg<2.4 artifacts
+    Remove explicit testing of numpy 1.26
+
+Jun 12, 2025 - v0.14.3
+    Fix DeprecationWarning upon import
+
 Jun 12, 2025 - v0.14.2
     Fix test suite for python 3.14 regular expressions
     Remove long-since-deprecated Jp2kr.read method

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

@@ -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 → glymur-0.14.5}/Glymur.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ LICENSE.txt
 MANIFEST.in
 README.md
 appveyor.yml
-azure-pipelines.yml
 conftest.py
 pyproject.toml
 .circleci/config.yml
@@ -16,16 +15,17 @@ Glymur.egg-info/dependency_links.txt
 Glymur.egg-info/entry_points.txt
 Glymur.egg-info/requires.txt
 Glymur.egg-info/top_level.txt
+ci/ci-311.yaml
+ci/ci-312.yaml
+ci/ci-313.yaml
+ci/ci-314-no-gdal.yaml
+ci/ci-314-no-opj.yaml
+ci/ci-314.yaml
 ci/doc.yml
 ci/install.ps1
 ci/run_script.sh
 ci/run_with_env.cmd
 ci/setup_env.sh
-ci/travis-311-no-gdal.yaml
-ci/travis-311-no-opj.yaml
-ci/travis-311.yaml
-ci/travis-312.yaml
-ci/travis-313.yaml
 docs/Makefile
 docs/make.bat
 docs/requirements.txt

{glymur-0.14.2 → glymur-0.14.5}/PKG-INFO

@@ -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 → glymur-0.14.5}/appveyor.yml

@@ -30,6 +30,12 @@ environment:
       CONDA_PY: "313"
       USE_PATH_FOR_GDAL_PYTHON: "YES"
 
+    - CONDA_ROOT: "C:\\Miniconda3_64"
+      PYTHON_VERSION: "3.14"
+      PYTHON_ARCH: "64"
+      CONDA_PY: "314"
+      USE_PATH_FOR_GDAL_PYTHON: "YES"
+
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
 platform:
@@ -65,7 +71,7 @@ install:
   - cmd: conda info -a
 
   # create our env
-  - SET REQ=ci\travis-%CONDA_PY%.yaml
+  - SET REQ=ci\ci-%CONDA_PY%.yaml
   - cmd: echo "installing requirements from %REQ%"
   - cmd: conda env create --file=%REQ%
   - cmd: conda list -n glymur

glymur-0.14.2/ci/travis-311-no-gdal.yaml → glymur-0.14.5/ci/ci-311.yaml

@@ -3,11 +3,11 @@ channels:
     - conda-forge
 dependencies:
     - python=3.11.*
-    - gdal>=3.7.0,<3.8.0
+    - gdal>=3.8.0,<3.9.0
     - pillow
-    - libtiff>=4.5.0,<4.6.0
+    - libtiff>=4.6.0,<4.7.0
     - lxml>=5.0
-    - numpy>=1.26,<2.0
+    - numpy>=2.0,<2.1
     - openjpeg>=2.5
     - pytest-xdist
     - scikit-image

glymur-0.14.2/ci/travis-313.yaml → glymur-0.14.5/ci/ci-313.yaml

@@ -4,10 +4,11 @@ channels:
 dependencies:
     - python=3.13.*
     - gdal>=3.10.0,<3.11.0
+    - libgdal-jp2openjpeg
     - pillow
     - libtiff>=4.7.0,<4.8.0
-    - lxml>=5.3.0
-    - numpy>=2.1
-    - openjpeg>=2.5
+    - lxml>=5.3.0,<6.0.0
+    - numpy>=2.1,<2.3.3
+    - openjpeg>=2.5.3,<2.5.4
     - pytest-xdist
     - scikit-image

glymur-0.14.2/ci/travis-311-no-opj.yaml → glymur-0.14.5/ci/ci-314-no-gdal.yaml

@@ -2,12 +2,12 @@ name: glymur
 channels:
     - conda-forge
 dependencies:
-    - python=3.11.*
-    - gdal>=3.7.0,<3.8.0
+    - python>=3.14.0
     - pillow
-    - libtiff>=4.5.0,<4.6.0
-    - lxml>=5.0
-    - numpy>=1.26,<2.0
+    - libtiff>=4.7.1
+    - lxml>=6.0.2
+    - numpy>=2.3.3
+    - openjpeg>=2.5.4
     - pip
     - pytest-xdist
     - scikit-image

glymur-0.14.5/ci/ci-314-no-opj.yaml

@@ -0,0 +1,13 @@
+name: glymur
+channels:
+    - conda-forge
+dependencies:
+    - python>=3.14.0
+    - gdal>=3.11.0
+    - pillow
+    - libtiff>=4.7.1
+    - lxml>=6.0.2
+    - numpy>=2.3.3
+    - pip
+    - pytest-xdist
+    - scikit-image

glymur-0.14.5/ci/ci-314.yaml

@@ -0,0 +1,14 @@
+name: glymur
+channels:
+    - conda-forge
+dependencies:
+    - python>=3.14.0
+    - gdal>=3.11.0
+    - libgdal-jp2openjpeg
+    - pillow
+    - libtiff>=4.7.1
+    - lxml>=6.0.2
+    - numpy>=2.3.3
+    - openjpeg>=2.5.4
+    - pytest-xdist
+    - scikit-image

{glymur-0.14.2 → glymur-0.14.5}/ci/install.ps1

@@ -7,6 +7,8 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
 
 function DownloadMiniconda ($python_version, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
+    $webclient.Headers.Add("User-Agent", "Abraxis/1.0")
+
     $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
     $url = $MINICONDA_URL + $filename
 

{glymur-0.14.2 → glymur-0.14.5}/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.2'
+release = '0.14.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{glymur-0.14.2 → glymur-0.14.5}/docs/source/introduction.rst

@@ -13,7 +13,7 @@ Certain optional JP2 boxes can also be written, including XML boxes and
 XMP UUIDs.  There is incomplete support for reading JPX metadata.
 
 The current version of glymur is supported on Python versions 3.11,
-3.12, and 3.13.  You should have at least version 2.4.0 of OpenJPEG.
+3.12, 3.13, and 3.14.  You should have at least version 2.4.0 of OpenJPEG.
 
 For more information about OpenJPEG, please consult http://www.openjpeg.org.
 

glymur-0.14.5/docs/source/whatsnew/0.14.rst

@@ -0,0 +1,59 @@
+######################
+Changes in glymur 0.14
+######################
+
+*****************
+Changes in 0.14.5
+*****************
+
+    * Suppress W291 warning from doctests
+    * Remove two debugging breakpoints
+    * Update CI infrastructure for names
+    * Update testing, deprecate python 3.11
+    * Use importlib.resources instead of importlib.metadata
+    * Remove custom chdir context manager
+    * Use sys.version() to determine if anaconda or not on tests
+    * Add libgdal-jp2openjpeg to CI
+    * Remove broken azure pipelines setup
+
+*****************
+Changes in 0.14.4
+*****************
+
+    * Qualify on python 3.14
+    * Add User-Agent header to powershell script for Appveyor
+    * Remove remaining openjpeg<2.4 artifacts
+    * Remove explicit testing of numpy 1.x
+
+*****************
+Changes in 0.14.3
+*****************
+
+    * Fix import warning
+
+*****************
+Changes in 0.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
+
+*****************
+Changes in 0.14.1
+*****************
+
+    * Fix doc builds for API
+    * Add additional API examples for Jp2k, Jp2kr
+    * Fix tilesize reporting
+    * Refactor all of setup.cfg into pyproject.toml
+
+*****************
+Changes in 0.14.0
+*****************
+
+    * Add description of raw IFD for geojp2 UUIDs
+    * Add feature to convert JPEGs to JP2
+    * Remove support for python 3.10

{glymur-0.14.2 → glymur-0.14.5}/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-0.14.2 → glymur-0.14.5}/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-0.14.2 → glymur-0.14.5}/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-0.14.2 → glymur-0.14.5}/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-0.14.2 → glymur-0.14.5}/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-0.14.2 → glymur-0.14.5}/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 → glymur-0.14.5}/pyproject.toml

@@ -5,6 +5,7 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Programming Language :: Python :: Implementation :: CPython',
     'Intended Audience :: Science/Research',
     'Operating System :: OS Independent',
@@ -21,7 +22,7 @@ license = 'MIT'
 name = 'Glymur'
 readme = 'README.md'
 requires-python = '>=3.11'
-version = '0.14.2'
+version = '0.14.5'
 
 [project.scripts]
 jp2dump = 'glymur.command_line:main'

{glymur-0.14.2 → glymur-0.14.5}/tests/fixtures.py

@@ -3,21 +3,18 @@ Test fixtures common to more than one test point.
 """
 
 # Standard library imports
-import importlib.metadata as im
+import importlib.resources as ir
 import pathlib
-import platform
 import shutil
 import sys
 import tempfile
 import unittest
 
 # are we anaconda?
-try:
-    import conda  # noqa : F401
-except ImportError:
-    ANACONDA = False
-else:
+if 'conda' in sys.version.lower():
     ANACONDA = True
+else:
+    ANACONDA = False
 
 # are we macports?
 if sys.executable.startswith('/opt/local/Library/Frameworks/Python.framework'):
@@ -25,20 +22,6 @@ if sys.executable.startswith('/opt/local/Library/Frameworks/Python.framework'):
 else:
     MACPORTS = False
 
-# are we a linux platform that can use importlib.metadata
-if (
-    platform.system() == 'linux'
-    and platform.freedesktop_os_release()['id'] == 'opensuse-tumbleweed'
-):
-    LINUX_WITH_GOOD_IMPORTLIBMETADATA = True
-else:
-    LINUX_WITH_GOOD_IMPORTLIBMETADATA = False
-
-if ANACONDA or MACPORTS or LINUX_WITH_GOOD_IMPORTLIBMETADATA:
-    CANNOT_USE_IMPORTLIB_METADATA = False
-else:
-    CANNOT_USE_IMPORTLIB_METADATA = True
-
 # 3rd party library imports
 try:
     from osgeo import gdal  # noqa : F401
@@ -107,22 +90,9 @@ class TestJPEGCommon(TestCommon):
         Use some files supplied by scikit-image for our tests.
         """
 
-        files = im.files('scikit-image')
-
-        jpeg = next(filter(lambda x: 'retina' in x.name, files), None)
-        cls.retina = jpeg.locate()
-
-        jpeg = next(
-            filter(lambda x: 'hubble_deep_field' in x.name, files),
-            None
-        )
-        cls.hubble = jpeg.locate()
-
-        jpeg = next(
-            filter(lambda x: 'rocket' in x.name, files),
-            None
-        )
-        cls.rocket = jpeg.locate()
+        cls.retina = ir.files('skimage') / 'data' / 'retina.jpg'
+        cls.hubble = ir.files('skimage') / 'data' / 'hubble_deep_field.jpg'
+        cls.rocket = ir.files('skimage') / 'data' / 'rocket.jpg'
 
     def setUp(self):
         super().setUp()

{glymur-0.14.2 → glymur-0.14.5}/tests/test_commandline_jpeg2jp2.py

@@ -13,16 +13,11 @@ from glymur import JPEG2JP2, command_line, reset_option
 from . import fixtures
 from .fixtures import (
     OPENJPEG_NOT_AVAILABLE,
-    OPENJPEG_NOT_AVAILABLE_MSG,
-    CANNOT_USE_IMPORTLIB_METADATA
+    OPENJPEG_NOT_AVAILABLE_MSG
 )
 
 
 @unittest.skipIf(OPENJPEG_NOT_AVAILABLE, OPENJPEG_NOT_AVAILABLE_MSG)
-@unittest.skipIf(
-    CANNOT_USE_IMPORTLIB_METADATA,
-    'missing importlib.metadata.files ?'
-)
 class TestSuite(fixtures.TestJPEGCommon):
 
     def test_smoke(self):

{glymur-0.14.2 → glymur-0.14.5}/tests/test_commandline_tiff2jp2.py

@@ -428,7 +428,7 @@ class TestSuite(fixtures.TestCommon):
         """
         path = ir.files('tests.data.tiff').joinpath('basn6a08.tif')
         buffer = path.read_bytes()
-        ifd = glymur.lib.tiff.tiff_header(buffer)
+        ifd = glymur.lib._tiff.tiff_header(buffer)
         icc_profile = bytes(ifd['ICCProfile'])
 
         sys.argv = [

{glymur-0.14.2 → glymur-0.14.5}/tests/test_config.py

@@ -5,7 +5,6 @@ OPENJP2 may be present in some form or other.
 # Standard library imports ...
 import contextlib
 import importlib
-import os
 import pathlib
 import platform
 import unittest
@@ -18,26 +17,6 @@ from glymur import Jp2k
 from .fixtures import TestCommon, OPENJPEG_NOT_AVAILABLE, OPENJPEG_NOT_AVAILABLE_MSG  # noqa : E501
 
 
-@contextlib.contextmanager
-def chdir(dirname=None):
-    """
-    This context manager restores the value of the current working directory
-    (cwd) after the enclosed code block completes or raises an exception.  If a
-    directory name is supplied to the context manager then the cwd is changed
-    prior to running the code block.
-
-    Shamelessly lifted from
-    http://www.astropython.org/snippet/2009/10/chdir-context-manager
-    """
-    curdir = os.getcwd()
-    try:
-        if dirname is not None:
-            os.chdir(dirname)
-        yield
-    finally:
-        os.chdir(curdir)
-
-
 @patch("glymur.config.glymurrc_fname", lambda: None)
 class TestSuitePathToLibrary(TestCommon):
     """
@@ -331,7 +310,7 @@ class TestSuiteConfigFile(TestCommon):
             f.write("[library]\n")
             f.write(f"openjp2: {expected}\n")
 
-        with chdir(self.glymur_configdir):
+        with contextlib.chdir(self.glymur_configdir):
             # Should be able to load openjp2 as before.
             actual = glymur.config.read_config_file("openjp2")
 

{glymur-0.14.2 → glymur-0.14.5}/tests/test_jpeg2jp2.py

@@ -17,15 +17,10 @@ from . import fixtures
 from .fixtures import (
     OPENJPEG_NOT_AVAILABLE,
     OPENJPEG_NOT_AVAILABLE_MSG,
-    CANNOT_USE_IMPORTLIB_METADATA
 )
 
 
 @unittest.skipIf(OPENJPEG_NOT_AVAILABLE, OPENJPEG_NOT_AVAILABLE_MSG)
-@unittest.skipIf(
-    CANNOT_USE_IMPORTLIB_METADATA,
-    'missing importlib.metadata.files ?'
-)
 class TestSuite(fixtures.TestJPEGCommon):
 
     def test_smoke(self):