diff --git a/README.rst b/README.rst index a990203..dff7809 100644 --- a/README.rst +++ b/README.rst @@ -55,7 +55,7 @@ automatically with any of the installation instructions provided. - SciPy >= 0.6.0 -- pandas >= 0.17.0 +- pandas >= 1.3.0 Development ----------- diff --git a/thermochem/janaf.py b/thermochem/janaf.py index c169987..59ba4c6 100644 --- a/thermochem/janaf.py +++ b/thermochem/janaf.py @@ -77,7 +77,6 @@ def __init__(self, rawdata_text): self.description = self.rawdata_text.splitlines()[0] # Read the text file into a DataFrame. - # TODO: adjust usecols length to be within bounds, Pandas deprecation data = pd.read_csv( StringIO(self.rawdata_text), skiprows=2, @@ -85,7 +84,7 @@ def __init__(self, rawdata_text): delimiter=r'[\t\s]+', engine='python', names=['T', 'Cp', 'S', '[G-H(Tr)]/T', 'H-H(Tr)', 'Delta_fH', 'Delta_fG', 'log(Kf)'], - usecols=range(8) # Ignore extra columns -- those are caused by comments in the text file + on_bad_lines='warn' ) self.rawdata = data