Skip to content
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

Fix for failing documentation on read the docs #517

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Fix for failing documentation on read the docs #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pyleoclim/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ 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,
keywords=['Paleoclimate, Data Analysis, LiPD'],
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",
Expand Down
Loading