Skip to content

[MRG] Fix CI builds #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 12, 2020
Merged

[MRG] Fix CI builds #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a98d9b
Install pydicom
scaramallion Jun 12, 2020
b552ac2
Wait for plugin before running pytest
scaramallion Jun 12, 2020
c974211
Test without pydicom
scaramallion Jun 12, 2020
89334fe
Test with pydicom
scaramallion Jun 12, 2020
eed7e6f
Test without pydicom properly
scaramallion Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions .github/workflows/pytest-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,17 @@ jobs:
run: |
python -m pip install -U pip
python -m pip install .
python -m pip install pytest coverage pytest-cov
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 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
- name: Install -libjpeg and -openjpeg plugins and rerun pytest
run: |
pip install pydicom
pip install git+https://github.com/pydicom/pylibjpeg-libjpeg
pytest --cov pylibjpeg

- name: Install -openjpeg plugin rerun pytest
run: |
pip install git+https://github.com/pydicom/pylibjpeg-openjpeg
pytest --cov pylibjpeg

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down