convert test dirs to packages (#1204)

* convert test dirs to packages

* fix cross module import of fixture in test_location

* add whats new

Author: wholmgren

docs/sphinx/source/whatsnew/v0.9.0.rst

@@ -120,6 +120,9 @@ Bug fixes
 
 Testing
 ~~~~~~~
+* Added ``__init__.py`` to ``pvlib/tests`` and subdirectories. This follows
+  pytest recommendations for package layout and imports from ``conftest.py``.
+  Solves issue with test discovery in vscode. (:pull:`1204`)
 
 Documentation
 ~~~~~~~~~~~~~

pvlib/tests/__init__.py

@@ -8,6 +8,7 @@
 from functools import wraps
 
 import pvlib
+from pvlib.location import Location
 
 pvlib_base_version = \
     parse_version(parse_version(pvlib.__version__).base_version)
@@ -187,6 +188,25 @@ def has_numba():
 )
 
 
+@pytest.fixture()
+def golden():
+    return Location(39.742476, -105.1786, 'America/Denver', 1830.14)
+
+
+@pytest.fixture()
+def golden_mst():
+    return Location(39.742476, -105.1786, 'MST', 1830.14)
+
+
+@pytest.fixture()
+def expected_solpos():
+    return pd.DataFrame({'elevation': 39.872046,
+                         'apparent_zenith': 50.111622,
+                         'azimuth': 194.340241,
+                         'apparent_elevation': 39.888378},
+                        index=['2003-10-17T12:30:30Z'])
+
+
 @pytest.fixture(scope="session")
 def sam_data():
     data = {}

pvlib/tests/conftest.py

@@ -7,7 +7,7 @@
 import pytest
 
 from pvlib.iotools import bsrn
-from conftest import DATA_DIR, assert_index_equal
+from ..conftest import DATA_DIR, assert_index_equal
 
 
 @pytest.mark.parametrize('testfile,expected_index', [

pvlib/tests/iotools/__init__.py

@@ -1,10 +1,9 @@
 import pandas as pd
-from conftest import assert_frame_equal
 import numpy as np
 from numpy import dtype, nan
 import pytest
 from pvlib.iotools import crn
-from conftest import DATA_DIR
+from ..conftest import DATA_DIR, assert_frame_equal
 
 
 @pytest.fixture

pvlib/tests/iotools/test_bsrn.py

@@ -6,7 +6,7 @@
 import datetime
 import numpy as np
 import pytest
-from conftest import requires_netCDF4, DATA_DIR
+from ..conftest import requires_netCDF4, DATA_DIR
 from pvlib.iotools import ecmwf_macc
 
 TESTDATA = 'aod550_tcwv_20121101_test.nc'

pvlib/tests/iotools/test_crn.py

@@ -1,7 +1,7 @@
 import pytest
 
 from pvlib.iotools import epw
-from conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
 
 epw_testfile = DATA_DIR / 'NLD_Amsterdam062400_IWEC.epw'
 

pvlib/tests/iotools/test_ecmwf_macc.py

@@ -3,7 +3,7 @@
 import pytz
 
 from pvlib.iotools import midc
-from conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
 
 
 @pytest.fixture

pvlib/tests/iotools/test_epw.py

@@ -4,7 +4,7 @@
 
 import os
 from pvlib.iotools import psm3
-from conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
 import numpy as np
 import pandas as pd
 import pytest