move nrel api key fixture to conftest

Author: kandersolar

pvlib/tests/conftest.py

@@ -83,6 +83,26 @@ def assert_frame_equal(left, right, **kwargs):
                                   reason='does not run on windows')
 
 
+@pytest.fixture(scope="module")
+def nrel_api_key():
+    """Supplies pvlib-python's NREL Developer Network API key.
+
+    Azure Pipelines CI utilizes a secret variable set to NREL_API_KEY
+    to mitigate failures associated with using the default key of
+    "DEMO_KEY". A user is capable of using their own key this way if
+    desired however the default key should suffice for testing purposes.
+    """
+    try:
+        demo_key = os.environ["NREL_API_KEY"]
+    except KeyError:
+        warnings.warn(
+            "WARNING: NREL API KEY environment variable not set! "
+            "Using DEMO_KEY instead. Unexpected failures may occur."
+        )
+        demo_key = 'DEMO_KEY'
+    return demo_key
+
+
 try:
     # Attempt to load BSRN credentials used for testing pvlib.iotools.get_bsrn
     bsrn_username = os.environ["BSRN_FTP_USERNAME"]

pvlib/tests/iotools/test_psm3.py

@@ -2,16 +2,15 @@
 test iotools for PSM3
 """
 
-import os
 from pvlib.iotools import psm3
-from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal
+from ..conftest import (
+    DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal, nrel_api_key
+)
 import numpy as np
 import pandas as pd
 import pytest
 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'
@@ -27,26 +26,6 @@
 PVLIB_EMAIL = 'pvlib-admin@googlegroups.com'
 
 
-@pytest.fixture(scope="module")
-def nrel_api_key():
-    """Supplies pvlib-python's NREL Developer Network API key.
-
-    Azure Pipelines CI utilizes a secret variable set to NREL_API_KEY
-    to mitigate failures associated with using the default key of
-    "DEMO_KEY". A user is capable of using their own key this way if
-    desired however the default key should suffice for testing purposes.
-    """
-    try:
-        demo_key = os.environ["NREL_API_KEY"]
-    except KeyError:
-        warnings.warn(
-            "WARNING: NREL API KEY environment variable not set! "
-            "Using DEMO_KEY instead. Unexpected failures may occur."
-        )
-        demo_key = 'DEMO_KEY'
-    return demo_key
-
-
 def assert_psm3_equal(data, metadata, expected):
     """check consistency of PSM3 data"""
     # check datevec columns

pvlib/tests/iotools/test_psm4.py

@@ -2,15 +2,15 @@
 test iotools for PSM4
 """
 
-import os
 from pvlib.iotools import psm4
-from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal
+from ..conftest import (
+    DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal, nrel_api_key
+)
 import numpy as np
 import pandas as pd
 import pytest
 from requests import HTTPError
 from io import StringIO
-import warnings
 
 TMY_TEST_DATA = DATA_DIR / 'test_psm4_tmy-2023.csv'
 YEAR_TEST_DATA = DATA_DIR / 'test_psm4_2023.csv'
@@ -26,26 +26,6 @@
 PVLIB_EMAIL = 'pvlib-admin@googlegroups.com'
 
 
-@pytest.fixture(scope="module")
-def nrel_api_key():
-    """Supplies pvlib-python's NREL Developer Network API key.
-
-    Azure Pipelines CI utilizes a secret variable set to NREL_API_KEY
-    to mitigate failures associated with using the default key of
-    "DEMO_KEY". A user is capable of using their own key this way if
-    desired however the default key should suffice for testing purposes.
-    """
-    try:
-        demo_key = os.environ["NREL_API_KEY"]
-    except KeyError:
-        warnings.warn(
-            "WARNING: NREL API KEY environment variable not set! "
-            "Using DEMO_KEY instead. Unexpected failures may occur."
-        )
-        demo_key = 'DEMO_KEY'
-    return demo_key
-
-
 def assert_psm4_equal(data, metadata, expected):
     """check consistency of PSM4 data"""
     # check datevec columns