template

.travis.yml

@@ -1,37 +1,40 @@
-language: generic
+language: python
+
+python:
+  - 3.6
+
+os:
+  - linux
 
 notifications:
     email: false
 
 git:
     depth: 3
 
-matrix:
-  include:
-#    - os: osx
-#      env: pyv=3.6
 
-    - os: linux
-      env: pyv=3.6
 
-install:
+
+
+
+before_install:
     - if [[ $TRAVIS_OS_NAME == osx ]]; then
         wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh;
       else
         wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
       fi
 
+install:
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH=$HOME/miniconda/bin:$PATH
     - hash -r
 
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
-    - conda create -n test python=$pyv
+    - conda create -n test python=$TRAVIS_PYTHON_VERSION
     - source activate test
     - pip -q install coveralls
 
-    - conda install pillow h5py scipy scikit-image matplotlib astropy seaborn
     - python setup.py develop
 
 script: coverage run tests/test.py -v

setup.py

@@ -1,15 +1,23 @@
 #!/usr/bin/env python
+req = ['nose','pillow','python-dateutil','pytz','numpy','scipy','h5py','astropy','scikit-image','matplotlib','seaborn']
+pipreq = ['pymap3d',]
+# %%
+import pip
+try:
+    import conda.cli
+    conda.cli.main('install',*req)
+except Exception as e:
+    pip.main(['install'] +req)
+pip.main(['install'] + pipreq)
+# %%
 from setuptools import setup
 
-req = ['pymap3d',
-        'nose','pillow','python-dateutil','pytz','numpy','scipy','h5py','astropy','scikit-image','matplotlib','seaborn' ]
-
 setup(name='astrometry_azel',
       packages=['astrometry_azel'],
       author='Michael Hirsch, Ph.D.',
       description='Register images to az/el using the astrometry.net program',
       url='https://github.com/scivision/astrometry_azel',
-      version='1.1.0',
+      version='1.1.1',
       classifiers=[
       'Intended Audience :: Science/Research',
       'Development Status :: 5 - Production/Stable',