Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRG] Exclude CharPyLS for Python 3.11 #1791

Merged
merged 1 commit into from
Apr 22, 2023
Merged

[MRG] Exclude CharPyLS for Python 3.11 #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/merge-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
python -m pip uninstall -y pillow

- name: Install and test jpeg_ls
if: ${{ matrix.python-version != '3.12-dev' }}
if: ${{ matrix.python-version != '3.11' && matrix.python-version != '3.12-dev' }}
run: |
python -m pip install --upgrade cython
python -m pip install git+https://github.com/Who8MyLunch/CharPyLS
Expand All @@ -101,7 +101,7 @@ jobs:
pytest ${{ matrix.pytest-args }} pydicom/tests/test_pylibjpeg.py

- name: Test all pixel handling
if: ${{ matrix.python-version != '3.12-dev' }}
if: ${{ matrix.python-version != '3.11' && matrix.python-version != '3.12-dev' }}
run: |
python -m pip install pillow python-gdcm
python -m pip install git+https://github.com/Who8MyLunch/CharPyLS
Expand Down
5 changes: 3 additions & 2 deletions doc/old/image_data_handlers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ handled by the given packages:

+-------------------------------------------------------------+-------+-------------+----------+-----------------+-----------------+
| Transfer Syntax | NumPy | | NumPy + | | NumPy +| | NumPy + | | NumPy + |
+------------------------------------+------------------------+ | | JPEG-LS | | GDCM | | Pillow | | pylibjpeg |
| Name | UID | | | | | |
+------------------------------------+------------------------+ | | JPEG-LS\ | | GDCM | | Pillow | | pylibjpeg |
| Name | UID | | :sup:`7` | | | |
+====================================+========================+=======+=============+==========+=================+=================+
| Explicit VR Little Endian | 1.2.840.10008.1.2.1 | |chk| | |chk| | |chk| | |chk| | |chk| |
+------------------------------------+------------------------+-------+-------------+----------+-----------------+-----------------+
Expand Down Expand Up @@ -92,6 +92,7 @@ handled by the given packages:
| :sup:`4` *with the pylibjpeg-rle plugin and using the* :meth:`~pydicom.dataset.Dataset.decompress` *method, 4-5x faster than default*
| :sup:`5` *with the pylibjpeg-libjpeg plugin*
| :sup:`6` *with the pylibjpeg-openjpeg plugin*
| :sup:`7` *only up to Python 3.10*

Usage
.....
Expand Down
1 change: 1 addition & 0 deletions doc/release_notes/v2.4.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ Pydicom Internals
-----------------
* In test suites, renamed 'setup' and 'teardown' methods, deprecated starting
in pytest 7.2
* Do not try to use `CharPyLS` with Python > 3.10 (:issue:`1788`)