From 2a98d9b2796782e6c75d2a27a51b5b8405e608b9 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 12 Jun 2020 18:56:04 +1000 Subject: [PATCH 1/5] Install pydicom --- .github/workflows/pytest-builds.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pytest-builds.yml b/.github/workflows/pytest-builds.yml index cddb137..cbdb5f4 100644 --- a/.github/workflows/pytest-builds.yml +++ b/.github/workflows/pytest-builds.yml @@ -27,18 +27,13 @@ jobs: run: | python -m pip install -U pip python -m pip install . - python -m pip install pytest coverage pytest-cov + python -m pip install pytest coverage pytest-cov pydicom python -m pip install git+https://github.com/pydicom/pylibjpeg-data - name: Run pytest run: | pytest --cov openjpeg --ignore=openjpeg/src/openjpeg - - name: Install pydicom release and rerun pytest - run: | - pip install pydicom - pytest --cov pylibjpeg - - name: Install -libjpeg plugin rerun pytest run: | pip install git+https://github.com/pydicom/pylibjpeg-libjpeg From b552ac2404a56a1e134b87dcd5ad43e2a1b32dc1 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 12 Jun 2020 18:59:06 +1000 Subject: [PATCH 2/5] Wait for plugin before running pytest --- .github/workflows/pytest-builds.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pytest-builds.yml b/.github/workflows/pytest-builds.yml index cbdb5f4..200414f 100644 --- a/.github/workflows/pytest-builds.yml +++ b/.github/workflows/pytest-builds.yml @@ -30,10 +30,6 @@ jobs: python -m pip install pytest coverage pytest-cov pydicom python -m pip install git+https://github.com/pydicom/pylibjpeg-data - - name: Run pytest - run: | - pytest --cov openjpeg --ignore=openjpeg/src/openjpeg - - name: Install -libjpeg plugin rerun pytest run: | pip install git+https://github.com/pydicom/pylibjpeg-libjpeg From c97421180716953e42533d302907e8fbc0e6c1a6 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 12 Jun 2020 19:48:44 +1000 Subject: [PATCH 3/5] Test without pydicom --- .github/workflows/pytest-builds.yml | 9 +++++---- README.md | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pytest-builds.yml b/.github/workflows/pytest-builds.yml index 200414f..5870d2b 100644 --- a/.github/workflows/pytest-builds.yml +++ b/.github/workflows/pytest-builds.yml @@ -27,16 +27,17 @@ jobs: run: | python -m pip install -U pip python -m pip install . - python -m pip install pytest coverage pytest-cov pydicom python -m pip install git+https://github.com/pydicom/pylibjpeg-data + python -m pip install pytest coverage pytest-cov - - name: Install -libjpeg plugin rerun pytest + - name: Install pydicom and run pytest run: | - pip install git+https://github.com/pydicom/pylibjpeg-libjpeg + pip install pydicom pytest --cov pylibjpeg - - name: Install -openjpeg plugin rerun pytest + - name: Install -libjpeg and -openjpeg plugins and rerun pytest run: | + pip install git+https://github.com/pydicom/pylibjpeg-libjpeg pip install git+https://github.com/pydicom/pylibjpeg-openjpeg pytest --cov pylibjpeg diff --git a/README.md b/README.md index fa5e3e6..1ef985a 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,10 @@ plugins come in. To support a given JPEG format or DICOM Transfer Syntax you first have to install the corresponding package: #### JPEG Format -| Format | Decode? | Encode? | Plugin | Based on | Included? | +| Format | Decode? | Encode? | Plugin | Based on | |---|------|---|---|---|---| -| JPEG, JPEG-LS and JPEG XT | Yes | No | [pylibjpeg-libjpeg][1] | [libjpeg][2] | No | -| JPEG 2000 | Yes | No | [pylibjpeg-openjpeg][3] | [openjpeg][4] | Yes | +| JPEG, JPEG-LS and JPEG XT | Yes | No | [pylibjpeg-libjpeg][1] | [libjpeg][2] | +| JPEG 2000 | Yes | No | [pylibjpeg-openjpeg][3] | [openjpeg][4] | #### DICOM Transfer Syntax From 89334fef72839b21977a32885cda89df5eccf68c Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 12 Jun 2020 19:50:15 +1000 Subject: [PATCH 4/5] Test with pydicom --- .github/workflows/pytest-builds.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pytest-builds.yml b/.github/workflows/pytest-builds.yml index 5870d2b..8ef242b 100644 --- a/.github/workflows/pytest-builds.yml +++ b/.github/workflows/pytest-builds.yml @@ -30,13 +30,9 @@ jobs: python -m pip install git+https://github.com/pydicom/pylibjpeg-data python -m pip install pytest coverage pytest-cov - - name: Install pydicom and run pytest - run: | - pip install pydicom - pytest --cov pylibjpeg - - name: Install -libjpeg and -openjpeg plugins and rerun pytest run: | + pip install pydicom pip install git+https://github.com/pydicom/pylibjpeg-libjpeg pip install git+https://github.com/pydicom/pylibjpeg-openjpeg pytest --cov pylibjpeg From eed7e6fd64f7ba9036096b20559d0f1a8ecee664 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Fri, 12 Jun 2020 19:54:26 +1000 Subject: [PATCH 5/5] Test without pydicom properly --- .github/workflows/pytest-builds.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pytest-builds.yml b/.github/workflows/pytest-builds.yml index 8ef242b..b4d6543 100644 --- a/.github/workflows/pytest-builds.yml +++ b/.github/workflows/pytest-builds.yml @@ -30,6 +30,10 @@ jobs: python -m pip install git+https://github.com/pydicom/pylibjpeg-data python -m pip install pytest coverage pytest-cov + - name: Run pytest + run: | + pytest --cov pylibjpeg + - name: Install -libjpeg and -openjpeg plugins and rerun pytest run: | pip install pydicom