Merge pull request #28 from alexlib/new_travis_yml

New travis yml

.travis.yml

@@ -2,13 +2,10 @@
 
 language: python
   - "2.7"
-compiler:
-  - clang
-  - gcc
 sudo: false
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y cmake check build-essential git libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev
+  - sudo apt-get install -y build-essential git libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev
   - sudo apt-get clean
   - sudo apt-get autoclean
 install:
@@ -17,28 +14,19 @@ install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
   - conda config --set always_yes yes
-  - conda install chaco cython scikit-image kiwisolver enable nose future pip
-  - conda update numpy
   - conda update -q conda
   - conda clean --all
+  - conda install numpy=1.16.1
+  - conda install cython
+  - conda install swig
+  - pip install chaco scikit-image enable nose future  
+  - pip install optv
   - pip install --user coveralls
   - conda install conda-build
   - conda build .
   - conda install --use-local pyptv
-  - sed -i 's/cbrt/#cbrt/' /home/travis/miniconda/lib/python2.7/site-packages/dask/array/ufunc.py
   - conda info -a
-before_script:
-  - hash -r 
-  - export PATH=$HOME/lib:$/usr/local/lib:$PATH
-  - export LD_LIBRARY_PATH=$HOME/lib:$/usr/local/lib:$LD_LIBRARY_PATH
-  - ./install_openptv.sh
 script:
-  - export PATH=$PATH:/usr/local/lib
-  - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-  - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib
-  - echo $LD_LIBRARY_PATH
-  - echo $PATH
-  - python -c "import sys; print sys.path"
   - cd tests
   - nosetests -v
 after_success:

pyptv/pyptv_gui.py

@@ -657,7 +657,6 @@ def track_back_action(self, info):
         print ("Starting back tracking")
         info.object.tracker.full_backward()
 
-    @staticmethod
     def threed_positions(self,info):
         """ Extracts and saves 3D positions from the list of correspondences """
         ptv.py_determination_proc_c(info.object.n_cams, info.object.sorted_pos,

requirements.txt

@@ -1,84 +1,6 @@
-# This file may be used to create an environment using:
-# $ conda create --name <env> --file <this file>
-# platform: osx-64
-backports=1.0=py27hb4f9756_1
-backports_abc=0.5=py27h6972548_0
-bokeh=0.12.13=py27h5233db4_0
-ca-certificates=2017.08.26=ha1e5d58_0
-certifi=2018.1.18=py27_0
-chaco=4.5.0=np110py27_0
-click=6.7=py27h2b86a94_0
-cloudpickle=0.5.2=py27_1
-cycler=0.10.0=py27hfc73c78_0
-cython=0.28.1=py27h1de35cc_0
-dask=0.16.1=py27_0
-dask-core=0.16.1=py27_0
-decorator=4.2.1=py27_0
-distributed=1.20.2=py27_0
-enable=4.5.1=np110py27_0
-freetype=2.5.5=2
-future=0.16.0=py27_1
-futures=3.2.0=py27h1b80678_0
-heapdict=1.0.0=py27_2
-imageio=2.2.0=py27h37746d9_0
-intel-openmp=2018.0.0=h8158457_8
-jbig=2.1=h4d881f8_0
-jinja2=2.10=py27h70b8dc5_0
-jpeg=8d=2
-kiwisolver=1.0.1=py27h9856860_0
-lcms=1.19=0
-libcxx=4.0.1=h579ed51_0
-libcxxabi=4.0.1=hebd6815_0
-libedit=3.1=hb4e282d_0
-libffi=3.2.1=h475c297_4
-libgfortran=3.0.1=h93005f0_2
-libpng=1.6.34=he12f830_0
-libtiff=4.0.6=2
-locket=0.2.0=py27ha10513d_1
-markupsafe=1.0=py27hd3c86fa_1
-matplotlib=1.5.1=np110py27_0
-mkl=2018.0.1=hfbd8650_4
-msgpack-python=0.5.1=py27h04f5b5a_0
-ncurses=6.0=hd04f020_2
-networkx=2.1=py27_0
-nose=1.3.7=py27_2
-numpy=1.10.2=py27_0
-openssl=1.0.2n=hdbc3d79_0
-pandas=0.22.0=py27h0a44026_0
-partd=0.3.8=py27h7560dbf_0
-pil=1.1.7=py27_2
-pillow=3.4.2=py27_0
-pip=9.0.1=py27h1567d89_4
-psutil=5.4.3=py27h1de35cc_0
-pyface=4.5.2=py27_0
-pygments=2.2.0=py27h1a556bb_0
-pyparsing=2.2.0=py27h5bb6aaf_0
-pyqt=4.11.4=py27_4
-python=2.7.14=hde5916a_29
-python-dateutil=2.6.1=py27hd56c96b_1
-python.app=2=py27hf2d5e94_7
-pytz=2017.3=py27h803c07a_0
-pywavelets=0.5.2=py27hd99e88a_0
-pyyaml>=4.2b1
-qt=4.8.7=4
-readline=7.0=hc1231fa_4
-scikit-image=0.13.1=py27h1de35cc_1
-scipy=1.0.0=py27h793f721_0
-setuptools=38.4.0=py27_0
-singledispatch=3.4.0.3=py27he22c18d_0
-sip=4.18=py27_0
-six=1.11.0=py27h7252ba3_1
-sortedcontainers=1.5.9=py27_0
-sqlite=3.22.0=h3efe00b_0
-ssl_match_hostname=3.5.0.1=py27h8780752_2
-tblib=1.3.2=py27ha684fc4_0
-tk=8.6.7=h35a86e2_3
-toolz=0.9.0=py27_0
-tornado=4.5.3=py27_0
-traits=4.5.0=py27_0
-traitsui=4.5.1=py27_0
-wheel=0.30.0=py27h677a027_1
-xz=5.2.3=h0278029_2
-yaml=0.1.7=hc338f04_2
-zict=0.1.3=py27h5fff8b1_0
-zlib=1.2.11=hf3cbc9b_2
+optv
+numpy==1.16.1
+scikits-image
+chaco
+enable
+future