Skip to content

Commit 6e0ff61

Browse files
authored
Offload work to plugins (#34)
1 parent 6fa186e commit 6e0ff61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2236
-13461
lines changed

.coveragerc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
omit =
33
pylibjpeg/tests/*
44
pylibjpeg/scripts/*
5-
pylibjpeg/data/*
6-
pylibjpeg/src/*
5+
pylibjpeg/tools/*
6+
pylibjpeg-data/*
7+
pylibjpeg-libjpeg/*
78
pydicom/*
8-
pydicom-master/*

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.travis.yml

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,53 @@ branches:
44

55
language: python
66

7-
# Build against pydicom master and current release
87
matrix:
98
include:
10-
# OSX first because it takes a long time to complete before_install
11-
- name: "Python 3.6, OSX + pydicom"
12-
os: osx
13-
language: generic
14-
env:
15-
- TEST_SUITE=osx
16-
- TRAVIS_PYTHON_VERSION=3.6.8
17-
# Windows
18-
- name: "Python 3.6, Windows + pydicom"
19-
os: windows
20-
language: shell
21-
env:
22-
- TEST_SUITE=windows
23-
- TRAVIS_PYTHON_VERSION=3.6.8
24-
# Conda next, also takes a while
25-
- name: "Python 3.6, Ubuntu + conda + pydicom"
26-
os: linux
27-
dist: bionic
28-
env:
29-
- TEST_SUITE=conda
30-
- TRAVIS_PYTHON_VERSION=3.6
31-
# Ubuntu with pydicom master next to find any issues quickly
32-
- name: "Python 3.6, Ubuntu + pydicom master"
33-
os: linux
34-
dist: bionic
35-
python: "3.6"
36-
env: TEST_SUITE=pydicom_master
37-
- name: "Python 3.7, Ubuntu + pydicom master"
38-
os: linux
39-
dist: bionic
40-
python: "3.7"
41-
env: TEST_SUITE=pydicom_master
42-
- name: "Python 3.8, Ubuntu + pydicom master"
43-
os: linux
44-
dist: bionic
45-
python: "3.8"
46-
env: TEST_SUITE=pydicom_master
9+
# No plugins + pydicom
4710
- name: "Python 3.6, Ubuntu"
4811
os: linux
4912
dist: bionic
5013
python: "3.6"
51-
env: TEST_SUITE=solo
14+
env:
15+
- INSTALL_PYDICOM=true
16+
- INSTALL_LIBJPEG=false
5217
- name: "Python 3.7, Ubuntu"
5318
os: linux
5419
dist: bionic
5520
python: "3.7"
56-
env: TEST_SUITE=solo
21+
env:
22+
- INSTALL_PYDICOM=true
23+
- INSTALL_LIBJPEG=false
5724
- name: "Python 3.8, Ubuntu"
5825
os: linux
5926
dist: bionic
6027
python: "3.8"
61-
env: TEST_SUITE=solo
62-
- name: "Python 3.6, Ubuntu + pydicom"
28+
env:
29+
- INSTALL_PYDICOM=true
30+
- INSTALL_LIBJPEG=false
31+
# libjpeg + pydicom
32+
- name: "Python 3.6, Ubuntu + libjpeg"
6333
os: linux
6434
dist: bionic
6535
python: "3.6"
66-
env: TEST_SUITE=pydicom_release
67-
- name: "Python 3.7, Ubuntu + pydicom"
36+
env:
37+
- INSTALL_PYDICOM=true
38+
- INSTALL_LIBJPEG=true
39+
- name: "Python 3.7, Ubuntu + libjpeg"
6840
os: linux
6941
dist: bionic
7042
python: "3.7"
71-
env: TEST_SUITE=pydicom_release
72-
- name: "Python 3.8, Ubuntu + pydicom"
43+
env:
44+
- INSTALL_PYDICOM=true
45+
- INSTALL_LIBJPEG=true
46+
- name: "Python 3.8, Ubuntu + libjpeg"
7347
os: linux
7448
dist: bionic
7549
python: "3.8"
76-
env: TEST_SUITE=pydicom_release
50+
env:
51+
- INSTALL_PYDICOM=true
52+
- INSTALL_LIBJPEG=true
53+
7754

7855
# Install dependencies and package
7956
install:

0 commit comments

Comments
 (0)