Fix broken actions (#19)

Author: scaramallion

.coveragerc

@@ -1,7 +1,4 @@
 [run]
 omit =
     libjpeg/tests/*
-    libjpeg/scripts/*
     libjpeg/src/*
-    pydicom/*
-    pydicom-master/*

.github/workflows/pytest-builds.yml

@@ -30,18 +30,18 @@ jobs:
     - name: Install package and dependencies
       run: |
         python -m pip install -U pip
-        python -m pip install pytest coverage pytest-cov
+        python -m pip install pytest cython numpy
         python -m pip install . -v
         python -m pip install git+https://github.com/pydicom/pylibjpeg-data
 
     - name: Run pytest
       run: |
-        pytest --cov libjpeg
+        pytest
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom
-        pytest --cov libjpeg
+        pytest
 
   osx:
     runs-on: macos-latest
@@ -65,17 +65,17 @@ jobs:
       run: |
         python -m pip install -U pip
         python -m pip install . -v
-        python -m pip install pytest coverage pytest-cov
+        python -m pip install pytest
         python -m pip install git+https://github.com/pydicom/pylibjpeg-data
 
     - name: Run pytest
       run: |
-        pytest --cov libjpeg
+        pytest
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom
-        pytest --cov libjpeg
+        pytest
 
   ubuntu:
     runs-on: ubuntu-latest
@@ -104,18 +104,18 @@ jobs:
 
     - name: Run pytest
       run: |
-        pytest --cov libjpeg
+        pytest --cov=libjpeg libjpeg/tests
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom
-        pytest --cov libjpeg
+        pytest --cov=libjpeg --cov-append libjpeg/tests
 
     - name: Switch to pydicom dev and rerun pytest
       run: |
         pip uninstall -y pydicom
         pip install git+https://github.com/pydicom/pydicom
-        pytest --cov libjpeg
+        pytest --cov=libjpeg --cov-append libjpeg/tests
 
     - name: Send coverage results
       if: ${{ success() }}

.github/workflows/wheel-builds.yml

@@ -3,6 +3,8 @@ name: wheels
 on:
   push:
     branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   build_wheels:
@@ -30,7 +32,7 @@ jobs:
       run: |
         python -m pip install cibuildwheel==1.4.2
 
-    - name: Build wheel
+    - name: Build wheels
       run: |
         python --version
         python -m cibuildwheel --output-dir wheelhouse

README.md

@@ -1,5 +1,5 @@
 [![codecov](https://codecov.io/gh/pydicom/pylibjpeg-libjpeg/branch/master/graph/badge.svg)](https://codecov.io/gh/pydicom/pylibjpeg-libjpeg)
-[![Build Status](https://travis-ci.org/pydicom/pylibjpeg-libjpeg.svg?branch=master)](https://travis-ci.org/pydicom/pylibjpeg-libjpeg)
+[![Build Status](https://github.com/pydicom/pylibjpeg-libjpeg/workflows/build/badge.svg)](https://github.com/pydicom/pylibjpeg-libjpeg/actions?query=workflow%3Abuild)
 [![PyPI version](https://badge.fury.io/py/pylibjpeg-libjpeg.svg)](https://badge.fury.io/py/pylibjpeg-libjpeg)
 [![Python versions](https://img.shields.io/pypi/pyversions/pylibjpeg-libjpeg.svg)](https://img.shields.io/pypi/pyversions/pylibjpeg-libjpeg.svg)
 

codecov.yml

@@ -12,9 +12,5 @@ coverage:
         threshold: 0.1%
 
 ignore:
-  - "pylibjpeg/tests"
-  - "pylibjpeg/src"
-  - "pylibjpeg/scripts"
-  - "pylibjpeg/data"
-  - "pydicom-master"
-  - "pydicom"
+  - "libjpeg/tests"
+  - "libjpeg/src"

libjpeg/tests/test_handler.py

@@ -300,6 +300,8 @@ def test_3s_Nf_ybr_422(self):
         assert 'uint8' == arr.dtype
         assert (ds.NumberOfFrames, ds.Rows, ds.Columns, 3) == arr.shape
 
+        # Gives a MemoryError in GitHub CI build otherwise
+        arr = arr[0:10, ...]
         arr = convert_color_space(arr, 'YBR_FULL', 'RGB')
 
         #self.plot(arr, index=3)

libjpeg/utils.py

@@ -87,7 +87,6 @@ def decode(arr, colour_transform=0, reshape=True):
     status = status.decode("utf-8")
     code, msg = status.split("::::")
     code = int(code)
-    print(params)
 
     if code == 0 and reshape is True:
         bpp = ceil(params["precision"] / 8)