Better define the install requirements (#35)

Author: scaramallion

libjpeg/_version.py

@@ -3,7 +3,7 @@
 import re
 
 
-__version__ = '1.3.0'
+__version__ = '1.3.1'
 
 
 VERSION_PATTERN = r"""

libjpeg/utils.py

@@ -1,4 +1,5 @@
 
+import enum
 from math import ceil
 from pathlib import Path
 import warnings
@@ -123,7 +124,7 @@ def decode(stream, colour_transform=0, reshape=True):
     )
 
 
-def decode_pixel_data(arr, ds=None, **kwargs):
+def decode_pixel_data(arr, ds = None, **kwargs):
     """Return the decoded JPEG data from `arr` as a :class:`numpy.ndarray`.
 
     Intended for use with *pydicom* ``Dataset`` objects.
@@ -133,12 +134,13 @@ def decode_pixel_data(arr, ds=None, **kwargs):
     arr : numpy.ndarray or bytes
         A 1D array of ``np.uint8``, or a Python :class:`bytes` object
         containing the encoded JPEG image.
-    ds : pydicom.dataset.Dataset
+    ds : pydicom.dataset.Dataset, optional
         A :class:`~pydicom.dataset.Dataset` containing the group ``0x0028``
         elements corresponding to the *Pixel Data*. Must contain a
         (0028,0004) *Photometric Interpretation* element with the colour
         space of the pixel data, one of ``'MONOCHROME1'``, ``'MONOCHROME2'``,
         ``'RGB'``, ``'YBR_FULL'``, ``'YBR_FULL_422'``.
+    **kwargs
 
     Returns
     -------

requirements.txt

@@ -1,2 +1,2 @@
-cython
-numpy>=1.16.0
+numpy>=1.20.0; python_version == '3.7'
+numpy>=1.22.0; python_version >= '3.8'

setup.py

@@ -179,7 +179,10 @@ def get_source_files():
     include_package_data = True,
     zip_safe = False,
     python_requires = ">=3.7",
-    install_requires = ["numpy>=1.20.0"],
+    install_requires = [
+        "numpy >= 1.20; python_version == '3.7'",
+        "numpy >= 1.22; python_version >= '3.8'",
+    ],
     ext_modules = extensions,
     # Plugin registrations
     entry_points={