Merge pull request #8 from bmorris3/fix_tests

Fix tests

.travis.yml

@@ -16,9 +16,6 @@ addons:
         packages:
             - graphviz
 
-
-stage: Comprehensive tests
-
 stages:
    # Do the style check and a single test job, don't proceed if it fails
    - name: Initial tests
@@ -51,7 +48,7 @@ env:
 
         # List other runtime dependencies for the package that are available as
         # pip packages here.
-        - PIP_DEPENDENCIES=''
+        - PIP_DEPENDENCIES='pytest-astropy'
 
         # Conda packages for affiliated packages are hosted in channel
         # "astropy" while builds for astropy LTS with recent numpy versions
@@ -85,11 +82,6 @@ matrix:
           stage: Cron tests
           env: SETUP_CMD='test' EVENT_TYPE='cron'
 
-        # Do a coverage test.
-        - os: linux
-          stage: Initial tests
-          env: SETUP_CMD='test --coverage'
-
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
         - os: linux
@@ -111,26 +103,6 @@ matrix:
           env: ASTROPY_VERSION=development NUMPY_VERSION=development
                EVENT_TYPE='cron'
 
-        # Try on Windows.
-        - os: windows
-          stage: Slow tests
-          env: SETUP_CMD='test'
-
-        # Try all python versions and Numpy versions. Since we can assume that
-        # the Numpy developers have taken care of testing Numpy with different
-        # versions of Python, we can vary Python and Numpy versions at the same
-        # time.
-
-        - os: linux
-          env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.14
-        - os: linux
-          env: NUMPY_VERSION=1.15
-
-        # Do a PEP8 test with flake8
-        - os: linux
-          stage: Initial tests
-          env: MAIN_CMD='flake8 heliosk --count --show-source --statistics $FLAKE8_OPT' SETUP_CMD=''
-
     allow_failures:
         # Do a PEP8 test with flake8
         # (do allow to fail unless your code completely compliant)

docs/plots/p001/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -14,13 +16,13 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filename = 'Out_i.dat'
-filenameb0 = 'Out_i_bin0000.dat'
-filenameb1 = 'Out_i_bin0001.dat'
-filenameb2 = 'Out_i_bin0002.dat'
-filenameb3 = 'Out_i_bin0003.dat'
-filenameb4 = 'Out_i_bin0004.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filename = os.path.join(dirname, 'Out_i.dat')
+filenameb0 = os.path.join(dirname, 'Out_i_bin0000.dat')
+filenameb1 = os.path.join(dirname, 'Out_i_bin0001.dat')
+filenameb2 = os.path.join(dirname, 'Out_i_bin0002.dat')
+filenameb3 = os.path.join(dirname, 'Out_i_bin0003.dat')
+filenameb4 = os.path.join(dirname, 'Out_i_bin0004.dat')
 
 ax1=pl.subplot(111)
 

docs/plots/p002/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -15,12 +17,14 @@
 pl.figure(figsize=(8, 6))
 
 
-filename = 'Out_i.dat'
-filenameb0 = 'Out_i_bin0000.dat'
-filenameb1 = 'Out_i_bin0001.dat'
-filenameb2 = 'Out_i_bin0002.dat'
-filenameb3 = 'Out_i_bin0003.dat'
-filenameb4 = 'Out_i_bin0004.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filename = os.path.join(dirname, 'Out_i.dat')
+filenameb0 = os.path.join(dirname, 'Out_i_bin0000.dat')
+filenameb1 = os.path.join(dirname, 'Out_i_bin0001.dat')
+filenameb2 = os.path.join(dirname, 'Out_i_bin0002.dat')
+filenameb3 = os.path.join(dirname, 'Out_i_bin0003.dat')
+filenameb4 = os.path.join(dirname, 'Out_i_bin0004.dat')
+
 
 ax1=pl.subplot(111)
 

docs/plots/p003/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -14,19 +16,20 @@
 
 pl.figure(figsize=(8, 6))
 
+dirname = os.path.abspath(os.path.dirname(__file__))
 
-filename = 'Out_i.dat'
-filenameb0 = 'Out_i_bin0000.dat'
-filenameb1 = 'Out_i_bin0001.dat'
-filenameb2 = 'Out_i_bin0002.dat'
-filenameb3 = 'Out_i_bin0003.dat'
-filenameb4 = 'Out_i_bin0004.dat'
+filename = os.path.join(dirname, 'Out_i.dat')
+filenameb0 = os.path.join(dirname, 'Out_i_bin0000.dat')
+filenameb1 = os.path.join(dirname, 'Out_i_bin0001.dat')
+filenameb2 = os.path.join(dirname, 'Out_i_bin0002.dat')
+filenameb3 = os.path.join(dirname, 'Out_i_bin0003.dat')
+filenameb4 = os.path.join(dirname, 'Out_i_bin0004.dat')
 
-filenamee0 = 'Out_e_bin0000.dat'
-filenamee1 = 'Out_e_bin0001.dat'
-filenamee2 = 'Out_e_bin0002.dat'
-filenamee3 = 'Out_e_bin0003.dat'
-filenamee4 = 'Out_e_bin0004.dat'
+filenamee0 = os.path.join(dirname, 'Out_e_bin0000.dat')
+filenamee1 = os.path.join(dirname, 'Out_e_bin0001.dat')
+filenamee2 = os.path.join(dirname, 'Out_e_bin0002.dat')
+filenamee3 = os.path.join(dirname, 'Out_e_bin0003.dat')
+filenamee4 = os.path.join(dirname, 'Out_e_bin0004.dat')
 
 ax1=pl.subplot(111)
 

docs/plots/p004/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -16,9 +18,9 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filenameb0 = 'Out_i_bin.dat'
-filenameb1 = 'Out_r_bin.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filenameb0 = os.path.join(dirname, 'Out_i_bin.dat')
+filenameb1 = os.path.join(dirname, 'Out_r_bin.dat')
 
 fig, ax1=pl.subplots()
 

docs/plots/p005/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -16,9 +18,9 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filenameb0 = 'Out_i_bin.dat'
-filenameb1 = 'Out_r_bin.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filenameb0 = os.path.join(dirname, 'Out_i_bin.dat')
+filenameb1 = os.path.join(dirname, 'Out_r_bin.dat')
 
 fig, ax1=pl.subplots()
 

docs/plots/p006/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -14,13 +16,13 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filename = 'Out_i.dat'
-filenameb0 = 'Out_i_tr0000.dat'
-filenameb1 = 'Out_i_tr0001.dat'
-filenameb2 = 'Out_i_tr0002.dat'
-filenameb3 = 'Out_i_tr0003.dat'
-filenameb4 = 'Out_i_tr0004.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filename = os.path.join(dirname, 'Out_i.dat')
+filenameb0 = os.path.join(dirname, 'Out_i_tr0000.dat')
+filenameb1 = os.path.join(dirname, 'Out_i_tr0001.dat')
+filenameb2 = os.path.join(dirname, 'Out_i_tr0002.dat')
+filenameb3 = os.path.join(dirname, 'Out_i_tr0003.dat')
+filenameb4 = os.path.join(dirname, 'Out_i_tr0004.dat')
 
 ax1=pl.subplot(211)
 pl.subplots_adjust(wspace=0.3, hspace=0.3)

docs/plots/p007/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -14,9 +16,9 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filename = 'Out_i.dat'
-filenamem = 'Out_i_mean.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+filename = os.path.join(dirname, 'Out_i.dat')
+filenamem = os.path.join(dirname, 'Out_i_mean.dat')
 
 ax1=pl.subplot(111)
 

docs/plots/p008/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -16,10 +18,11 @@
 
 pl.figure(figsize=(8, 6))
 
+dirname = os.path.abspath(os.path.dirname(__file__))
 
-filename1 = 'Out_c0_25.dat'
-filename2 = 'Out_c0_500.dat'
-filename3 = 'Out_c0_0.dat'
+filename1 = os.path.join(dirname, 'Out_c0_25.dat')
+filename2 = os.path.join(dirname, 'Out_c0_500.dat')
+filename3 = os.path.join(dirname, 'Out_c0_0.dat')
 
 ax1=pl.subplot(111)
 

docs/plots/p009/plot.py

@@ -1,3 +1,5 @@
+import os
+
 import matplotlib
 #matplotlib.use('PS')
 matplotlib.use('agg')
@@ -14,11 +16,12 @@
 
 pl.figure(figsize=(8, 6))
 
-
-filename1 = 'Out_p1.dat'
-filename2 = 'Out_p2.dat'
-filename3 = 'Out_p3.dat'
-filename4 = 'Out_p4.dat'
+dirname = os.path.abspath(os.path.dirname(__file__))
+print(dirname)
+filename1 = os.path.join(dirname, 'Out_p1.dat')
+filename2 = os.path.join(dirname, 'Out_p2.dat')
+filename3 = os.path.join(dirname, 'Out_p3.dat')
+filename4 = os.path.join(dirname, 'Out_p4.dat')
 
 ax1=pl.subplot(111)
 

setup.cfg

@@ -12,7 +12,7 @@ author = Simon Grimm
 [options]
 # install_requires should be formatted as a semicolon-separated list, e.g.:
 # install_requires = astropy; scipy; matplotlib
-install_requires = astropy
+install_requires = astropy; matplotlib
 zip_safe = False
 use_2to3 = False