Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
omit =
pylibjpeg/tests/*
pylibjpeg/scripts/*
pylibjpeg/data/*
pylibjpeg/src/*
pylibjpeg/tools/*
pylibjpeg-data/*
pylibjpeg-libjpeg/*
pydicom/*
pydicom-master/*
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

71 changes: 24 additions & 47 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,53 @@ branches:

language: python

# Build against pydicom master and current release
matrix:
include:
# OSX first because it takes a long time to complete before_install
- name: "Python 3.6, OSX + pydicom"
os: osx
language: generic
env:
- TEST_SUITE=osx
- TRAVIS_PYTHON_VERSION=3.6.8
# Windows
- name: "Python 3.6, Windows + pydicom"
os: windows
language: shell
env:
- TEST_SUITE=windows
- TRAVIS_PYTHON_VERSION=3.6.8
# Conda next, also takes a while
- name: "Python 3.6, Ubuntu + conda + pydicom"
os: linux
dist: bionic
env:
- TEST_SUITE=conda
- TRAVIS_PYTHON_VERSION=3.6
# Ubuntu with pydicom master next to find any issues quickly
- name: "Python 3.6, Ubuntu + pydicom master"
os: linux
dist: bionic
python: "3.6"
env: TEST_SUITE=pydicom_master
- name: "Python 3.7, Ubuntu + pydicom master"
os: linux
dist: bionic
python: "3.7"
env: TEST_SUITE=pydicom_master
- name: "Python 3.8, Ubuntu + pydicom master"
os: linux
dist: bionic
python: "3.8"
env: TEST_SUITE=pydicom_master
# No plugins + pydicom
- name: "Python 3.6, Ubuntu"
os: linux
dist: bionic
python: "3.6"
env: TEST_SUITE=solo
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=false
- name: "Python 3.7, Ubuntu"
os: linux
dist: bionic
python: "3.7"
env: TEST_SUITE=solo
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=false
- name: "Python 3.8, Ubuntu"
os: linux
dist: bionic
python: "3.8"
env: TEST_SUITE=solo
- name: "Python 3.6, Ubuntu + pydicom"
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=false
# libjpeg + pydicom
- name: "Python 3.6, Ubuntu + libjpeg"
os: linux
dist: bionic
python: "3.6"
env: TEST_SUITE=pydicom_release
- name: "Python 3.7, Ubuntu + pydicom"
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=true
- name: "Python 3.7, Ubuntu + libjpeg"
os: linux
dist: bionic
python: "3.7"
env: TEST_SUITE=pydicom_release
- name: "Python 3.8, Ubuntu + pydicom"
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=true
- name: "Python 3.8, Ubuntu + libjpeg"
os: linux
dist: bionic
python: "3.8"
env: TEST_SUITE=pydicom_release
env:
- INSTALL_PYDICOM=true
- INSTALL_LIBJPEG=true


# Install dependencies and package
install:
Expand Down
Loading