Updates in preparation for release (#26)

Author: scaramallion

.github/workflows/pytest-builds.yml

@@ -13,7 +13,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:
@@ -29,6 +29,7 @@ jobs:
 
     - name: Install package and dependencies
       run: |
+        python --version
         python -m pip install -U pip
         python -m pip install pytest cython numpy
         python -m pip install . -v
@@ -40,7 +41,8 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
+        pip uninstall -y pylibjpeg-openjpeg
         pytest
 
   osx:
@@ -49,7 +51,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]
 
     steps:
     - uses: actions/checkout@v2
@@ -63,7 +65,9 @@ jobs:
 
     - name: Install package and dependencies
       run: |
+        python --version
         python -m pip install -U pip
+        python -m pip install cython numpy
         python -m pip install . -v
         python -m pip install pytest
         python -m pip install git+https://github.com/pydicom/pylibjpeg-data
@@ -74,7 +78,8 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
+        pip uninstall -y pylibjpeg-openjpeg
         pytest
 
   ubuntu:
@@ -83,7 +88,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]
 
     steps:
     - uses: actions/checkout@v2
@@ -97,7 +102,9 @@ jobs:
 
     - name: Install package and dependencies
       run: |
+        python --version
         python -m pip install -U pip
+        python -m pip install cython numpy
         python -m pip install .
         python -m pip install pytest coverage pytest-cov
         python -m pip install git+https://github.com/pydicom/pylibjpeg-data
@@ -108,7 +115,8 @@ jobs:
 
     - name: Install pydicom release and rerun pytest
       run: |
-        pip install pydicom
+        pip install pydicom pylibjpeg
+        pip uninstall -y pylibjpeg-openjpeg
         pytest --cov=libjpeg --cov-append libjpeg/tests
 
     - name: Switch to pydicom dev and rerun pytest

.github/workflows/release-wheels.yml

@@ -0,0 +1,68 @@
+name: Build wheels and deploy to PyPI
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build_wheels:
+    name: Build wheels for ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CIBW_BUILD: "cp3*-*"
+      CIBW_SKIP: "cp35-*"
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: [3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - uses: actions/setup-python@v2
+      name: Install Python
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install cibuildwheel
+
+      run: |
+        python -m pip install cibuildwheel==1.10.0
+
+    - name: Build sdist
+      run: |
+         python setup.py sdist
+
+    - name: Build wheels
+      run: |
+        python --version
+        python -m cibuildwheel --output-dir dist
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: wheels
+        path: ./dist
+
+  # The pypi upload fails with non-linux containers, so grab the uploaded
+  #     artifacts and run using those
+  # See: https://github.com/pypa/gh-action-pypi-publish/discussions/15
+  deploy:
+    name: Upload wheels to PyPI
+    needs:
+    - build_wheels
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Download the wheels
+      uses: actions/download-artifact@v2
+      with:
+        name: wheels
+        path: dist/
+
+    - name: Publish package to PyPi
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_PASSWORD }}

.github/workflows/wheel-builds.yml

@@ -58,8 +58,6 @@ Encoding of JPEG images is not currently supported
 from pydicom import dcmread
 from pydicom.data import get_testdata_file
 
-import pylibjpeg
-
 ds = dcmread(get_testdata_file('JPEG-LL.dcm'))
 arr = ds.pixel_array
 ```
@@ -76,4 +74,7 @@ from libjpeg import decode
 with open('filename.jpg', 'rb') as f:
     # Returns a numpy array
     arr = decode(f.read())
+
+# Or simply...
+arr = decode('filename.jpg')
 ```

README.md

@@ -0,0 +1,18 @@
+.. _v1.2.0:
+
+1.2.0
+=====
+
+Changes
+.......
+
+* Added support for Python 3.9
+* Removed ``_config`` module
+
+
+Enhancements
+............
+
+* Add support for passing the path to the JPEG file to
+  :func:`~libjpeg.utils.decode` and :func:`~libjpeg.utils.get_parameters`
+  as either :class:`str` or :class:`pathlib.Path`

docs/release_notes/v1.0.0.rst renamed to docs/changes/v1.0.0.rst

@@ -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

docs/release_notes/v1.1.0.rst renamed to docs/changes/v1.1.0.rst

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