reorganize tests into subfolders

* closes pvlib#848
* create pvlib/tests/iotools and move all iotools tests into that
subfolder
* use fixtures in test_ecmwf_macc.py for expected_test_data
* use conftest.data_dir instead of redundant boilerplate process of
retrieving test folder for each tests, mostly for iotools
* fix test_ivtools.py was using full path to conftest but tests is not a
python package, so no
* change "pvlib/test" -> "pvlib/tests" to conform to popular convention

Signed-off-by: Mark Mikofski <[email protected]>

Author: mikofski

pvlib/test/conftest.py renamed to pvlib/tests/conftest.py

@@ -1,4 +1,3 @@
-import inspect
 import os
 import platform
 
@@ -36,8 +35,7 @@ def inner():
 
 
 # commonly used directories in the tests
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
+test_dir = os.path.dirname(__file__)
 data_dir = os.path.join(test_dir, os.pardir, 'data')
 
 

pvlib/test/test_crn.py renamed to pvlib/tests/iotools/test_crn.py

@@ -1,4 +1,3 @@
-import inspect
 import os
 
 import pandas as pd
@@ -7,12 +6,10 @@
 from numpy import dtype, nan
 
 from pvlib.iotools import crn
+from conftest import data_dir
 
-
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
-testfile = os.path.join(test_dir,
-                        '../data/CRNS0101-05-2019-AZ_Tucson_11_W.txt')
+testfile = os.path.join(data_dir,
+                        'CRNS0101-05-2019-AZ_Tucson_11_W.txt')
 
 
 def test_read_crn():

pvlib/test/test_ecmwf_macc.py renamed to pvlib/tests/iotools/test_ecmwf_macc.py

@@ -5,12 +5,10 @@
 import os
 import datetime
 import numpy as np
-from conftest import requires_netCDF4
+import pytest
+from conftest import requires_netCDF4, data_dir
 from pvlib.iotools import ecmwf_macc
 
-DIRNAME = os.path.dirname(__file__)
-PROJNAME = os.path.dirname(DIRNAME)
-DATADIR = os.path.join(PROJNAME, 'data')
 TESTDATA = 'aod550_tcwv_20121101_test.nc'
 
 # for creating test data
@@ -21,19 +19,24 @@
 LAT_BND = (90, -90)
 
 
+@pytest.fixture
+def expected_test_data():
+    return os.path.join(data_dir, TESTDATA)
+
+
 @requires_netCDF4
-def test_get_nearest_indices():
+def test_get_nearest_indices(expected_test_data):
     """Test getting indices given latitude, longitude from ECMWF_MACC data."""
-    data = ecmwf_macc.ECMWF_MACC(os.path.join(DATADIR, TESTDATA))
+    data = ecmwf_macc.ECMWF_MACC(expected_test_data)
     ilat, ilon = data.get_nearest_indices(38, -122)
     assert ilat == 17
     assert ilon == 79
 
 
 @requires_netCDF4
-def test_interp_data():
+def test_interp_data(expected_test_data):
     """Test interpolating UTC time from ECMWF_MACC data."""
-    data = ecmwf_macc.ECMWF_MACC(os.path.join(DATADIR, TESTDATA))
+    data = ecmwf_macc.ECMWF_MACC(expected_test_data)
     test9am = data.interp_data(
         38, -122, datetime.datetime(2012, 11, 1, 9, 0, 0), 'aod550')
     assert np.isclose(test9am, data.data.variables['aod550'][2, 17, 79])
@@ -47,10 +50,10 @@ def test_interp_data():
 
 
 @requires_netCDF4
-def test_read_ecmwf_macc():
+def test_read_ecmwf_macc(expected_test_data):
     """Test reading ECMWF_MACC data from netCDF4 file."""
     data = ecmwf_macc.read_ecmwf_macc(
-        os.path.join(DATADIR, TESTDATA), 38, -122)
+        expected_test_data, 38, -122)
     expected_times = [
         1351738800, 1351749600, 1351760400, 1351771200, 1351782000, 1351792800,
         1351803600, 1351814400]
@@ -67,7 +70,7 @@ def test_read_ecmwf_macc():
     datetimes = (datetime.datetime(2012, 11, 1, 9, 0, 0),
                  datetime.datetime(2012, 11, 1, 12, 0, 0))
     data_9am_12pm = ecmwf_macc.read_ecmwf_macc(
-        os.path.join(DATADIR, TESTDATA), 38, -122, datetimes)
+        expected_test_data, 38, -122, datetimes)
     assert np.allclose(data_9am_12pm.aod550.values, expected_aod[2:4])
     assert np.allclose(data_9am_12pm.tcwv.values, expected_tcwv[2:4])
 

pvlib/test/test_epw.py renamed to pvlib/tests/iotools/test_epw.py

@@ -1,4 +1,3 @@
-import inspect
 import os
 
 import pandas as pd
@@ -7,6 +6,7 @@
 import pytz
 
 from pvlib.iotools import midc
+from conftest import data_dir
 
 
 @pytest.fixture
@@ -20,12 +20,10 @@ def test_mapping():
     }
 
 
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
-midc_testfile = os.path.join(test_dir, '../data/midc_20181014.txt')
-midc_raw_testfile = os.path.join(test_dir, '../data/midc_raw_20181018.txt')
+midc_testfile = os.path.join(data_dir, 'midc_20181014.txt')
+midc_raw_testfile = os.path.join(data_dir, 'midc_raw_20181018.txt')
 midc_raw_short_header_testfile = os.path.join(
-    test_dir, '../data/midc_raw_short_header_20191115.txt')
+    data_dir, 'midc_raw_short_header_20191115.txt')
 midc_network_testfile = ('https://midcdmz.nrel.gov/apps/data_api.pl'
                          '?site=UAT&begin=20181018&end=20181019')
 

pvlib/test/test_midc.py renamed to pvlib/tests/iotools/test_midc.py

@@ -4,19 +4,16 @@
 
 import os
 from pvlib.iotools import psm3
-from conftest import needs_pandas_0_22
+from conftest import needs_pandas_0_22, data_dir
 import numpy as np
 import pandas as pd
 import pytest
 from requests import HTTPError
 from io import StringIO
 
-BASEDIR = os.path.abspath(os.path.dirname(__file__))
-PROJDIR = os.path.dirname(BASEDIR)
-DATADIR = os.path.join(PROJDIR, 'data')
-TMY_TEST_DATA = os.path.join(DATADIR, 'test_psm3_tmy-2017.csv')
-YEAR_TEST_DATA = os.path.join(DATADIR, 'test_psm3_2017.csv')
-MANUAL_TEST_DATA = os.path.join(DATADIR, 'test_read_psm3.csv')
+TMY_TEST_DATA = os.path.join(data_dir, 'test_psm3_tmy-2017.csv')
+YEAR_TEST_DATA = os.path.join(data_dir, 'test_psm3_2017.csv')
+MANUAL_TEST_DATA = os.path.join(data_dir, 'test_read_psm3.csv')
 LATITUDE, LONGITUDE = 40.5137, -108.5449
 HEADER_FIELDS = [
     'Source', 'Location ID', 'City', 'State', 'Country', 'Latitude',

pvlib/test/test_psm3.py renamed to pvlib/tests/iotools/test_psm3.py

@@ -8,10 +8,9 @@
 import pytest
 import requests
 from pvlib.iotools import get_pvgis_tmy
+from conftest import data_dir
 
-TESTS = Path(__file__).parent
-PROJECT = TESTS.parent
-DATA = PROJECT / 'data'
+DATA = Path(data_dir)
 
 
 @pytest.fixture

pvlib/test/test_pvgis.py renamed to pvlib/tests/iotools/test_pvgis.py

@@ -1,4 +1,3 @@
-import inspect
 import os
 
 from numpy import isnan
@@ -7,11 +6,9 @@
 import pytest
 
 from pvlib.iotools import srml
+from conftest import data_dir
 
-
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
-srml_testfile = os.path.join(test_dir, '../data/SRML-day-EUPO1801.txt')
+srml_testfile = os.path.join(data_dir, '../data/SRML-day-EUPO1801.txt')
 
 
 def test_read_srml():

pvlib/test/test_solrad.py renamed to pvlib/tests/iotools/test_solrad.py

@@ -1,14 +1,12 @@
-import inspect
 import os
 
 import pandas as pd
 from pandas.util.testing import network
 
 from pvlib.iotools import surfrad
+from conftest import data_dir
 
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
-testfile = os.path.join(test_dir, '../data/surfrad-slv16001.dat')
+testfile = os.path.join(data_dir, 'surfrad-slv16001.dat')
 network_testfile = ('ftp://aftp.cmdl.noaa.gov/data/radiation/surfrad/'
                     'Alamosa_CO/2016/slv16001.dat')
 

pvlib/test/test_srml.py renamed to pvlib/tests/iotools/test_srml.py

@@ -1,14 +1,12 @@
-import inspect
 import os
 
 from pandas.util.testing import network
 
 from pvlib.iotools import tmy
+from conftest import data_dir
 
-test_dir = os.path.dirname(
-    os.path.abspath(inspect.getfile(inspect.currentframe())))
-tmy3_testfile = os.path.join(test_dir, '../data/703165TY.csv')
-tmy2_testfile = os.path.join(test_dir, '../data/12839.tm2')
+tmy3_testfile = os.path.join(data_dir, '703165TY.csv')
+tmy2_testfile = os.path.join(data_dir, '12839.tm2')
 
 
 def test_read_tmy3():

pvlib/test/test_surfrad.py renamed to pvlib/tests/iotools/test_surfrad.py

@@ -10,7 +10,7 @@
 import pytest
 from pvlib import pvsystem
 from pvlib import ivtools
-from pvlib.test.conftest import requires_scipy, requires_pysam
+from conftest import requires_scipy, requires_pysam
 
 
 @pytest.fixture