Flatten the tests dir out of pvlib

Author: echedey-ls

.github/workflows/pytest-remote-data.yml

@@ -100,7 +100,7 @@ jobs:
           SOLARANYWHERE_API_KEY: ${{ secrets.SOLARANYWHERE_API_KEY }}
           BSRN_FTP_USERNAME: ${{ secrets.BSRN_FTP_USERNAME }}
           BSRN_FTP_PASSWORD: ${{ secrets.BSRN_FTP_PASSWORD }}
-        run: pytest pvlib/tests/iotools --cov=./ --cov-report=xml --remote-data
+        run: pytest tests/iotools --cov=./ --cov-report=xml --remote-data
 
       - name: Upload coverage to Codecov
         if: matrix.python-version == 3.9 && matrix.suffix == ''

.github/workflows/pytest.yml

@@ -79,7 +79,7 @@ jobs:
         shell: bash -l {0}  # necessary for conda env to be active
         run: |
           # ignore iotools; those tests are run in a separate workflow
-          pytest pvlib --cov=./ --cov-report=xml --ignore=pvlib/tests/iotools
+          pytest pvlib --cov=./ --cov-report=xml --ignore=tests/iotools
 
       - name: Upload coverage to Codecov
         if: matrix.python-version == 3.9 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'

.gitignore

@@ -83,7 +83,7 @@ coverage.xml
 # Datafiles
 # Do not exclude data directories
 !pvlib/data/**
-!pvlib/tests/data/**
+!tests/data/**
 
 # vi
 *.swp

codecov.yml

@@ -14,14 +14,15 @@ flags:
   core:
     paths:
       - pvlib/
+      - tests/
       - '!pvlib/iotools/'
-      - '!pvlib/tests/iotools/'
+      - '!tests/iotools/'
     carryforward: false
 
   remote-data:
     paths:
       - pvlib/iotools/
-      - pvlib/tests/iotools
+      - tests/iotools
     carryforward: true  # if not run, use coverage from previous commit
 
 
@@ -47,15 +48,15 @@ coverage:
       tests-core:
         target: 95%
         paths:
-          - 'pvlib/tests/.*'
-          - '!pvlib/tests/iotools/.*'
+          - 'tests/.*'
+          - '!tests/iotools/.*'
         flags:
           - core
 
       tests-remote-data:
         target: 95%
         paths:
-          - 'pvlib/tests/iotools/.*'
+          - 'tests/iotools/.*'
         flags:
           - remote-data
 

docs/sphinx/source/contributing/testing.rst

@@ -92,7 +92,6 @@ include-package-data = false  # true by default
 
 [tool.setuptools.packages.find]
 include = ["pvlib*"]
-exclude = ["pvlib.tests*"]
 
 [tool.setuptools.package-data]
 pvlib = ["data/*"]
@@ -101,7 +100,7 @@ pvlib = ["data/*"]
 
 [tool.pytest]
 junit_family = "xunit2"
-testpaths = "pvlib/tests"
+testpaths = "tests"
 # warning messages to suppress from pytest output.  useful in cases
 # where a dependency hasn't addressed a deprecation yet, and there's
 # nothing we can do to fix it ourselves.

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

@@ -5,7 +5,7 @@
 import numpy as np
 import pandas as pd
 from pvlib.bifacial import infinite_sheds
-from ..conftest import assert_series_equal
+from tests.conftest import assert_series_equal
 
 import pytest
 

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

@@ -1,7 +1,7 @@
 import pandas as pd
 from datetime import datetime
 from pvlib.bifacial.pvfactors import pvfactors_timeseries
-from ..conftest import requires_pvfactors, assert_series_equal
+from tests.conftest import requires_pvfactors, assert_series_equal
 import pytest
 
 

pyproject.toml

@@ -70,7 +70,7 @@ def assert_frame_equal(left, right, **kwargs):
 
 # commonly used directories in the tests
 TEST_DIR = Path(__file__).parent
-PVLIB_DATA_DIR = TEST_DIR.parent / 'data'
+PVLIB_DATA_DIR = Path(pvlib.__path__[0]) / 'data'
 TESTS_DATA_DIR = TEST_DIR / 'data'
 
 

pvlib/tests/__init__.py renamed to tests/__init__.py

@@ -9,7 +9,7 @@
     get_acis_prism, get_acis_nrcc, get_acis_mpe,
     get_acis_station_data, get_acis_available_stations
 )
-from ..conftest import RERUNS, RERUNS_DELAY, assert_frame_equal
+from tests.conftest import RERUNS, RERUNS_DELAY, assert_frame_equal
 from requests import HTTPError
 
 

pvlib/tests/bifacial/__init__.py renamed to tests/bifacial/__init__.py

@@ -7,7 +7,7 @@
 import os
 import tempfile
 from pvlib.iotools import read_bsrn, get_bsrn
-from ..conftest import (
+from tests.conftest import (
     TESTS_DATA_DIR,
     RERUNS,
     RERUNS_DELAY,

pvlib/tests/bifacial/test_infinite_sheds.py renamed to tests/bifacial/test_infinite_sheds.py

@@ -3,7 +3,11 @@
 from numpy import dtype, nan
 import pytest
 from pvlib.iotools import crn
-from ..conftest import TESTS_DATA_DIR, assert_frame_equal, assert_index_equal
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    assert_frame_equal,
+    assert_index_equal,
+)
 
 
 @pytest.fixture

pvlib/tests/bifacial/test_losses_models.py renamed to tests/bifacial/test_losses_models.py

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

pvlib/tests/bifacial/test_pvfactors.py renamed to tests/bifacial/test_pvfactors.py

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

pvlib/tests/bifacial/test_utils.py renamed to tests/bifacial/test_utils.py

@@ -3,7 +3,8 @@
 """
 
 from pvlib.iotools import read_panond
-from pvlib.tests.conftest import TESTS_DATA_DIR
+
+from tests.conftest import TESTS_DATA_DIR
 
 PAN_FILE = TESTS_DATA_DIR / 'ET-M772BH550GL.PAN'
 OND_FILE = TESTS_DATA_DIR / 'CPS SCH275KTL-DO-US-800-250kW_275kVA_1.OND'

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

@@ -2,12 +2,17 @@
 test iotools for PSM3
 """
 
-import os
 from pvlib.iotools import psm3
-from ..conftest import TESTS_DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    RERUNS,
+    RERUNS_DELAY,
+    assert_index_equal,
+)
 import numpy as np
 import pandas as pd
 import pytest
+import os
 from requests import HTTPError
 from io import StringIO
 import warnings

pvlib/tests/data/BIRD_08_16_2012.csv renamed to tests/data/BIRD_08_16_2012.csv

@@ -10,16 +10,21 @@
 from pvlib.iotools import get_pvgis_tmy, read_pvgis_tmy
 from pvlib.iotools import get_pvgis_hourly, read_pvgis_hourly
 from pvlib.iotools import get_pvgis_horizon
-from ..conftest import (DATA_DIR, RERUNS, RERUNS_DELAY, assert_frame_equal,
-                        assert_series_equal)
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    RERUNS,
+    RERUNS_DELAY,
+    assert_frame_equal,
+    assert_series_equal,
+)
 
 
 # PVGIS Hourly tests
 # The test files are actual files from PVGIS where the data section have been
 # reduced to only a few lines
-testfile_radiation_csv = DATA_DIR / \
+testfile_radiation_csv = TESTS_DATA_DIR / \
     'pvgis_hourly_Timeseries_45.000_8.000_SA_30deg_0deg_2016_2016.csv'
-testfile_pv_json = DATA_DIR / \
+testfile_pv_json = TESTS_DATA_DIR / \
     'pvgis_hourly_Timeseries_45.000_8.000_SA2_10kWp_CIS_5_2a_2013_2014.json'
 
 index_radiation_csv = \
@@ -304,12 +309,14 @@ def test_read_pvgis_hourly_empty_file():
 # PVGIS TMY tests
 @pytest.fixture
 def expected():
-    return pd.read_csv(DATA_DIR / 'pvgis_tmy_test.csv', index_col='time(UTC)')
+    return pd.read_csv(
+        TESTS_DATA_DIR / "pvgis_tmy_test.csv", index_col="time(UTC)"
+    )
 
 
 @pytest.fixture
 def userhorizon_expected():
-    return pd.read_json(DATA_DIR / 'tmy_45.000_8.000_userhorizon.json')
+    return pd.read_json(TESTS_DATA_DIR / 'tmy_45.000_8.000_userhorizon.json')
 
 
 @pytest.fixture
@@ -348,7 +355,7 @@ def epw_meta():
 
 @pytest.fixture
 def meta_expected():
-    with (DATA_DIR / 'pvgis_tmy_meta.json').open() as f:
+    with (TESTS_DATA_DIR / 'pvgis_tmy_meta.json').open() as f:
         return json.load(f)
 
 
@@ -550,7 +557,7 @@ def test_get_pvgis_map_variables(pvgis_tmy_mapped_columns):
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_read_pvgis_horizon():
     pvgis_data, _ = get_pvgis_horizon(35.171051, -106.465158)
-    horizon_data = pd.read_csv(DATA_DIR / 'test_read_pvgis_horizon.csv',
+    horizon_data = pd.read_csv(TESTS_DATA_DIR / 'test_read_pvgis_horizon.csv',
                                index_col=0)
     horizon_data = horizon_data['horizon_elevation']
     assert_series_equal(pvgis_data, horizon_data)
@@ -564,14 +571,14 @@ def test_read_pvgis_horizon_invalid_coords():
 
 
 def test_read_pvgis_tmy_map_variables(pvgis_tmy_mapped_columns):
-    fn = DATA_DIR / 'tmy_45.000_8.000_2005_2023.json'
+    fn = TESTS_DATA_DIR / 'tmy_45.000_8.000_2005_2023.json'
     actual, _, _, _ = read_pvgis_tmy(fn, map_variables=True)
     assert all(c in pvgis_tmy_mapped_columns for c in actual.columns)
 
 
 def test_read_pvgis_tmy_json(expected, month_year_expected, inputs_expected,
                              meta_expected):
-    fn = DATA_DIR / 'tmy_45.000_8.000_2005_2023.json'
+    fn = TESTS_DATA_DIR / 'tmy_45.000_8.000_2005_2023.json'
     # infer outputformat from file extensions
     pvgis_data = read_pvgis_tmy(fn, map_variables=False)
     _compare_pvgis_tmy_json(expected, month_year_expected, inputs_expected,
@@ -588,7 +595,7 @@ def test_read_pvgis_tmy_json(expected, month_year_expected, inputs_expected,
 
 
 def test_read_pvgis_tmy_epw(expected, epw_meta):
-    fn = DATA_DIR / 'tmy_45.000_8.000_2005_2023.epw'
+    fn = TESTS_DATA_DIR / 'tmy_45.000_8.000_2005_2023.epw'
     # infer outputformat from file extensions
     pvgis_data = read_pvgis_tmy(fn, map_variables=False)
     _compare_pvgis_tmy_epw(expected, epw_meta, pvgis_data)
@@ -603,7 +610,7 @@ def test_read_pvgis_tmy_epw(expected, epw_meta):
 
 def test_read_pvgis_tmy_csv(expected, month_year_expected, inputs_expected,
                             meta_expected, csv_meta):
-    fn = DATA_DIR / 'tmy_45.000_8.000_2005_2023.csv'
+    fn = TESTS_DATA_DIR / 'tmy_45.000_8.000_2005_2023.csv'
     # infer outputformat from file extensions
     pvgis_data = read_pvgis_tmy(fn, map_variables=False)
     _compare_pvgis_tmy_csv(expected, month_year_expected, inputs_expected,
@@ -620,7 +627,7 @@ def test_read_pvgis_tmy_csv(expected, month_year_expected, inputs_expected,
 
 
 def test_read_pvgis_tmy_basic(expected, meta_expected):
-    fn = DATA_DIR / 'tmy_45.000_8.000_2005_2023.txt'
+    fn = TESTS_DATA_DIR / 'tmy_45.000_8.000_2005_2023.txt'
     # XXX: can't infer outputformat from file extensions for basic
     with pytest.raises(ValueError, match="pvgis format 'txt' was unknown"):
         read_pvgis_tmy(fn, map_variables=False)

pvlib/tests/data/BIRD_08_16_2012_patm.csv renamed to tests/data/BIRD_08_16_2012_patm.csv

@@ -8,7 +8,7 @@
 import pytest
 
 from pvlib.iotools import sodapro
-from ..conftest import TESTS_DATA_DIR, assert_frame_equal
+from tests.conftest import TESTS_DATA_DIR, assert_frame_equal
 
 
 testfile_mcclear_verbose = TESTS_DATA_DIR / 'cams_mcclear_1min_verbose.csv'

pvlib/tests/data/Burlington, United States SolarAnywhere Time Series 2021 Lat_44_465 Lon_-73_205 TMY3 format.csv renamed to tests/data/Burlington, United States SolarAnywhere Time Series 2021 Lat_44_465 Lon_-73_205 TMY3 format.csv

@@ -2,8 +2,12 @@
 import pytest
 import pvlib
 import os
-from ..conftest import (TESTS_DATA_DIR, RERUNS, RERUNS_DELAY,
-                        requires_solaranywhere_credentials)
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    RERUNS,
+    RERUNS_DELAY,
+    requires_solaranywhere_credentials,
+)
 
 # High spatial resolution and 5-min data, true dynamics enabled
 TESTFILE_HIGH_RESOLUTION = TESTS_DATA_DIR / 'Burlington, United States SolarAnywhere Time Series 20210101 to 20210103 Lat_44_4675 Lon_-73_2075 SA format.csv'  # noqa: E501

pvlib/tests/data/Burlington, United States SolarAnywhere Time Series 20210101 to 20210103 Lat_44_4675 Lon_-73_2075 SA format.csv renamed to tests/data/Burlington, United States SolarAnywhere Time Series 20210101 to 20210103 Lat_44_4675 Lon_-73_2075 SA format.csv

@@ -2,8 +2,12 @@
 import pytest
 import pvlib
 import requests
-from ..conftest import (RERUNS, RERUNS_DELAY, assert_frame_equal,
-                        assert_index_equal)
+from tests.conftest import (
+    RERUNS,
+    RERUNS_DELAY,
+    assert_frame_equal,
+    assert_index_equal,
+)
 
 
 @pytest.fixture