Khal 0.8.3 has been released! Builds don't seem to be deterministic when I use --check. Not sure where to start looking in order to fix that.
Troy
From 2538d47347ea2ca04eb116e762e3bf4dec575d31 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankey...@gmail.com>
Date: Sun, 14 Aug 2016 13:38:20 -0400
Subject: [PATCH 1/3] gnu: Add python-freezegun.
* gnu/packages/python.scm (python-freezegun): New variable.
(python2-freezegun): New variable.
---
gnu/packages/python.scm | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 77bb8a4..28bc2ca 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10224,3 +10224,43 @@ List. Forked from and using the same API as the publicsuffix package.")
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))))))
+
+(define-public python-freezegun
+ (package
+ (name "python-freezegun")
+ (version "0.3.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "freezegun" version))
+ (sha256
+ (base32
+ "14l19x06v5jkq4rdwbmfyw4x9lrjb2300afrk21r1ash7y1y9a0w"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-mock" ,python-mock)
+ ("python-nose" ,python-nose)
+ ("python-coverage" ,python-coverage)
+ ("python-dateutil-2" ,python-dateutil-2)))
+ (inputs
+ `(("python-six" ,python-six)))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ ;; the tests are normally executed via `make test`, but the pypi
+ ;; package does not include the Makefile (why???)
+ (replace 'check
+ (lambda _
+ (zero? (system* "nosetests" "./tests/")))))))
+ (home-page "https://github.com/spulec/freezegun";)
+ (synopsis "Test utility for mocking the datetime module")
+ (description
+ "FreezeGun is a library that allows your python tests to travel through
+time by mocking the datetime module.")
+ (license license:asl2.0)))
+
+(define-public python2-freezegun
+ (let ((base (package-with-python2 (strip-python2-variant python-freezegun))))
+ (package (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
--
2.9.2
From 70a02a8d40aa4f8f195aecec9e3a7455b9642f76 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankey...@gmail.com>
Date: Sun, 14 Aug 2016 13:38:33 -0400
Subject: [PATCH 3/3] gnu: khal: Update to 0.8.3.
* gnu/packages/calendar.scm (khal): Update to 0.8.3.
---
gnu/packages/calendar.scm | 33 +++++----------------------------
1 file changed, 5 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 3b5aba7..7f3d05d 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016 Leo Famulari <l...@famulari.name>
;;; Copyright © 2016 Kei Kebreau <k...@openmailbox.org>
;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2016 Troy Sankey <sankey...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -80,42 +81,16 @@ data units.")
(define-public khal
(package
(name "khal")
- (version "0.7.0")
+ (version "0.8.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "khal" version))
(sha256
(base32
- "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66"))
- (modules '((guix build utils)))
- ;; Patch broken path in 'doc' Makefile.
- ;; Patch sent upstream: https://github.com/geier/khal/pull/307
- (snippet
- '(substitute* "doc/source/Makefile"
- (("../../../khal/khal/settings/khal.spec")
- "../../khal/settings/khal.spec" )))))
+ "1qryqs5d8jsl7j22pjjfkfdi4m8m3nn3n44b890pq85xkw599ihy"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'disable-tests
- (lambda _
- ;; Bug reported for test_only_update_old_event:
- ;; https://github.com/geier/khal/issues/309
- (substitute* "tests/khalendar_test.py"
- (("test_only_update_old_event")
- "disabled_only_update_old_event"))
-
- ;; Bug reported for test_dt_two_tz:
- ;; https://github.com/pimutils/khal/issues/382
- (substitute* "tests/event_test.py"
- (("test_dt_two_tz")
- "disabled_dt_two_tz"))
- ;; Another timezone / DST issue:
- ;; https://github.com/pimutils/khal/issues/146
- (substitute* "tests/event_test.py"
- (("test_raw_dt")
- "disabled_raw_dt"))))
-
;; Building the manpage requires khal to be installed.
(add-after 'install 'manpage
(lambda* (#:key outputs #:allow-other-keys)
@@ -136,9 +111,11 @@ data units.")
(zero? (system* "py.test" "tests")))))))
(native-inputs
`(("python-pytest" ,python-pytest)
+ ("python-pytest-cov" ,python-pytest-cov)
("python-setuptools-scm" ,python-setuptools-scm)
;; Required for tests
("tzdata" ,tzdata)
+ ("python-freezegun" ,python-freezegun)
;; Required to build manpage
("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed)
("python-sphinx" ,python-sphinx)))
--
2.9.2
From 5b35418d1f6857ce282c8ffcfd66665b260e9dd5 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankey...@gmail.com>
Date: Sun, 28 Aug 2016 20:35:20 -0400
Subject: [PATCH 2/3] gnu: python-icalendar: Update to 3.10.
* gnu/packages/python.scm (python-icalendar): Update to 3.10.
---
gnu/packages/python.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 28bc2ca..72e0881 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7222,13 +7222,13 @@ processes across test runs.")
(define-public python-icalendar
(package
(name "python-icalendar")
- (version "3.9.1")
+ (version "3.10")
(source (origin
(method url-fetch)
(uri (pypi-uri "icalendar" version))
(sha256
(base32
- "0fhrczdj3jxy5bvswphp3vys7vwv5c9bpwg7asykqwa3z6253q6q"))))
+ "01amnk3621s7fagfla86npd25knbqirchg7h1jpqxqp103d02bs7"))))
(build-system python-build-system)
(propagated-inputs
`(("python-dateutil-2" ,python-dateutil-2)
--
2.9.2
signature.asc
Description: signature
