Skip to content

Commit

Permalink
Merge branch 'release/v3.6.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sander Roosendaal committed Apr 13, 2024
2 parents c11eabe + a3cfdad commit d8d83a1
Show file tree
Hide file tree
Showing 7 changed files with 338 additions and 89 deletions.
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.9.16
92 changes: 37 additions & 55 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,77 +1,59 @@
arrow==1.3.0
asttokens==2.4.1
certifi==2023.11.17
certifi==2024.2.2
cffi==1.16.0
charset-normalizer==3.3.2
contourpy==1.2.0
cryptography==41.0.5
colorama==0.4.6
contourpy==1.2.1
cycler==0.12.1
Cython==3.0.5
Cython==3.0.10
decorator==5.1.1
docopt==0.6.2
docutils==0.20.1
dparse==0.6.3
exceptiongroup==1.2.0
executing==2.0.1
fitparse==1.2.0
fonttools==4.44.3
h3==3.7.6
idna==3.4
importlib-metadata==6.8.0
ipython==8.17.2
fonttools==4.51.0
h3==3.7.7
idna==3.7
importlib_resources==6.4.0
ipython==8.18.1
iso8601==2.1.0
jaraco.classes==3.3.0
jedi==0.19.1
jeepney==0.8.0
keyring==24.3.0
kiwisolver==1.4.5
lxml==4.9.3
markdown-it-py==3.0.0
MarkupSafe==2.1.3
matplotlib==3.8.2
lxml==5.2.1
matplotlib==3.8.4
matplotlib-inline==0.1.6
mdurl==0.1.2
more-itertools==10.1.0
nh3==0.2.14
nose==1.3.7
nose-parameterized==0.6.0
nose2==0.14.0
numpy==1.26.2
packaging==23.2
pandas==2.1.3
parameterized==0.9.0
parso==0.8.3
pexpect==4.8.0
Pillow==10.1.0
pkginfo==1.9.6
prompt-toolkit==3.0.41
protobuf==4.25.1
numpy==1.26.4
packaging==24.0
pandas==2.2.2
parso==0.8.4
pexpect==4.9.0
pillow==10.3.0
polars==0.20.19
prompt-toolkit==3.0.43
ptyprocess==0.7.0
pure-eval==0.2.2
pycairo==1.25.1
pycparser==2.21
Pygments==2.16.1
pyparsing==3.1.1
python-dateutil==2.8.2
pytz==2023.3.post1
readme-renderer==42.0
pycairo==1.26.0
pycparser==2.22
Pygments==2.17.2
pyparsing==3.1.2
python-dateutil==2.9.0.post0
pytz==2024.1
requests==2.31.0
requests-toolbelt==1.0.0
rfc3986==2.0.0
rich==13.7.0
rowingdata==3.6.6
rowingphysics==0.5.2
scipy==1.11.3
SecretStorage==3.3.3
scipy==1.13.0
six==1.16.0
stack-data==0.6.3
timezonefinder==6.2.0
timezonefinder==6.5.0
tk==0.1.0
tqdm==4.66.1
traitlets==5.13.0
twine==4.0.2
types-python-dateutil==2.8.19.14
tzdata==2023.3
urllib3==2.1.0
wcwidth==0.2.10
Werkzeug==3.0.1
tqdm==4.66.2
traitlets==5.14.2
types-python-dateutil==2.9.0.20240316
typing_extensions==4.11.0
tzdata==2024.1
urllib3==2.2.1
wcwidth==0.2.13
xmltodict==0.13.0
zipp==3.17.0
zipp==3.18.1
6 changes: 6 additions & 0 deletions rowingdata/checkdatafiles.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import absolute_import
from __future__ import print_function
import polars as pl

try:
from . import rowingdata
Expand Down Expand Up @@ -151,6 +152,11 @@ def checkfile(f2, verbose=False):
else:
row = rowingdata.rowingdata(csvfile=f2)

row.write_csv(f2+'pl.csv')
row2 = rowingdata.rowingdata_pl(csvfile=f2 + 'pl.csv')
os.remove(f2 + 'pl.csv')
row2 = rowingdata.rowingdata_pl(df=pl.from_pandas(row.df))

nr_of_rows = row.number_of_rows
distmax = row.df['cum_dist'].max()
timemax = row.df['TimeStamp (sec)'].max() - row.df['TimeStamp (sec)'].min()
Expand Down
12 changes: 10 additions & 2 deletions rowingdata/csvparsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1969,10 +1969,18 @@ def __init__(self, *args, **kwargs):

class SmartRowParser(CSVParser):
def __init__(self, *args, **kwargs):
if args:
csvfile = args[0]
else: # pragma: no cover
csvfile = kwargs['csvfile']

separator = get_separator(5, csvfile)
kwargs['sep'] = separator

super(SmartRowParser, self).__init__(*args, **kwargs)

self.cols = [
'Second (#)',
'Timestamp (UTC)',
'Distance (m)',
'Stroke rate (SPM)',
'Heart rate (bpm)',
Expand All @@ -1986,7 +1994,7 @@ def __init__(self, *args, **kwargs):
'', #' AverageDriveForce (lbs)',
'', #' PeakDriveForce (lbs)',
'', #' lapIdx',
'', #Second (#)',
'Second (#)',
'', #' latitude',
'', #' longitude',
]
Expand Down
Loading

0 comments on commit d8d83a1

Please sign in to comment.