Cleanup package and re-add Python 3.6 support (#41)

Author: scaramallion

.github/workflows/pytest-builds.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         arch: ['x64', 'x86']
 
     steps:
@@ -39,7 +39,7 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
         pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
 
   osx:
@@ -74,7 +74,7 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
         pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
 
   ubuntu:
@@ -109,7 +109,7 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
         pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
 
     - name: Switch to pydicom dev and rerun pytest

.github/workflows/release-wheels.yml

@@ -9,7 +9,8 @@ jobs:
     name: Build wheels for ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
-      CIBW_BUILD: "cp37-* cp38-* cp39-*"
+      CIBW_BUILD: "cp3*-*"
+      CIBW_SKIP: "cp35-*"
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -36,12 +37,12 @@ jobs:
     - name: Build wheels
       run: |
         python --version
-        python -m cibuildwheel --output-dir wheelhouse
+        python -m cibuildwheel --output-dir dist
 
     - uses: actions/upload-artifact@v2
       with:
         name: wheels
-        path: ./wheelhouse
+        path: ./dist
 
   # The pypi upload fails with non-linux containers, so grab the uploaded
   #     artifacts and run using those

docs/changes/v1.1.1.rst

@@ -0,0 +1,9 @@
+.. _v1.1.1:
+
+1.1.1
+=====
+
+Changes
+.......
+
+* Re-added support for Python 3.6

openjpeg/__init__.py

@@ -1,5 +1,4 @@
 """Set package shortcuts."""
 
-from ._config import DICOM_ENCODERS, DICOM_DECODERS
 from ._version import __version__
 from .utils import decode, decode_pixel_data, get_parameters

openjpeg/_config.py

@@ -3,7 +3,7 @@
 import re
 
 
-__version__ = '1.2.0.dev0'
+__version__ = '1.1.1'
 
 
 VERSION_PATTERN = r"""

openjpeg/_version.py

@@ -10,4 +10,5 @@ Required
 
 Optional
 ........
+[pylibjpeg](https://github.com/pydicom/pylibjpeg)
 [pydicom](https://github.com/pydicom/pydicom)

openjpeg/tests/README.md

@@ -1,10 +1,5 @@
 import sys
 
-try:
-    from . import pydicom_handler as handler
-except ImportError:
-    pass
-
 # Add the testing data to openjpeg (if available)
 try:
     import ljdata as _data
@@ -13,29 +8,3 @@
     sys.modules['openjpeg.data'] = _data
 except ImportError:
     pass
-
-
-def add_handler():
-    """Add the pixel data handler to *pydicom*.
-    Raises
-    ------
-    ImportError
-        If *pydicom* is not available.
-    """
-    import pydicom.config
-
-    if handler not in pydicom.config.pixel_data_handlers:
-        pydicom.config.pixel_data_handlers.append(handler)
-
-
-def remove_handler():
-    """Remove the pixel data handler from *pydicom*.
-    Raises
-    ------
-    ImportError
-        If *pydicom* is not available.
-    """
-    import pydicom.config
-
-    if handler in pydicom.config.pixel_data_handlers:
-        pydicom.config.pixel_data_handlers.remove(handler)