public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pytrainer: 1.11.0 -> 1.12.0

This commit is contained in:
Robert Helgesson 2018-02-27 22:20:26 +01:00
parent 6d54123caf
commit e21057ae4f
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/pytrainer/default.nix
View File

@ -14,13 +14,13 @@ in
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "pytrainer-${version}"; name = "pytrainer-${version}";
version = "1.11.0"; version = "1.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pytrainer"; owner = "pytrainer";
repo = "pytrainer"; repo = "pytrainer";
rev = "v${version}"; rev = "v${version}";
sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy"; sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581";
}; };
namePrefix = ""; namePrefix = "";
@ -35,8 +35,13 @@ python2Packages.buildPythonApplication rec {
./pytrainer-webkit.patch ./pytrainer-webkit.patch
]; ];
postPatch = ''
substituteInPlace ./setup.py \
--replace "'mysqlclient'," ""
'';
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2
] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
buildInputs = [ perl gpsbabel sqlite ]; buildInputs = [ perl gpsbabel sqlite ];

31
pkgs/applications/misc/pytrainer/fix-test-tz.patch
View File

@ -1,7 +1,7 @@
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py
--- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100 --- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100
+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200 +++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100
@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase): @@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase):
self.assertEquals(self.activity.time, self.activity.duration) self.assertEquals(self.activity.time, self.activity.duration)
def test_activity_starttime(self): def test_activity_starttime(self):
@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1
def test_activity_time_tuple(self): def test_activity_time_tuple(self):
self.assertEquals(self.activity.time_tuple, (2, 3, 46)) self.assertEquals(self.activity.time_tuple, (2, 3, 46))
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py
--- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100 --- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100
+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200 +++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100
@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase) @@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase)
self.fail() self.fail()
def test_workout_summary(self): def test_workout_summary(self):
@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai
try: try:
current_path = os.path.dirname(os.path.abspath(__file__)) current_path = os.path.dirname(os.path.abspath(__file__))
data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py @@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase)
--- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100 self.fail()
+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200
def test_summary_in_database(self):
- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
+ 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()
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 @@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
def test_getDateTime(self): def test_getDateTime(self):
utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')