From f3337f035d662a7984bd7d0b2ecdd33248e07299 Mon Sep 17 00:00:00 2001 From: hackermd Date: Mon, 3 Jan 2022 14:11:41 -0500 Subject: [PATCH 1/3] Make rle and openjpeg requirements optional --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b4bb8f..31c8b1c 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,11 @@ "Topic :: Software Development :: Libraries", ], packages = find_packages(), - install_requires = ['numpy', 'pylibjpeg-openjpeg', 'pylibjpeg-rle'], + extra_requires = { + 'rle': ['pylibjpeg-rle'], + 'openjpeg': ['pylibjpeg-openjpeg'] + }, + install_requires = ['numpy'], include_package_data = True, zip_safe = False, python_requires = ">=3.6", From b313e99eb52dfe96bf7b74efc1c3dced4d232879 Mon Sep 17 00:00:00 2001 From: hackermd Date: Mon, 3 Jan 2022 14:48:35 -0500 Subject: [PATCH 2/3] Update version and add release note --- README.md | 8 ++++++++ docs/release_notes/v1.4.0.rst | 6 ++++++ pylibjpeg/_version.py | 2 +- setup.py | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 docs/release_notes/v1.4.0.rst diff --git a/README.md b/README.md index 9c38200..4b7e515 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,14 @@ A Python 3.6+ framework for decoding JPEG images and decoding/encoding RLE datas pip install pylibjpeg ``` +##### Installing extra requirements + +The package can be installed with extra requirements `openjpeg` or `rle` to enable support for JPEG-2000 and Run-Length Encoding (RLE), respectively: + +``` +pip install pylibjpeg[openjpeg,rle] +``` + #### Installing the development version Make sure [Git](https://git-scm.com/) is installed, then diff --git a/docs/release_notes/v1.4.0.rst b/docs/release_notes/v1.4.0.rst new file mode 100644 index 0000000..14af880 --- /dev/null +++ b/docs/release_notes/v1.4.0.rst @@ -0,0 +1,6 @@ +.. _v1.4.0: + +1.4.0 +===== + +* Made pylibjpeg-openjpeg and pylibjpeg-rle dependencies optional (using `extras_require`) diff --git a/pylibjpeg/_version.py b/pylibjpeg/_version.py index 0845555..666550e 100644 --- a/pylibjpeg/_version.py +++ b/pylibjpeg/_version.py @@ -3,7 +3,7 @@ import re -__version__ = '1.3.0' +__version__ = '1.4.0' VERSION_PATTERN = r""" diff --git a/setup.py b/setup.py index 31c8b1c..41798d3 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ "Topic :: Software Development :: Libraries", ], packages = find_packages(), - extra_requires = { + extras_require = { 'rle': ['pylibjpeg-rle'], 'openjpeg': ['pylibjpeg-openjpeg'] }, From a87054e282ae4552d15ae1e26b5dd87c4b60729c Mon Sep 17 00:00:00 2001 From: hackermd Date: Mon, 3 Jan 2022 14:55:06 -0500 Subject: [PATCH 3/3] Fix package name in module docstring --- pylibjpeg/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylibjpeg/_version.py b/pylibjpeg/_version.py index 666550e..1eca84c 100644 --- a/pylibjpeg/_version.py +++ b/pylibjpeg/_version.py @@ -1,4 +1,4 @@ -"""Version information for pynetdicom based on PEP396 and 440.""" +"""Version information for pylibjpeg based on PEP396 and 440.""" import re