From b2a8e15dcb2a738b8c08ab3d6a1e28a145942039 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 27 Apr 2021 17:18:04 +0200 Subject: [PATCH] NK LiNK Logbook icon --- rowers/c2stuff.py | 2 +- rowers/runkeeperstuff.py | 2 +- rowers/templates/rower_exportsettings.html | 2 +- rowers/tests/statements.py | 8 +++++--- static/img/NKLiNKLogbook.png | Bin 0 -> 9444 bytes 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 static/img/NKLiNKLogbook.png diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 71032545..496cc8d7 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -612,7 +612,7 @@ def createc2workoutdata(w): itime, idist, itype = row.intervalstats_values() try: lapnames = row.df[' lapIdx'].unique() - except KeyError: + except KeyError: # pragma: no cover lapnames = range(len(itime)) nrintervals = len(itime) if len(lapnames) != nrintervals: diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py index 0f588cb4..cc3b6998 100644 --- a/rowers/runkeeperstuff.py +++ b/rowers/runkeeperstuff.py @@ -129,7 +129,7 @@ def createrunkeeperworkoutdata(w): try: averagehr = int(row.df[' HRCur (bpm)'].mean()) maxhr = int(row.df[' HRCur (bpm)'].max()) - except KeyError: + except KeyError: # pragma: no cover averagehr = 0 maxhr = 0 diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html index d817cf9b..79332c87 100644 --- a/rowers/templates/rower_exportsettings.html +++ b/rowers/templates/rower_exportsettings.html @@ -74,7 +74,7 @@ choice or to renew the authorization.

connect with strava

connect with Concept2

-

connect with NK Logbook

+

connect with NK Logbook

connect with SportTracks

connect with RunKeeper

connect with Under Armour

diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index dd866c83..fcdcac19 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -15,10 +15,12 @@ except NameError: import pytest +from pandas.core.common import SettingWithCopyWarning + import warnings -#warnings.filterwarnings("error", -# category=DeprecationWarning -# ) +warnings.filterwarnings("error", + category=SettingWithCopyWarning + ) pytestmark = pytest.mark.django_db diff --git a/static/img/NKLiNKLogbook.png b/static/img/NKLiNKLogbook.png new file mode 100644 index 0000000000000000000000000000000000000000..88f4367984bbb4a8ba2c630dbf3b387b0a41544d GIT binary patch literal 9444 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