prereq

.travis.yml

@@ -1,4 +1,11 @@
-language: generic
+language: python
+
+python:
+  - 3.5
+  - 3.6
+
+os:
+  - linux
 
 notifications:
     email: false
@@ -11,36 +18,26 @@ addons:
     packages:
       - gfortran
 
-
-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 numpy scipy xarray h5py astropy matplotlib seaborn
     - python setup.py develop
 
 script: coverage run tests/test.py -v
 
 after_success: coveralls
-

setup.py

@@ -1,27 +1,32 @@
 #!/usr/bin/env python
-from setuptools import setup
-
-req = ['python-dateutil','pytz','nose','numpy','scipy','xarray','h5py','astropy','matplotlib','seaborn',
-      'sciencedates',
+req = ['python-dateutil','pytz','nose','numpy','scipy','xarray','h5py','astropy','matplotlib','seaborn',]
+pipreq=['sciencedates','lowtran',
         'pathvalidate']
-
+# %%
+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
 
 setup(name='gridaurora',
       packages=['gridaurora'],
       author='Michael Hirsch, Ph.D.',
       description='Gridding for auroral and ionospheric modeling',
       url='https://github.com/scivision/gridaurora',
-      version='1.0.1',
+      version='1.0.2',
       package_data={'gridaurora':['data/RecentIndices.txt'],
                     'gridaurora.precompute': ['*.h5']},
-	  install_requires=req,
-      extras_require={'lowtran':'lowtran'}, #optional
       classifiers=[
           'Intended Audience :: Science/Research',
           'Development Status :: 5 - Production/Stable',
           'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
           'Topic :: Scientific/Engineering :: Atmospheric Science',
-          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.6',
           ],
 	  )