Prepare for release (#60)

Author: scaramallion

.github/workflows/pytest-builds.yml

@@ -124,5 +124,5 @@ jobs:
         pytest --cov=libjpeg --cov-append libjpeg/tests
 
     - name: Send coverage results
-      if: ${{ success() && matrix.coverage == 'coverage' }}
+      if: ${{ success() }}
       uses: codecov/codecov-action@v3

.github/workflows/release-wheels.yml

@@ -243,17 +243,18 @@ jobs:
     name: Upload wheels to PyPI
     needs: [ test-package ]
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    environment:
+      name: pypi
+      url: https://pypi.org/project/pylibjpeg-libjpeg/
+    permissions:
+      id-token: write
 
     steps:
     - name: Download the wheels
       uses: actions/download-artifact@v4
       with:
-        name: wheels
         path: dist/
+        merge-multiple: true
 
     - name: Publish package to PyPi
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_PASSWORD }}
+      uses: pypa/gh-action-pypi-publish@release/v1

.gitignore

@@ -103,7 +103,7 @@ celerybeat.pid
 # Environments
 .env
 .venv
-env/
+env*/
 venv/
 ENV/
 env.bak/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "libjpeg/src/libjpeg"]
+[submodule "lib/libjpeg"]
 	path = lib/libjpeg
 	url = https://github.com/thorfdbg/libjpeg.git

README.md

@@ -1,7 +1,10 @@
-[![Build Status](https://github.com/pydicom/pylibjpeg-libjpeg/workflows/unit-tests/badge.svg)](https://github.com/pydicom/pylibjpeg-libjpeg/actions?query=workflow%3Aunit-tests)
-[![codecov](https://codecov.io/gh/pydicom/pylibjpeg-libjpeg/branch/master/graph/badge.svg)](https://codecov.io/gh/pydicom/pylibjpeg-libjpeg)
-[![PyPI version](https://badge.fury.io/py/pylibjpeg-libjpeg.svg)](https://badge.fury.io/py/pylibjpeg-libjpeg)
-[![Python versions](https://img.shields.io/pypi/pyversions/pylibjpeg-libjpeg.svg)](https://img.shields.io/pypi/pyversions/pylibjpeg-libjpeg.svg)
+<p align="center">
+<a href="https://github.com/pydicom/pylibjpeg-libjpeg/actions?query=workflow%3Aunit-tests"><img alt="Build status" src="https://github.com/pydicom/pylibjpeg-libjpeg/workflows/unit-tests/badge.svg"></a>
+<a href="https://codecov.io/gh/pydicom/pylibjpeg-libjpeg"><img alt="Test coverage" src="https://codecov.io/gh/pydicom/pylibjpeg-libjpeg/branch/main/graph/badge.svg"></a>
+<a href="https://pypi.org/project/pylibjpeg-libjpeg/"><img alt="PyPI versions" src="https://img.shields.io/pypi/v/pylibjpeg-libjpeg"></a>
+<a href="https://www.python.org/"><img alt="Python versions" src="https://img.shields.io/pypi/pyversions/pylibjpeg-libjpeg"></a>
+<a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
+</p>
 
 ## pylibjpeg-libjpeg
 

docs/changes/v2.0.0.rst

@@ -6,7 +6,8 @@
 Changes
 .......
 
-* Supports Python 3.8-3.12
-* Switched build to ``pyproject.toml``
+* Drop support for Python 3.7
+* Add supports for Python 3.11 and 3.12
+* Switched packaging and build to ``pyproject.toml``
 * Added type hints
-* Added support for returning a bytearray containing the decoded image data
+* Added support for version 2 of the pixel data decoding interface

libjpeg/__init__.py

@@ -1,4 +1,4 @@
 """Set package shortcuts."""
 
-from ._version import __version__
-from .utils import decode, decode_pixel_data, get_parameters
+from ._version import __version__  # noqa: F401
+from .utils import decode, decode_pixel_data, get_parameters  # noqa: F401

libjpeg/_libjpeg.cpp

@@ -1,15 +1,12 @@
 """Tests for pylibjpeg.decode()."""
 
-from io import BytesIO
 import os
 from pathlib import Path
 import pytest
-import warnings
 
 import numpy as np
 
 try:
-    import pydicom
     from pydicom.encaps import generate_pixel_data_frame
     from pydicom.pixel_data_handlers.util import reshape_pixel_array
 
@@ -215,7 +212,7 @@ def test_lossless_sv1(self, fname, info):
             assert arr.dtype == "uint16"
 
     @pytest.mark.parametrize("fname, info", REF_DCM["1.2.840.10008.1.2.4.80"])
-    def test_extended(self, fname, info):
+    def test_jls_lossless(self, fname, info):
         """Test get_parameters() for the LS lossless datasets."""
         # info: (rows, columns, spp, bps)
         index = get_indexed_datasets("1.2.840.10008.1.2.4.80")
@@ -235,7 +232,7 @@ def test_extended(self, fname, info):
             assert arr.dtype == "uint16"
 
     @pytest.mark.parametrize("fname, info", REF_DCM["1.2.840.10008.1.2.4.81"])
-    def test_extended(self, fname, info):
+    def test_jls(self, fname, info):
         """Test get_parameters() for the LS lossy datasets."""
         # info: (rows, columns, spp, bps)
         index = get_indexed_datasets("1.2.840.10008.1.2.4.81")

libjpeg/tests/test_decode.py

@@ -1,13 +1,8 @@
 """Tests for the pylibjpeg pixel data handler."""
 
 import pytest
-import warnings
-
-import numpy as np
 
 try:
-    import pydicom
-    import pydicom.config
     from pydicom.pixel_data_handlers.util import convert_color_space
     from pydicom.encaps import defragment_data
 
@@ -1010,7 +1005,7 @@ def test_1s_1f_i_16_16(self):
             r"plugin is not installed"
         )
         with pytest.raises(RuntimeError, match=msg):
-            arr = ds.pixel_array
+            ds.pixel_array
 
 
 @pytest.mark.skipif(not HAS_PYDICOM, reason="No dependencies")
@@ -1038,4 +1033,4 @@ def test_1s_1f_i_16_16(self):
             r"plugin is not installed"
         )
         with pytest.raises(RuntimeError, match=msg):
-            arr = ds.pixel_array
+            ds.pixel_array

libjpeg/tests/test_handler.py

@@ -1,17 +1,10 @@
 """Tests for the pylibjpeg pixel data handler."""
 
-from io import BytesIO
 import os
 import pytest
-import warnings
-
-import numpy as np
 
 try:
-    import pydicom
-    import pydicom.config
-    from pydicom.pixel_data_handlers.util import convert_color_space
-    from pydicom.encaps import defragment_data, generate_pixel_data_frame
+    from pydicom.encaps import generate_pixel_data_frame
 
     HAS_PYDICOM = True
 except ImportError:
@@ -53,9 +46,9 @@
         ("SC_rgb_jpeg_gdcm.dcm", (100, 100, 3, 8)),
     ],
     "1.2.840.10008.1.2.4.80": [
-        ("emri_small_jpeg_ls_lossless.dcm", (64, 64, 1, 12)),
+        ("emri_small_jpeg_ls_lossless.dcm", (64, 64, 1, 16)),  # should be 16
         ("MR_small_jpeg_ls_lossless.dcm", (64, 64, 1, 16)),
-        ("RG1_JLSL.dcm", (1955, 1841, 1, 16)),
+        ("RG1_JLSL.dcm", (1955, 1841, 1, 15)),
         ("RG2_JLSL.dcm", (2140, 1760, 1, 10)),
     ],
     "1.2.840.10008.1.2.4.81": [
@@ -168,21 +161,25 @@ def test_lossless_sv1(self, fname, info):
         assert info[3] == params["precision"]
 
     @pytest.mark.parametrize("fname, info", REF_DCM["1.2.840.10008.1.2.4.80"])
-    def test_extended(self, fname, info):
+    def test_jls_lossless(self, fname, info):
         """Test get_parameters() for the LS lossless datasets."""
         # info: (rows, columns, spp, bps)
         index = get_indexed_datasets("1.2.840.10008.1.2.4.80")
         ds = index[fname]["ds"]
 
+        print(fname)
+
         frame = next(self.generate_frames(ds))
         params = get_parameters(frame)
+        print(params)
+        print(info)
 
         assert (info[0], info[1]) == (params["rows"], params["columns"])
         assert info[2] == params["nr_components"]
         assert info[3] == params["precision"]
 
     @pytest.mark.parametrize("fname, info", REF_DCM["1.2.840.10008.1.2.4.81"])
-    def test_extended(self, fname, info):
+    def test_jls_lossy(self, fname, info):
         """Test get_parameters() for the LS lossy datasets."""
         # info: (rows, columns, spp, bps)
         index = get_indexed_datasets("1.2.840.10008.1.2.4.81")

libjpeg/tests/test_parameters.py

@@ -1,6 +1,5 @@
 """Tests for the pylibjpeg pixel data handler."""
 
-from io import BytesIO
 import os
 import tempfile
 from tempfile import NamedTemporaryFile

libjpeg/tests/test_reconstruct.py

@@ -1,5 +1,4 @@
 import enum
-from io import BytesIO
 from math import ceil
 import os
 from pathlib import Path

libjpeg/utils.py

@@ -34,8 +34,8 @@ classifiers=[
     "Topic :: Software Development :: Libraries",
 ]
 description = """\
-    "A Python wrapper for libjpeg, with a focus on use as a plugin for "\
-    "for pylibjpeg"\
+A Python wrapper for libjpeg, with a focus on use as a plugin for \
+for pylibjpeg\
 """
 homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"
 keywords = ["dicom pydicom python jpg jpeg jpg-ls jpeg-ls libjpeg pylibjpeg"]
@@ -56,26 +56,12 @@ packages = [
     { include = "libjpeg" },
 ]
 readme = "README.md"
-version = "2.0.0.dev0"
+version = "2.0.0"
 
 [tool.poetry.dependencies]
 python = "^3.8"
 numpy = "^1.24"
 
-# Optional dependencies
-black = { version = "^23.1", optional = true }
-coverage = { version = "^7.3", optional = true }
-mypy = { version = "^1.7", optional = true }
-pytest = { version = "^7.4", optional = true }
-pytest-cov = { version = "^4.1", optional = true }
-pydicom = { version = "^2.4", optional = true }
-pylibjpeg = { git = "https://github.com/pydicom/pylibjpeg.git", optional = true}
-pylibjpeg-data = { git = "https://github.com/pydicom/pylibjpeg-data.git", optional = true}
-
-[tool.poetry.extras]
-dev = ["black", "coverage", "mypy", "pytest", "pytest-cov"]
-tests = ["coverage", "pytest", "pytest-cov", "pylibjpeg-data", "pylibjpeg", "pydicom"]
-
 [tool.poetry.plugins."pylibjpeg.jpeg_decoders"]
 libjpeg = "libjpeg:decode"