pvlib · kandersolar · Mar 5, 2025 · Oct 22, 2024 · Oct 22, 2024 · Oct 22, 2024
diff --git a/.github/workflows/pytest-remote-data.yml b/.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 == ''

diff --git a/.github/workflows/pytest.yml b/.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 tests --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'

diff --git a/.gitignore b/.gitignore
@@ -81,9 +81,9 @@ coverage.xml
 
 
 # Datafiles
-*.csv
-# Ignore some csv 
-!pvlib/data/*.csv 
+# Do not exclude data directories
+!pvlib/data/**
+!tests/data/**
 
 # vi
 *.swp

diff --git a/codecov.yml b/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
 

diff --git a/docs/sphinx/source/contributing/testing.rst b/docs/sphinx/source/contributing/testing.rst
@@ -11,7 +11,7 @@ Overview
 Developers **must** include comprehensive tests for any additions or
 modifications to pvlib. New unit test code should be placed in the
 corresponding test module in the
-`pvlib/tests <https://github.com/pvlib/pvlib-python/tree/main/pvlib/tests>`_
+`tests <https://github.com/pvlib/pvlib-python/tree/main/tests>`_
 directory.
 
 A pull request will automatically run the tests for you on a variety of
@@ -30,11 +30,11 @@ pvlib directory::
 
 or, for a single module::
 
-    pytest pvlib/tests/test_clearsky.py
+    pytest tests/test_clearsky.py
 
 or, for a single test::
 
-    pytest pvlib/tests/test_clearsky.py::test_ineichen_nans
+    pytest tests/test_clearsky.py::test_ineichen_nans
 
 We suggest using pytest's ``--pdb`` flag to debug test failures rather
 than using ``print`` or ``logging`` calls. For example::

diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst
@@ -16,6 +16,10 @@ Enhancements
   ground irradiance when the sun was below the horizon. (:issue:`2245`, :pull:`2359`)
 * Fix a bug where :py:func:`pvlib.transformer.simple_efficiency` could only be imported
   using the `from pvlib.transformer` syntax (:pull:`2388`)
+* Reduced space requirements by excluding tests and test files from wheel.
+  Zipped wheel is now 66% of the previous size, and installed size is 50% of
+  the previous size.
+  (:issue:`2271`, :pull:`2277`)
 * Correct keys for First Solar modules in `~pvlib.spectrum.spectral_factor_pvspec` (:issue:`2398`, :pull:`2400`)
 
 Documentation
@@ -27,6 +31,8 @@ Documentation
 
 Testing
 ~~~~~~~
+* Moved tests folder to `/tests` and data exclusively used for testing to `/tests/data`.
+  (:issue:`2271`, :pull:`2277`)
 * Added Python 3.13 to test suite. (:pull:`2258`)
 
 
@@ -51,3 +57,4 @@ Contributors
 * Manoj K S (:ghuser:`manojks1999`)
 * Kurt Rhee (:ghuser:`kurt-rhee`)
 * Ayush jariyal (:ghuser:`ayushjariyal`)
+* Echedey Luis (:ghuser:`echedey-ls`)
diff --git a/docs/sphinx/source/whatsnew/v0.7.2.rst b/docs/sphinx/source/whatsnew/v0.7.2.rst
@@ -46,7 +46,7 @@ Bug fixes
 * Fix :py:func:`~pvlib.iotools.read_tmy3` parsing when February contains
   a leap year. (:pull:`866`)
 * Implement NREL Developer Network API key for consistent success with API
-  calls in :py:mod:`pvlib.tests.iotools.test_psm3`. (:pull:`873`)
+  calls in :py:mod:`!pvlib.tests.iotools.test_psm3`. (:pull:`873`)
 * Fix issue with :py:class:`pvlib.location.Location` creation when
   passing ``tz=datetime.timezone.utc``. (:pull:`879`)
 * Fix documentation homepage title to "pvlib python" based on first heading on

diff --git a/pyproject.toml b/pyproject.toml
@@ -85,14 +85,22 @@ all = ["pvlib[test,optional,doc]"]
 Documentation = "https://pvlib-python.readthedocs.io/"
 "Source Code" = "https://github.com/pvlib/pvlib-python"
 
+[tool.setuptools]
+# do not include all non-python files in the bdist by default, but select them manually
+# https://setuptools.pypa.io/en/latest/userguide/datafiles.html#interplay-between-these-keywords (2024-10-22)
+include-package-data = false  # true by default
+
 [tool.setuptools.packages.find]
 include = ["pvlib*"]
 
+[tool.setuptools.package-data]
+pvlib = ["data/*"]
+
 [tool.setuptools_scm]
 
 [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.

diff --git a/pvlib/tests/__init__.py → tests/__init__.py b/pvlib/tests/__init__.py → tests/__init__.py
diff --git a/pvlib/tests/bifacial/__init__.py → tests/bifacial/__init__.py b/pvlib/tests/bifacial/__init__.py → tests/bifacial/__init__.py
diff --git a/pvlib/tests/bifacial/test_infinite_sheds.py → tests/bifacial/test_infinite_sheds.py b/pvlib/tests/bifacial/test_infinite_sheds.py → tests/bifacial/test_infinite_sheds.py
@@ -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
 

diff --git a/pvlib/tests/bifacial/test_losses_models.py → tests/bifacial/test_losses_models.py b/pvlib/tests/bifacial/test_losses_models.py → tests/bifacial/test_losses_models.py
diff --git a/pvlib/tests/bifacial/test_pvfactors.py → tests/bifacial/test_pvfactors.py b/pvlib/tests/bifacial/test_pvfactors.py → tests/bifacial/test_pvfactors.py
@@ -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
 
 

diff --git a/pvlib/tests/bifacial/test_utils.py → tests/bifacial/test_utils.py b/pvlib/tests/bifacial/test_utils.py → tests/bifacial/test_utils.py
diff --git a/pvlib/tests/conftest.py → tests/conftest.py b/pvlib/tests/conftest.py → tests/conftest.py
@@ -70,7 +70,8 @@ def assert_frame_equal(left, right, **kwargs):
 
 # commonly used directories in the tests
 TEST_DIR = Path(__file__).parent
-DATA_DIR = TEST_DIR.parent / 'data'
+PVLIB_DATA_DIR = Path(pvlib.__path__[0]) / 'data'
+TESTS_DATA_DIR = TEST_DIR / 'data'
 
 
 # pytest-rerunfailures variables

diff --git a/pvlib/data/BIRD_08_16_2012.csv → tests/data/BIRD_08_16_2012.csv b/pvlib/data/BIRD_08_16_2012.csv → tests/data/BIRD_08_16_2012.csv
diff --git a/pvlib/data/BIRD_08_16_2012_patm.csv → tests/data/BIRD_08_16_2012_patm.csv b/pvlib/data/BIRD_08_16_2012_patm.csv → tests/data/BIRD_08_16_2012_patm.csv
diff --git a/...21 Lat_44_465 Lon_-73_205 TMY3 format.csv → ...21 Lat_44_465 Lon_-73_205 TMY3 format.csv b/...21 Lat_44_465 Lon_-73_205 TMY3 format.csv → ...21 Lat_44_465 Lon_-73_205 TMY3 format.csv
diff --git a/...03 Lat_44_4675 Lon_-73_2075 SA format.csv → ...03 Lat_44_4675 Lon_-73_2075 SA format.csv b/...03 Lat_44_4675 Lon_-73_2075 SA format.csv → ...03 Lat_44_4675 Lon_-73_2075 SA format.csv
diff --git a/...Year Lat_44_465 Lon_-73_205 SA format.csv → ...Year Lat_44_465 Lon_-73_205 SA format.csv b/...Year Lat_44_465 Lon_-73_205 SA format.csv → ...Year Lat_44_465 Lon_-73_205 SA format.csv
diff --git a/...PS SCH275KTL-DO-US-800-250kW_275kVA_1.OND → ...PS SCH275KTL-DO-US-800-250kW_275kVA_1.OND b/...PS SCH275KTL-DO-US-800-250kW_275kVA_1.OND → ...PS SCH275KTL-DO-US-800-250kW_275kVA_1.OND
diff --git a/.../data/CRNS0101-05-2019-AZ_Tucson_11_W.txt → .../data/CRNS0101-05-2019-AZ_Tucson_11_W.txt b/.../data/CRNS0101-05-2019-AZ_Tucson_11_W.txt → .../data/CRNS0101-05-2019-AZ_Tucson_11_W.txt
diff --git a/pvlib/data/CRN_with_problems.txt → tests/data/CRN_with_problems.txt b/pvlib/data/CRN_with_problems.txt → tests/data/CRN_with_problems.txt
diff --git a/pvlib/data/ET-M772BH550GL.PAN → tests/data/ET-M772BH550GL.PAN b/pvlib/data/ET-M772BH550GL.PAN → tests/data/ET-M772BH550GL.PAN
diff --git a/pvlib/data/NLD_Amsterdam062400_IWEC.epw → tests/data/NLD_Amsterdam062400_IWEC.epw b/pvlib/data/NLD_Amsterdam062400_IWEC.epw → tests/data/NLD_Amsterdam062400_IWEC.epw
diff --git a/pvlib/data/PVsyst_demo.csv → tests/data/PVsyst_demo.csv b/pvlib/data/PVsyst_demo.csv → tests/data/PVsyst_demo.csv
diff --git a/pvlib/data/PVsyst_demo_model.csv → tests/data/PVsyst_demo_model.csv b/pvlib/data/PVsyst_demo_model.csv → tests/data/PVsyst_demo_model.csv
diff --git a/pvlib/data/SRML-day-EUPO1801.txt → tests/data/SRML-day-EUPO1801.txt b/pvlib/data/SRML-day-EUPO1801.txt → tests/data/SRML-day-EUPO1801.txt
diff --git a/pvlib/data/abq19056.dat → tests/data/abq19056.dat b/pvlib/data/abq19056.dat → tests/data/abq19056.dat
diff --git a/pvlib/data/bishop88_numerical_precision.csv → tests/data/bishop88_numerical_precision.csv b/pvlib/data/bishop88_numerical_precision.csv → tests/data/bishop88_numerical_precision.csv
diff --git a/pvlib/data/bsrn-lr0100-pay0616.dat → tests/data/bsrn-lr0100-pay0616.dat b/pvlib/data/bsrn-lr0100-pay0616.dat → tests/data/bsrn-lr0100-pay0616.dat
diff --git a/pvlib/data/bsrn-pay0616.dat.gz → tests/data/bsrn-pay0616.dat.gz b/pvlib/data/bsrn-pay0616.dat.gz → tests/data/bsrn-pay0616.dat.gz
diff --git a/pvlib/data/cams_mcclear_1min_verbose.csv → tests/data/cams_mcclear_1min_verbose.csv b/pvlib/data/cams_mcclear_1min_verbose.csv → tests/data/cams_mcclear_1min_verbose.csv
diff --git a/pvlib/data/cams_mcclear_monthly.csv → tests/data/cams_mcclear_monthly.csv b/pvlib/data/cams_mcclear_monthly.csv → tests/data/cams_mcclear_monthly.csv
diff --git a/pvlib/data/cams_radiation_1min_verbose.csv → tests/data/cams_radiation_1min_verbose.csv b/pvlib/data/cams_radiation_1min_verbose.csv → tests/data/cams_radiation_1min_verbose.csv
diff --git a/pvlib/data/cams_radiation_monthly.csv → tests/data/cams_radiation_monthly.csv b/pvlib/data/cams_radiation_monthly.csv → tests/data/cams_radiation_monthly.csv
diff --git a/pvlib/data/detect_clearsky_data.csv → tests/data/detect_clearsky_data.csv b/pvlib/data/detect_clearsky_data.csv → tests/data/detect_clearsky_data.csv
diff --git a/...b/data/detect_clearsky_threshold_data.csv → ...s/data/detect_clearsky_threshold_data.csv b/...b/data/detect_clearsky_threshold_data.csv → ...s/data/detect_clearsky_threshold_data.csv
diff --git a/...b/data/greensboro_kimber_soil_manwash.dat → ...s/data/greensboro_kimber_soil_manwash.dat b/...b/data/greensboro_kimber_soil_manwash.dat → ...s/data/greensboro_kimber_soil_manwash.dat
diff --git a/pvlib/data/greensboro_kimber_soil_nowash.dat → tests/data/greensboro_kimber_soil_nowash.dat b/pvlib/data/greensboro_kimber_soil_nowash.dat → tests/data/greensboro_kimber_soil_nowash.dat
diff --git a/pvlib/data/inverter_fit_snl_meas.csv → tests/data/inverter_fit_snl_meas.csv b/pvlib/data/inverter_fit_snl_meas.csv → tests/data/inverter_fit_snl_meas.csv
diff --git a/pvlib/data/inverter_fit_snl_sim.csv → tests/data/inverter_fit_snl_sim.csv b/pvlib/data/inverter_fit_snl_sim.csv → tests/data/inverter_fit_snl_sim.csv
diff --git a/pvlib/data/ivtools_numdiff.csv → tests/data/ivtools_numdiff.csv b/pvlib/data/ivtools_numdiff.csv → tests/data/ivtools_numdiff.csv
diff --git a/pvlib/data/midc_20181014.txt → tests/data/midc_20181014.txt b/pvlib/data/midc_20181014.txt → tests/data/midc_20181014.txt
diff --git a/pvlib/data/midc_raw_20181018.txt → tests/data/midc_raw_20181018.txt b/pvlib/data/midc_raw_20181018.txt → tests/data/midc_raw_20181018.txt
diff --git a/...b/data/midc_raw_short_header_20191115.txt → ...s/data/midc_raw_short_header_20191115.txt b/...b/data/midc_raw_short_header_20191115.txt → ...s/data/midc_raw_short_header_20191115.txt
diff --git a/pvlib/data/msn19056.dat → tests/data/msn19056.dat b/pvlib/data/msn19056.dat → tests/data/msn19056.dat
diff --git a/pvlib/data/precise_iv_curves1.json → tests/data/precise_iv_curves1.json b/pvlib/data/precise_iv_curves1.json → tests/data/precise_iv_curves1.json
diff --git a/pvlib/data/precise_iv_curves2.json → tests/data/precise_iv_curves2.json b/pvlib/data/precise_iv_curves2.json → tests/data/precise_iv_curves2.json
diff --git a/...ata/precise_iv_curves_parameter_sets1.csv → ...ata/precise_iv_curves_parameter_sets1.csv b/...ata/precise_iv_curves_parameter_sets1.csv → ...ata/precise_iv_curves_parameter_sets1.csv
diff --git a/...ata/precise_iv_curves_parameter_sets2.csv → ...ata/precise_iv_curves_parameter_sets2.csv b/...ata/precise_iv_curves_parameter_sets2.csv → ...ata/precise_iv_curves_parameter_sets2.csv
diff --git a/...0_8.000_SA2_10kWp_CIS_5_2a_2013_2014.json → ...0_8.000_SA2_10kWp_CIS_5_2a_2013_2014.json b/...0_8.000_SA2_10kWp_CIS_5_2a_2013_2014.json → ...0_8.000_SA2_10kWp_CIS_5_2a_2013_2014.json
diff --git a/..._45.000_8.000_SA_30deg_0deg_2016_2016.csv → ..._45.000_8.000_SA_30deg_0deg_2016_2016.csv b/..._45.000_8.000_SA_30deg_0deg_2016_2016.csv → ..._45.000_8.000_SA_30deg_0deg_2016_2016.csv
diff --git a/pvlib/data/pvgis_tmy_meta.json → tests/data/pvgis_tmy_meta.json b/pvlib/data/pvgis_tmy_meta.json → tests/data/pvgis_tmy_meta.json
diff --git a/pvlib/data/pvgis_tmy_test.csv → tests/data/pvgis_tmy_test.csv b/pvlib/data/pvgis_tmy_test.csv → tests/data/pvgis_tmy_test.csv
diff --git a/pvlib/data/pvwatts_8760_rackmount.csv → tests/data/pvwatts_8760_rackmount.csv b/pvlib/data/pvwatts_8760_rackmount.csv → tests/data/pvwatts_8760_rackmount.csv
diff --git a/pvlib/data/pvwatts_8760_roofmount.csv → tests/data/pvwatts_8760_roofmount.csv b/pvlib/data/pvwatts_8760_roofmount.csv → tests/data/pvwatts_8760_roofmount.csv
diff --git a/pvlib/data/singleaxis_tracker_wslope.csv → tests/data/singleaxis_tracker_wslope.csv b/pvlib/data/singleaxis_tracker_wslope.csv → tests/data/singleaxis_tracker_wslope.csv
diff --git a/pvlib/data/spectrl2_example_spectra.csv → tests/data/spectrl2_example_spectra.csv b/pvlib/data/spectrl2_example_spectra.csv → tests/data/spectrl2_example_spectra.csv
diff --git a/pvlib/data/surfrad-slv16001.dat → tests/data/surfrad-slv16001.dat b/pvlib/data/surfrad-slv16001.dat → tests/data/surfrad-slv16001.dat
diff --git a/pvlib/data/test_psm3_2017.csv → tests/data/test_psm3_2017.csv b/pvlib/data/test_psm3_2017.csv → tests/data/test_psm3_2017.csv
diff --git a/pvlib/data/test_psm3_2019_5min.csv → tests/data/test_psm3_2019_5min.csv b/pvlib/data/test_psm3_2019_5min.csv → tests/data/test_psm3_2019_5min.csv
diff --git a/pvlib/data/test_psm3_tmy-2017.csv → tests/data/test_psm3_tmy-2017.csv b/pvlib/data/test_psm3_tmy-2017.csv → tests/data/test_psm3_tmy-2017.csv
diff --git a/pvlib/data/test_read_psm3.csv → tests/data/test_read_psm3.csv b/pvlib/data/test_read_psm3.csv → tests/data/test_read_psm3.csv
diff --git a/pvlib/data/test_read_pvgis_horizon.csv → tests/data/test_read_pvgis_horizon.csv b/pvlib/data/test_read_pvgis_horizon.csv → tests/data/test_read_pvgis_horizon.csv
diff --git a/pvlib/data/tmy_45.000_8.000_2005_2023.csv → tests/data/tmy_45.000_8.000_2005_2023.csv b/pvlib/data/tmy_45.000_8.000_2005_2023.csv → tests/data/tmy_45.000_8.000_2005_2023.csv
diff --git a/pvlib/data/tmy_45.000_8.000_2005_2023.epw → tests/data/tmy_45.000_8.000_2005_2023.epw b/pvlib/data/tmy_45.000_8.000_2005_2023.epw → tests/data/tmy_45.000_8.000_2005_2023.epw
diff --git a/pvlib/data/tmy_45.000_8.000_2005_2023.json → tests/data/tmy_45.000_8.000_2005_2023.json b/pvlib/data/tmy_45.000_8.000_2005_2023.json → tests/data/tmy_45.000_8.000_2005_2023.json
diff --git a/pvlib/data/tmy_45.000_8.000_2005_2023.txt → tests/data/tmy_45.000_8.000_2005_2023.txt b/pvlib/data/tmy_45.000_8.000_2005_2023.txt → tests/data/tmy_45.000_8.000_2005_2023.txt
diff --git a/pvlib/data/tmy_45.000_8.000_userhorizon.json → tests/data/tmy_45.000_8.000_userhorizon.json b/pvlib/data/tmy_45.000_8.000_userhorizon.json → tests/data/tmy_45.000_8.000_userhorizon.json
diff --git a/pvlib/tests/iotools/__init__.py → tests/iotools/__init__.py b/pvlib/tests/iotools/__init__.py → tests/iotools/__init__.py
diff --git a/pvlib/tests/iotools/test_acis.py → tests/iotools/test_acis.py b/pvlib/tests/iotools/test_acis.py → tests/iotools/test_acis.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
 
 

diff --git a/pvlib/tests/iotools/test_bsrn.py → tests/iotools/test_bsrn.py b/pvlib/tests/iotools/test_bsrn.py → tests/iotools/test_bsrn.py
@@ -7,8 +7,13 @@
 import os
 import tempfile
 from pvlib.iotools import read_bsrn, get_bsrn
-from ..conftest import (DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal,
-                        requires_bsrn_credentials)
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    RERUNS,
+    RERUNS_DELAY,
+    assert_index_equal,
+    requires_bsrn_credentials,
+)
 
 
 @pytest.fixture(scope="module")
@@ -33,7 +38,7 @@ def expected_index():
     ('bsrn-lr0100-pay0616.dat'),
 ])
 def test_read_bsrn(testfile, expected_index):
-    data, metadata = read_bsrn(DATA_DIR / testfile)
+    data, metadata = read_bsrn(TESTS_DATA_DIR / testfile)
     assert_index_equal(expected_index, data.index)
     assert 'ghi' in data.columns
     assert 'dni_std' in data.columns
@@ -45,7 +50,7 @@ def test_read_bsrn(testfile, expected_index):
 def test_read_bsrn_logical_records(expected_index):
     # Test if logical records 0300 and 0500 are correct parsed
     # and that 0100 is not passed when not specified
-    data, metadata = read_bsrn(DATA_DIR / 'bsrn-pay0616.dat.gz',
+    data, metadata = read_bsrn(TESTS_DATA_DIR / 'bsrn-pay0616.dat.gz',
                                logical_records=['0300', '0500'])
     assert_index_equal(expected_index, data.index)
     assert 'lwu' in data.columns
@@ -57,13 +62,13 @@ def test_read_bsrn_logical_records(expected_index):
 def test_read_bsrn_bad_logical_record():
     # Test if ValueError is raised if an unsupported logical record is passed
     with pytest.raises(ValueError, match='not in'):
-        read_bsrn(DATA_DIR / 'bsrn-lr0100-pay0616.dat',
+        read_bsrn(TESTS_DATA_DIR / 'bsrn-lr0100-pay0616.dat',
                   logical_records=['dummy'])
 
 
 def test_read_bsrn_logical_records_not_found():
     # Test if an empty dataframe is returned if specified LRs are not present
-    data, metadata = read_bsrn(DATA_DIR / 'bsrn-lr0100-pay0616.dat',
+    data, metadata = read_bsrn(TESTS_DATA_DIR / 'bsrn-lr0100-pay0616.dat',
                                logical_records=['0300', '0500'])
     assert data.empty  # assert that the dataframe is empty
     assert 'uva_global' in data.columns

diff --git a/pvlib/tests/iotools/test_crn.py → tests/iotools/test_crn.py b/pvlib/tests/iotools/test_crn.py → tests/iotools/test_crn.py
@@ -3,7 +3,11 @@
 from numpy import dtype, nan
 import pytest
 from pvlib.iotools import crn
-from ..conftest import DATA_DIR, assert_frame_equal, assert_index_equal
+from tests.conftest import (
+    TESTS_DATA_DIR,
+    assert_frame_equal,
+    assert_index_equal,
+)
 
 
 @pytest.fixture
@@ -41,12 +45,12 @@ def dtypes():
 
 @pytest.fixture
 def testfile():
-    return DATA_DIR / 'CRNS0101-05-2019-AZ_Tucson_11_W.txt'
+    return TESTS_DATA_DIR / 'CRNS0101-05-2019-AZ_Tucson_11_W.txt'
 
 
 @pytest.fixture
 def testfile_problems():
-    return DATA_DIR / 'CRN_with_problems.txt'
+    return TESTS_DATA_DIR / 'CRN_with_problems.txt'
 
 
 def test_read_crn(testfile, columns_mapped, dtypes):

diff --git a/pvlib/tests/iotools/test_epw.py → tests/iotools/test_epw.py b/pvlib/tests/iotools/test_epw.py → tests/iotools/test_epw.py
@@ -1,9 +1,9 @@
 import pytest
 
 from pvlib.iotools import epw
-from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from tests.conftest import TESTS_DATA_DIR, RERUNS, RERUNS_DELAY
 
-epw_testfile = DATA_DIR / 'NLD_Amsterdam062400_IWEC.epw'
+epw_testfile = TESTS_DATA_DIR / 'NLD_Amsterdam062400_IWEC.epw'
 
 
 def test_read_epw():

diff --git a/pvlib/tests/iotools/test_midc.py → tests/iotools/test_midc.py b/pvlib/tests/iotools/test_midc.py → tests/iotools/test_midc.py
@@ -3,7 +3,7 @@
 import pytz
 
 from pvlib.iotools import midc
-from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from tests.conftest import TESTS_DATA_DIR, RERUNS, RERUNS_DELAY
 
 
 @pytest.fixture
@@ -17,10 +17,10 @@ def test_mapping():
     }
 
 
-MIDC_TESTFILE = DATA_DIR / 'midc_20181014.txt'
-MIDC_RAW_TESTFILE = DATA_DIR / 'midc_raw_20181018.txt'
+MIDC_TESTFILE = TESTS_DATA_DIR / 'midc_20181014.txt'
+MIDC_RAW_TESTFILE = TESTS_DATA_DIR / 'midc_raw_20181018.txt'
 MIDC_RAW_SHORT_HEADER_TESTFILE = (
-    DATA_DIR / 'midc_raw_short_header_20191115.txt')
+    TESTS_DATA_DIR / 'midc_raw_short_header_20191115.txt')
 
 # TODO: not used, remove?
 # midc_network_testfile = ('https://midcdmz.nrel.gov/apps/data_api.pl'

diff --git a/pvlib/tests/iotools/test_panond.py → tests/iotools/test_panond.py b/pvlib/tests/iotools/test_panond.py → tests/iotools/test_panond.py
@@ -3,10 +3,11 @@
 """
 
 from pvlib.iotools import read_panond
-from pvlib.tests.conftest import DATA_DIR
 
-PAN_FILE = DATA_DIR / 'ET-M772BH550GL.PAN'
-OND_FILE = DATA_DIR / 'CPS SCH275KTL-DO-US-800-250kW_275kVA_1.OND'
+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'
 
 
 def test_read_panond():

diff --git a/pvlib/tests/iotools/test_psm3.py → tests/iotools/test_psm3.py b/pvlib/tests/iotools/test_psm3.py → tests/iotools/test_psm3.py
@@ -2,21 +2,25 @@
 test iotools for PSM3
 """
 
-import os
 from pvlib.iotools import psm3
-from ..conftest import 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
-from pvlib._deprecation import pvlibDeprecationWarning
 
-TMY_TEST_DATA = DATA_DIR / 'test_psm3_tmy-2017.csv'
-YEAR_TEST_DATA = DATA_DIR / 'test_psm3_2017.csv'
-YEAR_TEST_DATA_5MIN = DATA_DIR / 'test_psm3_2019_5min.csv'
-MANUAL_TEST_DATA = DATA_DIR / 'test_read_psm3.csv'
+TMY_TEST_DATA = TESTS_DATA_DIR / 'test_psm3_tmy-2017.csv'
+YEAR_TEST_DATA = TESTS_DATA_DIR / 'test_psm3_2017.csv'
+YEAR_TEST_DATA_5MIN = TESTS_DATA_DIR / 'test_psm3_2019_5min.csv'
+MANUAL_TEST_DATA = TESTS_DATA_DIR / 'test_read_psm3.csv'
 LATITUDE, LONGITUDE = 40.5137, -108.5449
 METADATA_FIELDS = [
     'Source', 'Location ID', 'City', 'State', 'Country', 'Latitude',