Prepare for release

.github/workflows/pytest-builds.yml

@@ -105,16 +105,16 @@ jobs:
       run: |
         pytest --cov openjpeg openjpeg/tests
 
-    - name: Install pydicom release and rerun pytest
+    - name: Install pydicom dev and rerun pytest (3.10+)
+      if: ${{ contains('3.10 3.11 3.12', matrix.python-version) }}
       run: |
-        pip install pydicom pylibjpeg
+        pip install git+https://github.com/pydicom/pydicom
         pytest --cov openjpeg openjpeg/tests
 
-    - name: Switch to pydicom dev and rerun pytest (3.10+)
-      if: ${{ contains('3.10 3.11 3.12', matrix.python-version) }}
+    - name: Switch to current pydicom release and rerun pytest
       run: |
         pip uninstall -y pydicom
-        pip install git+https://github.com/pydicom/pydicom
+        pip install pydicom pylibjpeg
         pytest --cov openjpeg openjpeg/tests
 
     - name: Send coverage results

.github/workflows/release-wheels.yml

@@ -241,24 +241,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-openjpeg/
+    permissions:
+      id-token: write
 
     steps:
     - name: Download the wheels
       uses: actions/download-artifact@v4
       with:
-        name: wheels
         path: dist/
-
-    #- name: Publish package to Test PyPi
-    #  uses: pypa/gh-action-pypi-publish@master
-    #  with:
-    #    user: __token__
-    #    password: ${{ secrets.TEST_PYPI_PASSWORD }}
-    #    repository_url: https://test.pypi.org/legacy/
+        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

README.md

@@ -1,13 +1,16 @@
-[![Build Status](https://github.com/pydicom/pylibjpeg-openjpeg/workflows/unit-tests/badge.svg)](https://github.com/pydicom/pylibjpeg-openjpeg/actions?query=workflow%3Aunit-tests)
-[![codecov](https://codecov.io/gh/pydicom/pylibjpeg-openjpeg/branch/master/graph/badge.svg)](https://codecov.io/gh/pydicom/pylibjpeg-openjpeg)
-[![PyPI version](https://badge.fury.io/py/pylibjpeg-openjpeg.svg)](https://badge.fury.io/py/pylibjpeg-openjpeg)
-[![Python versions](https://img.shields.io/pypi/pyversions/pylibjpeg-openjpeg.svg)](https://img.shields.io/pypi/pyversions/pylibjpeg-openjpeg.svg)
+<p align="center">
+<a href="https://github.com/pydicom/pylibjpeg-openjpeg/actions?query=workflow%3Aunit-tests"><img alt="Build status" src="https://github.com/pydicom/pylibjpeg-openjpeg/workflows/unit-tests/badge.svg"></a>
+<a href="https://codecov.io/gh/pydicom/pylibjpeg-openjpeg"><img alt="Test coverage" src="https://codecov.io/gh/pydicom/pylibjpeg-openjpeg/branch/main/graph/badge.svg"></a>
+<a href="https://pypi.org/project/pylibjpeg-openjpeg/"><img alt="PyPI versions" src="https://img.shields.io/pypi/v/pylibjpeg-openjpeg"></a>
+<a href="https://www.python.org/"><img alt="Python versions" src="https://img.shields.io/pypi/pyversions/pylibjpeg-openjpeg"></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-openjpeg
 
 A Python 3.8+ wrapper for
-[openjpeg](https://github.com/uclouvain/openjpeg), with a focus on use as a
-plugin for [pylibjpeg](http://github.com/pydicom/pylibjpeg).
+[openjpeg](https://github.com/uclouvain/openjpeg), with a focus on use as a plugin for [pylibjpeg](http://github.com/pydicom/pylibjpeg).
 
 Linux, OSX and Windows are all supported.
 
@@ -36,7 +39,6 @@ python -m pip install pylibjpeg-openjpeg
 | ISO/IEC Standard | ITU Equivalent | JPEG Format |
 | --- | --- | --- |
 | [15444-1](https://www.iso.org/standard/78321.html) | [T.800](https://www.itu.int/rec/T-REC-T.800/en) | [JPEG 2000](https://jpeg.org/jpeg2000/) |
-| [15444-1](https://www.iso.org/standard/78321.html) | [T.800](https://www.itu.int/rec/T-REC-T.800/en) | [High-Throughput JPEG 2000](https://jpeg.org/jpeg2000/) |
 
 #### Encoding
 Encoding of JPEG 2000 images is not currently supported