Merge branch 'main' into development

Author: cdeline

.github/workflows/deploy.yaml

@@ -18,13 +18,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install build twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload dist/*
     - uses: actions/upload-artifact@v4
       with:

bifacial_radiance/main.py

@@ -915,7 +915,7 @@ def readWeatherFile(self, weatherFile=None, starttime=None,
         source : str
             To help identify different types of .csv files. If None, it assumes
             it is a TMY3-style formated data. Current options: 'TMY3', 
-            'solargis', 'EPW', 'SAM'
+            'solargis', 'EPW', 'SAM', 'PSM3'
         coerce_year : int
             Year to coerce weather data to in YYYY format, ie 2021. 
             If more than one year of data in the  weather file, year is NOT coerced.
@@ -968,7 +968,7 @@ def readWeatherFile(self, weatherFile=None, starttime=None,
                 label = 'right'
             metdata, metadata = self._readTMY(weatherFile, label=label, coerce_year=coerce_year)
 
-        if source.lower() =='sam':
+        if source.lower() in ['sam', 'psm3']:
             if label is None:
                 label = 'left'
             metdata, metadata = self._readSAM(weatherFile)
@@ -1390,14 +1390,12 @@ def _convertTMYdate(data, meta):
 
     def _readSAM(self, SAMfile=None):
         '''
-        use pvlib to read in a tmy3 file.
-        Note: pvlib 0.7 does not currently support sub-hourly files. Until
-        then, use _readTMYdate() to create the index
+        Read an NSRDB PSM3 weather file (formatted as SAM CSV).
 
         Parameters
         ------------
         tmyfile : str
-            Filename of tmy3 to be read with pvlib.tmy.readtmy3
+            Filename of PSM3 to be read with pvlib.iotools.read_psm3
 
         Returns
         -------
@@ -1408,7 +1406,7 @@ def _readSAM(self, SAMfile=None):
         # Will only work with latest PVLIB Release once htey accept my push..
         # Note Oct. 10
         # import pvlib
-        #(tmydata, metadata) = pvlib.iotools.tmy.read_psm3(filename=SAMfile,
+        #(tmydata, metadata) = pvlib.iotools.read_psm3(filename=SAMfile,
         #                                                  map_variables=True)
         with open(SAMfile) as myfile:
             head = next(myfile)#

pyproject.toml

@@ -16,7 +16,7 @@ keywords = ["bifacial", "radiance", "photovoltaics", "pv", "ray tracing"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD-3-Clause",
+    "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",