[Python-apps-commits] r13956 - in packages/khal/trunk/debian (8 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Thu Apr 20 20:07:42 UTC 2017
Date: Thursday, April 20, 2017 @ 20:07:41
Author: fpytloun-guest
Revision: 13956
New upstream version, fix FTBFS
Added:
packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
Modified:
packages/khal/trunk/debian/changelog
packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch
packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
packages/khal/trunk/debian/patches/series
Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/changelog 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,3 +1,12 @@
+khal (0.9.5-1) unstable; urgency=medium
+
+ * New upstream release
+ * d/patches: some TZ tests may fail due to Debian's python-tz of older
+ version but with newer TZ definitions, should be removed when 2017.2
+ reaches sid (Closes: #859472)
+
+ -- Filip Pytloun <filip at pytloun.cz> Thu, 20 Apr 2017 20:55:06 +0200
+
khal (0.9.4-1) unstable; urgency=medium
* New upstream release
Modified: packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
===================================================================
--- packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,7 +1,7 @@
-From 387de660792c318923930377cb3bd10818b9a30a Mon Sep 17 00:00:00 2001
+From 76da03778dfba760a43a761d94f6a13a8a3aa5c6 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Wed, 17 Aug 2016 11:07:28 +0200
-Subject: [PATCH 1/5] No RSS news in docs
+Subject: [PATCH 1/6] No RSS news in docs
---
doc/source/conf.py | 3 +--
Modified: packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch
===================================================================
--- packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,7 +1,7 @@
-From f92aa21c904a35d5be0ba570916bc1844b292a2c Mon Sep 17 00:00:00 2001
+From c2b6c2cee96504ec32681170ac21f8b5ef91da17 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 20:09:20 +0200
-Subject: [PATCH 2/5] Reference license from copyright file
+Subject: [PATCH 2/6] Reference license from copyright file
---
doc/source/license.rst | 20 ++------------------
Modified: packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
===================================================================
--- packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,7 +1,7 @@
-From 7895c535783d890e73f32aa80b658407c30892d9 Mon Sep 17 00:00:00 2001
+From fca3740b109d216d4ef5fde8cbbd579b9f089844 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 20:38:33 +0200
-Subject: [PATCH 3/5] Fix intersphinx mapping
+Subject: [PATCH 3/6] Fix intersphinx mapping
---
doc/source/conf.py | 2 +-
Modified: packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
===================================================================
--- packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,7 +1,7 @@
-From 0902068464829e83cd4ee576d70358f34b40af1a Mon Sep 17 00:00:00 2001
+From 89ecfb540def12dae2541dc177a137901958f63f Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 21:06:36 +0200
-Subject: [PATCH 4/5] Fix tests failing due to timezone
+Subject: [PATCH 4/6] Fix tests failing due to timezone
---
tests/cal_display_test.py | 1 +
@@ -79,10 +79,10 @@
with freeze_time('2016-04-10'):
diff --git a/tests/utils_test.py b/tests/utils_test.py
-index 296253e..a6b9150 100644
+index 974cf35..c50f6cd 100644
--- a/tests/utils_test.py
+++ b/tests/utils_test.py
-@@ -560,6 +560,7 @@ def test_description_and_location_and_categories():
+@@ -561,6 +561,7 @@ def test_description_and_location_and_categories():
assert _replace_uid(event).to_ical() == vevent
@@ -90,7 +90,7 @@
def test_split_ics():
cal = _get_text('cal_lots_of_timezones')
vevents = utils.split_ics(cal)
-@@ -577,6 +578,7 @@ def test_split_ics():
+@@ -578,6 +579,7 @@ def test_split_ics():
assert sorted(vevents1) == sorted(part1)
Modified: packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
===================================================================
--- packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -1,7 +1,7 @@
-From 5a0d55d663258236c448000383d41f26ec72be69 Mon Sep 17 00:00:00 2001
+From fa9f4aba3a2490eefe5aba515974e9a8ffc4de94 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 21:18:33 +0200
-Subject: [PATCH 5/5] Avoid privacy breach in sphinx doc
+Subject: [PATCH 5/6] Avoid privacy breach in sphinx doc
---
doc/source/conf.py | 10 +++++-----
Added: packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
===================================================================
--- packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch (rev 0)
+++ packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-04-20 20:07:41 UTC (rev 13956)
@@ -0,0 +1,45 @@
+From 3120c689448b6218d4f0209bc630e4582777677a Mon Sep 17 00:00:00 2001
+From: Filip Pytloun <filip at pytloun.cz>
+Date: Thu, 20 Apr 2017 20:54:05 +0200
+Subject: [PATCH 6/6] Timezone tests may fail due to older pytz with newer TZ
+ definitions
+
+---
+ tests/event_test.py | 1 +
+ tests/vtimezone_test.py | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/tests/event_test.py b/tests/event_test.py
+index 79ff17b..8a524c1 100644
+--- a/tests/event_test.py
++++ b/tests/event_test.py
+@@ -299,6 +299,7 @@ def test_event_dt_long():
+ '09.04.2014 09:30-12.04.2014 10:30 An Event \x1b[0m'
+
+
++ at pytest.mark.xfail
+ def test_event_no_dst(pytz_version):
+ """test the creation of a corect VTIMEZONE for timezones with no dst"""
+ event_no_dst = _get_text('event_no_dst')
+diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py
+index d810c64..e4d0fb8 100644
+--- a/tests/vtimezone_test.py
++++ b/tests/vtimezone_test.py
+@@ -1,5 +1,6 @@
+ from datetime import datetime as datetime
+ import pytz
++import pytest
+ from khal.khalendar.event import create_timezone
+
+ berlin = pytz.timezone('Europe/Berlin')
+@@ -61,6 +62,7 @@ def test_berlin_rdate():
+ assert vberlin_dst in vberlin
+
+
++ at pytest.mark.xfail
+ def test_bogota(pytz_version):
+ vbogota = [b'BEGIN:VTIMEZONE',
+ b'TZID:America/Bogota',
+--
+2.11.0
+
Modified: packages/khal/trunk/debian/patches/series
===================================================================
--- packages/khal/trunk/debian/patches/series 2017-04-12 11:18:31 UTC (rev 13955)
+++ packages/khal/trunk/debian/patches/series 2017-04-20 20:07:41 UTC (rev 13956)
@@ -3,3 +3,4 @@
0003-Fix-intersphinx-mapping.patch
0004-Fix-tests-failing-due-to-timezone.patch
0005-Avoid-privacy-breach-in-sphinx-doc.patch
+0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
More information about the Python-apps-commits
mailing list