Skip to content

Commit

Permalink
Use docker in travis with xenial
Browse files Browse the repository at this point in the history
  • Loading branch information
phcerdan committed Aug 2, 2018
1 parent faf5c3a commit 2c1cd48
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 19 deletions.
40 changes: 25 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
os: linux
dist: trusty
addons:
apt:
packages:
- libopenblas-dev
- liblapack-dev
- liblapacke-dev
sudo: required
install:
- docker pull ubuntu:xenial
- pip install coveralls
- python setup.py install
script:
- nosetests --with-coverage --cover-package=prox_tv
- mkdir -p build && cd build
- cmake -DENABLE_TESTING:BOOL=ON ../
- cmake --build .
- ctest -VV
- export PYTHONVERSION=$(python -c 'import platform; print(platform.python_version()[0:3])')
- >
docker run -e PYTHONVERSION=${PYTHONVERSION} -v $(pwd):/app ubuntu:xenial bash -x -c "
apt-get update &&
apt-get install -y wget bzip2 build-essential cmake libffi-dev libopenblas-dev liblapack-dev liblapacke-dev &&
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh &&
bash Miniconda3-latest-Linux-x86_64.sh -b &&
/root/miniconda3/bin/conda config --set always_yes yes --set changeps1 no &&
/root/miniconda3/bin/conda create -n testenv python=${PYTHONVERSION} &&
source /root/miniconda3/bin/activate testenv &&
which python &&
python -V &&
pip install nose coveralls &&
cd app &&
python setup.py install &&
nosetests --with-coverage --cover-package=prox_tv
mkdir -p build &&
cd build &&
cmake -DENABLE_TESTING:BOOL=ON ../ &&
cmake --build . &&
ctest -VV
"
after_success:
- coveralls
- coveralls
12 changes: 8 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW)
endif()

project(proxTV
DESCRIPTION "Toolbox for fast Total Variation proximity operators"
VERSION 3.2.1
)
project(proxTV)

set(proxTV_DESCRIPTION "Toolbox for fast Total Variation proximity operators")
# Set VERSION
set(proxTV_VERSION_MAJOR 3)
set(proxTV_VERSION_MINOR 2)
set(proxTV_VERSION_PATCH 1)
set(proxTV_VERSION "${proxTV_VERSION_MAJOR}.${proxTV_VERSION_MINOR}.${proxTV_VERSION_PATCH}")

message(STATUS "proxTV version: ${proxTV_VERSION}")

Expand Down

0 comments on commit 2c1cd48

Please sign in to comment.