[Python-apps-commits] r13994 - in packages/khal/tags (18 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Thu May 4 07:34:29 UTC 2017
Date: Thursday, May 4, 2017 @ 07:34:28
Author: fpytloun-guest
Revision: 13994
[svn-buildpackage] Tagging khal 1:0.8.4-4
Added:
packages/khal/tags/1:0.8.4-4/
packages/khal/tags/1:0.8.4-4/debian/changelog
(from rev 13993, packages/khal/trunk/debian/changelog)
packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch
(from rev 13993, packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch
(from rev 13993, packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch
(from rev 13993, packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
(from rev 13993, packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
(from rev 13993, packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch
(from rev 13993, packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
(from rev 13993, packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch)
packages/khal/tags/1:0.8.4-4/debian/patches/series
(from rev 13993, packages/khal/trunk/debian/patches/series)
Deleted:
packages/khal/tags/1:0.8.4-4/debian/changelog
packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch
packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch
packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch
packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
packages/khal/tags/1:0.8.4-4/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
packages/khal/tags/1:0.8.4-4/debian/patches/series
Deleted: packages/khal/tags/1:0.8.4-4/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/changelog 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,63 +0,0 @@
-khal (0.9.5-2) unstable; urgency=medium
-
- * d/copyright: mention presence of
- 0002-Reference-license-from-copyright-file.patch (Closes: #860984)
- * d/copyright: add upstream contact
- * d/copyright: update copyright year
-
- -- Filip Pytloun <filip at pytloun.cz> Mon, 24 Apr 2017 09:45:57 +0200
-
-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
- * d/lintian-overrides: don't override valid warning
-
- -- Filip Pytloun <filip at pytloun.cz> Mon, 03 Apr 2017 15:18:26 +0200
-
-khal (0.9.3-1) unstable; urgency=medium
-
- * New upstream release
- * Fix crash during configure if no vdir configured (Closes: #855631)
- * d/lintian-overrides: override manpage-has-errors-from-man because of
- cannot adjust line error that cannot be solved easily during generation
- from Sphinx docs (upstream issue: pimutils/khal#598)
- * d/patches: Rebased for new release
- * d/patches: Drop test workarounds that are no longer needed
-
- -- Filip Pytloun <filip at pytloun.cz> Tue, 07 Mar 2017 09:11:06 +0100
-
-khal (0.8.4-3) unstable; urgency=medium
-
- * d/patches: tolerate more occasionally failing tests where
- coll.update_db() is called, fixes random FTBFS (Closes: #851417)
-
- -- Filip Pytloun <filip at pytloun.cz> Tue, 17 Jan 2017 19:30:32 +0100
-
-khal (0.8.4-2) unstable; urgency=medium
-
- * d/patches: disable occasionally failing test_default_calendar
- (Closes: #844081)
-
- -- Filip Pytloun <filip at pytloun.cz> Mon, 02 Jan 2017 22:18:08 +0100
-
-khal (0.8.4-1) unstable; urgency=high
-
- * New upstream release
- * d/patches: Rebased for new release
-
- -- Filip Pytloun <filip at pytloun.cz> Mon, 31 Oct 2016 14:22:27 +0100
-
-khal (0.8.3-1) unstable; urgency=medium
-
- * initial release (Closes: #745025)
-
- -- Filip Pytloun <filip at pytloun.cz> Mon, 05 Sep 2016 10:06:20 +0200
Copied: packages/khal/tags/1:0.8.4-4/debian/changelog (from rev 13993, packages/khal/trunk/debian/changelog)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/changelog (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/changelog 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,40 @@
+khal (1:0.8.4-4) unstable; urgency=medium
+
+ * Raise epoch to "revert" new upstream version in unstable and pass
+ stretch migration
+ * d/copyright: mention presence of
+ 0002-Reference-license-from-copyright-file.patch (Closes: #860984)
+ * d/copyright: add upstream contact
+ * d/copyright: update copyright year
+ * 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> Wed, 03 May 2017 14:08:59 +0200
+
+khal (0.8.4-3) unstable; urgency=medium
+
+ * d/patches: tolerate more occasionally failing tests where
+ coll.update_db() is called, fixes random FTBFS (Closes: #851417)
+
+ -- Filip Pytloun <filip at pytloun.cz> Tue, 17 Jan 2017 19:30:32 +0100
+
+khal (0.8.4-2) unstable; urgency=medium
+
+ * d/patches: disable occasionally failing test_default_calendar
+ (Closes: #844081)
+
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 02 Jan 2017 22:18:08 +0100
+
+khal (0.8.4-1) unstable; urgency=high
+
+ * New upstream release
+ * d/patches: Rebased for new release
+
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 31 Oct 2016 14:22:27 +0100
+
+khal (0.8.3-1) unstable; urgency=medium
+
+ * initial release (Closes: #745025)
+
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 05 Sep 2016 10:06:20 +0200
Deleted: packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch
===================================================================
--- packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,36 +0,0 @@
-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/6] No RSS news in docs
-
----
- doc/source/conf.py | 3 +--
- doc/source/index.rst | 1 -
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index d544c1e..858faf0 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -102,8 +102,7 @@ with open('configspec.rst', 'w') as f:
- extensions = [
- 'sphinx.ext.autodoc',
- 'sphinx.ext.intersphinx',
-- 'sphinx.ext.todo',
-- 'sphinxcontrib.newsfeed',
-+ 'sphinx.ext.todo'
- ]
-
- # Add any paths that contain templates here, relative to this directory.
-diff --git a/doc/source/index.rst b/doc/source/index.rst
-index 8118c65..5b90dee 100644
---- a/doc/source/index.rst
-+++ b/doc/source/index.rst
-@@ -45,4 +45,3 @@ Table of Contents
- changelog
- faq
- license
-- news
---
-2.11.0
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch (from rev 13993, packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0001-No-RSS-news-in-docs.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,36 @@
+From 5c5968c6b2d4d9ec8bbd9218e1bfddfa45d0bab9 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
+
+---
+ doc/source/conf.py | 3 +--
+ doc/source/index.rst | 1 -
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 8401275..35a5779 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -30,8 +30,7 @@ import khal
+ extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.intersphinx',
+- 'sphinx.ext.todo',
+- 'sphinxcontrib.newsfeed',
++ 'sphinx.ext.todo'
+ ]
+
+ # Add any paths that contain templates here, relative to this directory.
+diff --git a/doc/source/index.rst b/doc/source/index.rst
+index 2fd8724..e4418c1 100644
+--- a/doc/source/index.rst
++++ b/doc/source/index.rst
+@@ -45,4 +45,3 @@ Table of Contents
+ changelog
+ faq
+ license
+- news
+--
+2.1.4
+
Deleted: packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch
===================================================================
--- packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,41 +0,0 @@
-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/6] Reference license from copyright file
-
----
- doc/source/license.rst | 20 ++------------------
- 1 file changed, 2 insertions(+), 18 deletions(-)
-
-diff --git a/doc/source/license.rst b/doc/source/license.rst
-index 0c6cf9f..1f52202 100644
---- a/doc/source/license.rst
-+++ b/doc/source/license.rst
-@@ -1,22 +1,6 @@
- License
- -------
--khal is released under the Expat/MIT License::
-
-- Copyright (c) 2013-2017 Christian Geier et al.
-+khal is released under the Expat/MIT License.
-
-- Permission is hereby granted, free of charge, to any person obtaining a copy of
-- this software and associated documentation files (the "Software"), to deal in
-- the Software without restriction, including without limitation the rights to
-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-- the Software, and to permit persons to whom the Software is furnished to do so,
-- subject to the following conditions:
--
-- The above copyright notice and this permission notice shall be included in all
-- copies or substantial portions of the Software.
--
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-- FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-- COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+For full text of this license see ``/usr/share/doc/khal-doc/copyright``
---
-2.11.0
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch (from rev 13993, packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,41 @@
+From e4806bd046fb3e09158375ace5b5639776de6e00 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
+
+---
+ doc/source/license.rst | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/doc/source/license.rst b/doc/source/license.rst
+index 1d3bcf3..90b3e5c 100644
+--- a/doc/source/license.rst
++++ b/doc/source/license.rst
+@@ -1,22 +1,5 @@
+ License
+ -------
+-khal is released under the Expat/MIT License::
++khal is released under the Expat/MIT License:
+
+- Copyright (c) 2013-2015 Christian Geier et al.
+-
+- Permission is hereby granted, free of charge, to any person obtaining a copy of
+- this software and associated documentation files (the "Software"), to deal in
+- the Software without restriction, including without limitation the rights to
+- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+- the Software, and to permit persons to whom the Software is furnished to do so,
+- subject to the following conditions:
+-
+- The above copyright notice and this permission notice shall be included in all
+- copies or substantial portions of the Software.
+-
+- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+- FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+- COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++For full test of this license see ``/usr/share/doc/khal-doc/copyright``
+--
+2.1.4
+
Deleted: packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch
===================================================================
--- packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,22 +0,0 @@
-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/6] Fix intersphinx mapping
-
----
- doc/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 858faf0..8e37071 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -348,4 +348,4 @@ texinfo_documents = [
-
-
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/': None}
-+intersphinx_mapping = {'python': ('/usr/share/doc/python3-doc/html', None)}
---
-2.11.0
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch (from rev 13993, packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,22 @@
+From 7a7b83709ca3ee5ff45094af28a0df9e3809f2e0 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
+
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 35a5779..54b4002 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -276,4 +276,4 @@ texinfo_documents = [
+
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++intersphinx_mapping = {'python': ('/usr/share/doc/python3-doc/html', None)}
+--
+2.1.4
+
Deleted: packages/khal/tags/1:0.8.4-4/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-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,103 +0,0 @@
-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/6] Fix tests failing due to timezone
-
----
- tests/cal_display_test.py | 1 +
- tests/khalendar_utils_test.py | 4 ++++
- tests/ui/test_calendarwidget.py | 2 ++
- tests/utils_test.py | 2 ++
- 4 files changed, 9 insertions(+)
-
-diff --git a/tests/cal_display_test.py b/tests/cal_display_test.py
-index c309317..94c4c08 100644
---- a/tests/cal_display_test.py
-+++ b/tests/cal_display_test.py
-@@ -172,6 +172,7 @@ example_de_netbsd = [
- '\x1b[1mM\xe4r.\x1b[0m27 28 29 1 2 3 4 ']
-
-
-+ at pytest.mark.skip
- def test_vertical_month():
- try:
- locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-diff --git a/tests/khalendar_utils_test.py b/tests/khalendar_utils_test.py
-index ad653f1..9d6d859 100644
---- a/tests/khalendar_utils_test.py
-+++ b/tests/khalendar_utils_test.py
-@@ -1,6 +1,7 @@
- from datetime import date, datetime, timedelta
- import icalendar
- import pytz
-+import pytest
-
- from khal.khalendar import utils
-
-@@ -317,6 +318,7 @@ class TestExpand(object):
- for start, _ in dtstart] == self.offset_berlin
- assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
-
-+ @pytest.mark.skip
- def test_expand_dtb(self):
- vevent = _get_vevent(event_dtb)
- dtstart = utils.expand(vevent, berlin)
-@@ -403,6 +405,7 @@ class TestExpandNoRR(object):
- for start, _ in dtstart] == self.offset_berlin
- assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
-
-+ @pytest.mark.skip
- def test_expand_dtb(self):
- vevent = _get_vevent(event_dtb_norr)
- dtstart = utils.expand(vevent, berlin)
-@@ -610,6 +613,7 @@ class TestSpecial(object):
- assert dtstart[0][0] == date(2009, 10, 31)
- assert dtstart[-1][0] == date(2037, 10, 31)
-
-+ @pytest.mark.skip
- def test_another_problem(self):
- vevent = _get_vevent(another_problem)
- dtstart = utils.expand(vevent, berlin)
-diff --git a/tests/ui/test_calendarwidget.py b/tests/ui/test_calendarwidget.py
-index 25cc58a..123b2f9 100644
---- a/tests/ui/test_calendarwidget.py
-+++ b/tests/ui/test_calendarwidget.py
-@@ -1,6 +1,7 @@
- from datetime import date, timedelta
-
- from freezegun import freeze_time
-+import pytest
-
- from khal.ui.calendarwidget import CalendarWidget
-
-@@ -36,6 +37,7 @@ def test_set_focus_date():
- assert frame.focus_date == day
-
-
-+ at pytest.mark.skip
- def test_set_focus_date_weekstart_6():
-
- with freeze_time('2016-04-10'):
-diff --git a/tests/utils_test.py b/tests/utils_test.py
-index 974cf35..c50f6cd 100644
---- a/tests/utils_test.py
-+++ b/tests/utils_test.py
-@@ -561,6 +561,7 @@ def test_description_and_location_and_categories():
- assert _replace_uid(event).to_ical() == vevent
-
-
-+ at pytest.mark.skip
- def test_split_ics():
- cal = _get_text('cal_lots_of_timezones')
- vevents = utils.split_ics(cal)
-@@ -578,6 +579,7 @@ def test_split_ics():
- assert sorted(vevents1) == sorted(part1)
-
-
-+ at pytest.mark.skip
- def test_split_ics_random_uid():
- random.seed(123)
- cal = _get_text('cal_lots_of_timezones')
---
-2.11.0
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch (from rev 13993, packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,103 @@
+From 11e341e1368dd9b36f0858a2b73b08479bae86e6 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
+
+---
+ tests/aux_test.py | 2 ++
+ tests/cal_display_test.py | 1 +
+ tests/khalendar_aux_test.py | 4 ++++
+ tests/ui/test_calendarwidget.py | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/tests/aux_test.py b/tests/aux_test.py
+index 2f86652..6962cf3 100644
+--- a/tests/aux_test.py
++++ b/tests/aux_test.py
+@@ -376,6 +376,7 @@ def test_description_and_location():
+ assert _replace_uid(event).to_ical() == vevent
+
+
++ at pytest.mark.skip
+ def test_split_ics():
+ cal = _get_text('cal_lots_of_timezones')
+ vevents = aux.split_ics(cal)
+@@ -393,6 +394,7 @@ def test_split_ics():
+ assert sorted(vevents1) == sorted(part1)
+
+
++ at pytest.mark.skip
+ def test_split_ics_random_uid():
+ random.seed(123)
+ cal = _get_text('cal_lots_of_timezones')
+diff --git a/tests/cal_display_test.py b/tests/cal_display_test.py
+index 7950d90..6b4a51b 100644
+--- a/tests/cal_display_test.py
++++ b/tests/cal_display_test.py
+@@ -172,6 +172,7 @@ example_de_netbsd = [
+ '\x1b[1mM\xe4r.\x1b[0m27 28 29 1 2 3 4 ']
+
+
++ at pytest.mark.skip
+ def test_vertical_month():
+ locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+ vert_str = vertical_month(month=12, year=2011,
+diff --git a/tests/khalendar_aux_test.py b/tests/khalendar_aux_test.py
+index 363c4c5..1a7c21e 100644
+--- a/tests/khalendar_aux_test.py
++++ b/tests/khalendar_aux_test.py
+@@ -1,6 +1,7 @@
+ from datetime import date, datetime, timedelta
+ import icalendar
+ import pytz
++import pytest
+
+ from khal.khalendar import aux
+
+@@ -314,6 +315,7 @@ class TestExpand(object):
+ for start, _ in dtstart] == self.offset_berlin
+ assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
+
++ @pytest.mark.skip
+ def test_expand_dtb(self):
+ vevent = _get_vevent(event_dtb)
+ dtstart = aux.expand(vevent, berlin)
+@@ -385,6 +387,7 @@ class TestExpandNoRR(object):
+ for start, _ in dtstart] == self.offset_berlin
+ assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
+
++ @pytest.mark.skip
+ def test_expand_dtb(self):
+ vevent = _get_vevent(event_dtb_norr)
+ dtstart = aux.expand(vevent, berlin)
+@@ -591,6 +594,7 @@ class TestSpecial(object):
+ assert dtstart[0][0] == date(2009, 10, 31)
+ assert dtstart[-1][0] == date(2037, 10, 31)
+
++ @pytest.mark.skip
+ def test_another_problem(self):
+ vevent = _get_vevent(another_problem)
+ dtstart = aux.expand(vevent, berlin)
+diff --git a/tests/ui/test_calendarwidget.py b/tests/ui/test_calendarwidget.py
+index 25cc58a..123b2f9 100644
+--- a/tests/ui/test_calendarwidget.py
++++ b/tests/ui/test_calendarwidget.py
+@@ -1,6 +1,7 @@
+ from datetime import date, timedelta
+
+ from freezegun import freeze_time
++import pytest
+
+ from khal.ui.calendarwidget import CalendarWidget
+
+@@ -36,6 +37,7 @@ def test_set_focus_date():
+ assert frame.focus_date == day
+
+
++ at pytest.mark.skip
+ def test_set_focus_date_weekstart_6():
+
+ with freeze_time('2016-04-10'):
+--
+2.1.4
+
Deleted: packages/khal/tags/1:0.8.4-4/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-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,47 +0,0 @@
-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/6] Avoid privacy breach in sphinx doc
-
----
- doc/source/conf.py | 10 +++++-----
- doc/source/index.rst | 2 --
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 8e37071..0f94c3f 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -180,11 +180,11 @@ html_theme = 'alabaster'
- # Theme options are theme-specific and customize the look and feel of a theme
- # further. For a list of options available for each theme, see the
- # documentation.
--html_theme_options = {
-- 'github_user': 'pimutils',
-- 'github_repo': 'khal',
-- 'travis_button': 'true',
--}
-+#html_theme_options = {
-+# 'github_user': 'pimutils',
-+# 'github_repo': 'khal',
-+# 'travis_button': 'true',
-+#}
-
- # Add any paths that contain custom themes here, relative to this directory.
- #html_theme_path = []
-diff --git a/doc/source/index.rst b/doc/source/index.rst
-index 5b90dee..8e684e0 100644
---- a/doc/source/index.rst
-+++ b/doc/source/index.rst
-@@ -4,8 +4,6 @@ khal
- *Khal* is a standards based CLI (console) calendar program, able to synchronize
- with CalDAV_ servers through vdirsyncer_.
-
--.. image:: http://lostpackets.de/images/khal.png
--
- Features
- --------
- (or rather: limitations)
---
-2.11.0
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch (from rev 13993, packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,47 @@
+From 1288b417a1925a57a7238d85ae7032e15c196440 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
+
+---
+ doc/source/conf.py | 10 +++++-----
+ doc/source/index.rst | 2 --
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 54b4002..82062ca 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -108,11 +108,11 @@ html_theme = 'alabaster'
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
+ # documentation.
+-html_theme_options = {
+- 'github_user': 'pimutils',
+- 'github_repo': 'khal',
+- 'travis_button': 'true',
+-}
++#html_theme_options = {
++# 'github_user': 'pimutils',
++# 'github_repo': 'khal',
++# 'travis_button': 'true',
++#}
+
+ # Add any paths that contain custom themes here, relative to this directory.
+ #html_theme_path = []
+diff --git a/doc/source/index.rst b/doc/source/index.rst
+index e4418c1..38d0bd7 100644
+--- a/doc/source/index.rst
++++ b/doc/source/index.rst
+@@ -4,8 +4,6 @@ khal
+ *Khal* is a standards based CLI (console) calendar program, able to synchronize
+ with CalDAV_ servers through vdirsyncer_.
+
+-.. image:: http://lostpackets.de/images/khal.png
+-
+ Features
+ --------
+ (or rather: limitations)
+--
+2.1.4
+
Deleted: packages/khal/tags/1:0.8.4-4/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 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,45 +0,0 @@
-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
-
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch (from rev 13993, packages/khal/trunk/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0006-Tolerate-occassionally-failing-update_db-related-tes.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,50 @@
+From a78b125eb4a449aa5c829f9344f00afc37b39a1e Mon Sep 17 00:00:00 2001
+From: Christian Geier <geier at lostpackets.de>
+Date: Sun, 18 Dec 2016 20:27:14 +0100
+Subject: [PATCH] Tolerate occassionally failing update_db-related tests
+
+It's not possible to backport fix forcing fsync from newer major release as it
+refactors most of code.
+---
+ tests/khalendar_test.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/khalendar_test.py b/tests/khalendar_test.py
+index fd8dcc6..761bed5 100644
+--- a/tests/khalendar_test.py
++++ b/tests/khalendar_test.py
+@@ -65,6 +65,7 @@ class TestCalendar(object):
+ else:
+ mtimes[cal] = mtime
+
++ @pytest.mark.xfail
+ def test_db_needs_update(self, coll_vdirs):
+ coll, vdirs = coll_vdirs
+
+@@ -221,6 +222,7 @@ class TestCollection(object):
+ assert len(events) == 1
+ assert events[0].calendar == cal2
+
++ @pytest.mark.xfail
+ def test_update_event(self, coll_vdirs):
+ """updating one event"""
+ coll, vdirs = coll_vdirs
+@@ -321,6 +323,7 @@ class TestDbCreation(object):
+ CalendarCollection(calendars, dbpath=dbpath, locale=aux.locale)
+
+
++ at pytest.mark.xfail
+ def test_default_calendar(coll_vdirs):
+ """test if an update to the vdir is detected by the CalendarCollection"""
+ coll, vdirs = coll_vdirs
+@@ -341,6 +344,7 @@ def test_default_calendar(coll_vdirs):
+ assert len(list(coll.get_events_on(today))) == 0
+
+
++ at pytest.mark.xfail
+ def test_only_update_old_event(coll_vdirs, monkeypatch):
+ coll, vdirs = coll_vdirs
+
+--
+2.11.0
+
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch (from rev 13993, packages/khal/trunk/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,45 @@
+From 5953d313fa9bc4f48ffaa4f941f665a32dce62b3 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 7/7] 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 121efc2..107acc0 100644
+--- a/tests/event_test.py
++++ b/tests/event_test.py
+@@ -246,6 +246,7 @@ def test_event_dt_long():
+ assert event.event_description == '09.04.2014 09:30 - 12.04.2014 10:30: An Event'
+
+
++ at pytest.mark.xfail
+ def test_event_no_dst():
+ """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 cf20eb0..89c369e 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():
+ vbogota = [b'BEGIN:VTIMEZONE',
+ b'TZID:America/Bogota',
+--
+2.11.0
+
Deleted: packages/khal/tags/1:0.8.4-4/debian/patches/series
===================================================================
--- packages/khal/trunk/debian/patches/series 2017-04-28 08:08:03 UTC (rev 13979)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/series 2017-05-04 07:34:28 UTC (rev 13994)
@@ -1,6 +0,0 @@
-0001-No-RSS-news-in-docs.patch
-0002-Reference-license-from-copyright-file.patch
-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
Copied: packages/khal/tags/1:0.8.4-4/debian/patches/series (from rev 13993, packages/khal/trunk/debian/patches/series)
===================================================================
--- packages/khal/tags/1:0.8.4-4/debian/patches/series (rev 0)
+++ packages/khal/tags/1:0.8.4-4/debian/patches/series 2017-05-04 07:34:28 UTC (rev 13994)
@@ -0,0 +1,7 @@
+0001-No-RSS-news-in-docs.patch
+0002-Reference-license-from-copyright-file.patch
+0003-Fix-intersphinx-mapping.patch
+0004-Fix-tests-failing-due-to-timezone.patch
+0005-Avoid-privacy-breach-in-sphinx-doc.patch
+0006-Tolerate-occassionally-failing-update_db-related-tes.patch
+0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
More information about the Python-apps-commits
mailing list