Skip to content

Add encoding parameter to read_tmy3 #1737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
May 26, 2023
Merged

Add encoding parameter to read_tmy3 #1737

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2590ada
Add encoding to read_tmy3
AdamRJensen May 16, 2023
126cec4
Update v0.9.6.rst
AdamRJensen May 16, 2023
d360dba
Update pvlib/iotools/tmy.py
AdamRJensen May 16, 2023
aaf6011
Add Andy Lam to contributor list
AdamRJensen May 16, 2023
e01790f
Merge branch 'expose_encoding_tmy3' of https://github.com/AdamRJensen…
AdamRJensen May 16, 2023
aad2196
Remove try/except statement
AdamRJensen May 16, 2023
5e025a4
Inlining _parse_tmy3
AdamRJensen May 16, 2023
d9f61d4
Add DOIs
AdamRJensen May 16, 2023
44ac7b4
Use split(':') instead of [:2] to extract hour
AdamRJensen May 17, 2023
efa6860
Add parsing of minutes
AdamRJensen May 22, 2023
f638a4d
Fix doi rendering
AdamRJensen May 23, 2023
c6e8854
Fix doi rendering in read_tmy2
AdamRJensen May 23, 2023
13d41af
Merge branch 'main' into expose_encoding_tmy3
AdamRJensen May 23, 2023
ab6b136
Merge branch 'main' into expose_encoding_tmy3
AdamRJensen May 25, 2023
8e1f488
Revert "Merge branch 'main' into expose_encoding_tmy3"
AdamRJensen May 25, 2023
f9c3953
Merge branch 'expose_encoding_tmy3' of https://github.com/AdamRJensen…
AdamRJensen May 25, 2023
d868bb9
Revert "Merge branch 'expose_encoding_tmy3' of https://github.com/Ada…
AdamRJensen May 25, 2023
1ce2d5c
This reverts commit d868bb975bbc83ba5c7462406d7d41bbc21411f1.
AdamRJensen May 26, 2023
215ed7c
Revert more stuff manually
AdamRJensen May 26, 2023
7bb6416
Add lines add end of file
AdamRJensen May 26, 2023
1dafb82
Add encoding=None to function def line
AdamRJensen May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/sphinx/source/whatsnew/v0.9.6.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Deprecations

Enhancements
~~~~~~~~~~~~
* Add optional encoding parameter to :py:func:`pvlib.iotools.read_tmy3`.
(:issue:`1732`, :pull:`1737`)


Bug fixes
Expand Down
6 changes: 4 additions & 2 deletions pvlib/iotools/tmy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pandas as pd


def read_tmy3(filename, coerce_year=None, recolumn=True):
def read_tmy3(filename, coerce_year=None, recolumn=True, encoding=None):
"""Read a TMY3 file into a pandas dataframe.

Note that values contained in the metadata dictionary are unchanged
Expand All @@ -27,6 +27,8 @@ def read_tmy3(filename, coerce_year=None, recolumn=True):
recolumn : bool, default True
If ``True``, apply standard names to TMY3 columns. Typically this
results in stripping the units from the column name.
encoding : optional
Encoding of the file.

Returns
-------
Expand Down Expand Up @@ -160,7 +162,7 @@ def read_tmy3(filename, coerce_year=None, recolumn=True):
head = ['USAF', 'Name', 'State', 'TZ', 'latitude', 'longitude', 'altitude']

try:
with open(str(filename), 'r') as fbuf:
with open(str(filename), 'r', encoding=encoding) as fbuf:
firstline, data = _parse_tmy3(fbuf)
# SolarAnywhere files contain non-UTF8 characters and may require
# encoding='iso-8859-1' in order to be parsed
Expand Down