diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 16:35:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 16:35:04 -0400 |
| commit | 67db915a4391d5c74307089a388ada26a03dadff (patch) | |
| tree | ad08c490ac215efd93c5d49dca892be28efeee97 /pkgs/applications | |
| parent | 1d90ea9194633503e30494fa5e050924c8a3e56f (diff) | |
| parent | 5789cf479146e698ad5c6645fddf8a7a14475885 (diff) | |
| download | nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar.gz nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar.bz2 nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar.lz nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar.xz nixlib-67db915a4391d5c74307089a388ada26a03dadff.tar.zst nixlib-67db915a4391d5c74307089a388ada26a03dadff.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/pytrainer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/pytrainer/fix-test-tz.patch | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index dcbd14198f76..cdeca96568df 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -14,13 +14,13 @@ in python.pkgs.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; + sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx"; }; namePrefix = ""; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 761064077a98..ca4875769013 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -30,13 +30,16 @@ diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrain + summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') self.ddbb.session.add(activity) - self.ddbb.session.commit() + self.ddbb.session.commit( diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py ---- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 -+++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 -@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase +--- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200 ++++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200 +@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) - self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) + self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) + + class DateRangeTest(unittest.TestCase): + |