Skip to content

WIP: bugfix/issue-28 import error for bumped python version #29

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

Open
lundgrenalex wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: bugfix/issue-28 import error for bumped python version #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28b385f
ISSUE-28: fix imports for python version upper than 3.10
lundgrenalex Mar 17, 2024
56903f2
ISSUE-28: bump vers
lundgrenalex Mar 17, 2024
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: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.4
0.0.5
11 changes: 9 additions & 2 deletions pytides/tide.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

from collections import OrderedDict, Iterable
import sys
from itertools import takewhile, count
try:
from itertools import izip, ifilter
Expand All @@ -12,8 +11,16 @@
from astro import astro
import constituent

if sys.version_info <= (3, 10):
from collections import OrderedDict, Iterable
elif sys.version_info > (3, 10):
from collections import OrderedDict
from collections.abc import Iterable


d2r, r2d = np.pi/180.0, 180.0/np.pi


class Tide(object):
dtype = np.dtype([
('constituent', object),
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(name='pytides',
description='Tidal analysis and prediction library.',
version='0.0.4',
version='0.0.5',
author='Sam Cox',
author_email='sam.cox@cantab.net',
url='http://github.com/sam-cox/pytides',
Expand Down