diff --git a/pyleoclim/core/series.py b/pyleoclim/core/series.py index 0f008454..6a8a4754 100644 --- a/pyleoclim/core/series.py +++ b/pyleoclim/core/series.py @@ -4049,13 +4049,13 @@ def resample(self, rule, keep_log = False, **kwargs): multiplier = int(multiplier) unit = search.group(2) if unit.lower() in tsbase.MATCH_A: - rule = f'{multiplier}AS' + rule = f'{multiplier}YS' elif unit.lower() in tsbase.MATCH_KA: - rule = f'{1_000*multiplier}AS' + rule = f'{1_000*multiplier}YS' elif unit.lower() in tsbase.MATCH_MA: - rule = f'{1_000_000*multiplier}AS' + rule = f'{1_000_000*multiplier}YS' elif unit.lower() in tsbase.MATCH_GA: - rule = f'{1_000_000_000*multiplier}AS' + rule = f'{1_000_000_000*multiplier}YS' ser = self.to_pandas() diff --git a/setup.py b/setup.py index 51fbf582..a15b292e 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ def read(fname): description='A Python package for paleoclimate data analysis', long_description=read("README.md"), long_description_content_type = 'text/markdown', - author='Deborah Khider, Feng Zhu, Julien Emile-Geay, Jun Hu, Myron Kwan, Pratheek Athreya, Alexander James, Daniel Garijo', + author='Deborah Khider, Julien Emile-Geay, Feng Zhu, Jordan Landers, Alexander James, Jun Hu, Myron Kwan, Pratheek Athreya, Daniel Garijo', author_email='linkedearth@gmail.com', url='https://github.com/LinkedEarth/Pyleoclim_util/pyleoclim', download_url='https://github.com/LinkedEarth/Pyleoclim_util/tarball/'+version, @@ -28,7 +28,7 @@ def read(fname): classifiers=[], install_requires=[ "LiPD==0.2.8.8", - "pandas>=2.0.0", + "pandas==2.1.4", "kneed>=0.7.0", "statsmodels>=0.13.2", "seaborn==0.12.2",