[Python-apps-commits] r13641 - in packages/vdirsyncer/trunk/debian (8 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Mon Oct 31 13:59:56 UTC 2016
Date: Monday, October 31, 2016 @ 13:59:54
Author: fpytloun-guest
Revision: 13641
[svn-inject] Applying Debian modifications (0.14.0-1) to trunk
Added:
packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch
packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
Modified:
packages/vdirsyncer/trunk/debian/changelog
packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch
packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch
packages/vdirsyncer/trunk/debian/patches/series
Deleted:
packages/vdirsyncer/trunk/debian/patches/0003-Skip-ssl-tests.patch
packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-health-check.patch
Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/changelog 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,3 +1,9 @@
+vdirsyncer (0.14.0-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 31 Oct 2016 14:32:37 +0100
+
vdirsyncer (0.12.1-1) unstable; urgency=medium
* new upstream version
Modified: packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,17 +1,25 @@
-From d19dcd0d478714ebfc541f68081566de967e0b7f Mon Sep 17 00:00:00 2001
+From 0c7227f42c25525f3029da0086b94597b318361c Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 11 Aug 2016 14:19:03 +0200
-Subject: Don't use subtest
+Date: Mon, 31 Oct 2016 14:40:47 +0100
+Subject: [PATCH 1/4] Don't use subtest
---
- tests/cli/test_sync.py | 105 -------------------------------------------------
- 1 file changed, 105 deletions(-)
+ tests/cli/test_sync.py | 68 --------------------------------------------------
+ 1 file changed, 68 deletions(-)
diff --git a/tests/cli/test_sync.py b/tests/cli/test_sync.py
-index a93951d..6251ea8 100644
+index f30670b..5a8ed4e 100644
--- a/tests/cli/test_sync.py
+++ b/tests/cli/test_sync.py
-@@ -272,111 +272,6 @@ def test_multiple_pairs(tmpdir, runner):
+@@ -5,7 +5,6 @@ import sys
+ import unicodedata
+ from textwrap import dedent
+
+-import hypothesis.strategies as st
+ from hypothesis import example, given
+
+ import pytest
+@@ -271,73 +270,6 @@ def test_multiple_pairs(tmpdir, runner):
assert not result.exception
@@ -20,7 +28,6 @@
- st.characters(
- blacklist_characters=set(
- u'./\x00' # Invalid chars on POSIX filesystems
-- + (u';' if PY2 else u'') # https://bugs.python.org/issue16374
- ),
- # Surrogates can't be encoded to utf-8 in Python
- blacklist_categories=set(['Cs'])
@@ -31,33 +38,33 @@
- min_size=1
-))
- at example(collections=[u'persönlich'])
+- at example(collections=set('aA'))
-def test_create_collections(subtest, collections):
-- collections = set(to_native(x, 'utf-8') for x in collections)
-
- @subtest
- def test_inner(tmpdir, runner):
- runner.write_with_general(dedent('''
- [pair foobar]
-- a = foo
-- b = bar
+- a = "foo"
+- b = "bar"
- collections = {colls}
-
- [storage foo]
-- type = filesystem
-- path = {base}/foo/
-- fileext = .txt
+- type = "filesystem"
+- path = "{base}/foo/"
+- fileext = ".txt"
-
- [storage bar]
-- type = filesystem
-- path = {base}/bar/
-- fileext = .txt
+- type = "filesystem"
+- path = "{base}/bar/"
+- fileext = ".txt"
- '''.format(base=str(tmpdir), colls=json.dumps(list(collections)))))
-
- result = runner.invoke(
- ['discover'],
- input='y\n' * 2 * (len(collections) + 1)
- )
-- assert not result.exception
+- assert not result.exception, result.output
-
- # Macs normally operate on the HFS+ file system which normalizes paths.
- # That is, if you save a file with accented é in it (u'\xe9') for
@@ -67,10 +74,12 @@
- #
- # Quoted from
- # https://stackoverflow.com/questions/18137554/how-to-convert-path-to-mac-os-x-path-the-almost-nfd-normal-form # noqa
-- u = lambda xs: set(
-- unicodedata.normalize('NFKD', to_unicode(x, 'utf-8'))
-- for x in xs
-- )
+- def u(xs):
+- xs = (unicodedata.normalize('NFKD', x) for x in xs)
+- if sys.platform == 'darwin':
+- xs = (x.lower() for x in xs)
+- return set(xs)
+-
- assert u(x.basename for x in tmpdir.join('foo').listdir()) == \
- u(x.basename for x in tmpdir.join('bar').listdir()) == \
- u(collections)
@@ -78,48 +87,12 @@
- result = runner.invoke(
- ['sync'] + ['foobar/' + x for x in collections]
- )
-- assert not result.exception
+- assert not result.exception, result.output
-
-
--def test_ident_conflict(tmpdir, runner):
-- runner.write_with_general(dedent('''
-- [pair foobar]
-- a = foo
-- b = bar
-- collections = null
--
-- [storage foo]
-- type = filesystem
-- path = {base}/foo/
-- fileext = .txt
--
-- [storage bar]
-- type = filesystem
-- path = {base}/bar/
-- fileext = .txt
-- '''.format(base=str(tmpdir))))
--
-- foo = tmpdir.mkdir('foo')
-- tmpdir.mkdir('bar')
--
-- foo.join('one.txt').write('UID:1')
-- foo.join('two.txt').write('UID:1')
-- foo.join('three.txt').write('UID:1')
--
-- result = runner.invoke(['discover'])
-- assert not result.exception
--
-- result = runner.invoke(['sync'])
-- assert result.exception
-- assert ('error: foobar: Storage "foo" contains multiple items with the '
-- 'same UID or even content') in result.output
-- assert sorted([
-- 'one.txt' in result.output,
-- 'two.txt' in result.output,
-- 'three.txt' in result.output,
-- ]) == [False, True, True]
--
--
- @pytest.mark.parametrize('existing,missing', [
- ('foo', 'bar'),
- ('bar', 'foo'),
+ def test_ident_conflict(tmpdir, runner):
+ runner.write_with_general(dedent('''
+ [pair foobar]
+--
+2.1.4
+
Modified: packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,7 +1,7 @@
-From fb8bfa5fb6d4f40d3be29e6e8a9bde1de60ae603 Mon Sep 17 00:00:00 2001
+From 76db0343cbdd6b48dabcaecee255b28d30c838a6 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Thu, 11 Aug 2016 14:35:29 +0200
-Subject: Include license from copyright file
+Subject: [PATCH 2/4] Include license from copyright file
---
docs/license.rst | 2 +-
@@ -17,3 +17,6 @@
-.. include:: ../LICENSE
+.. literalinclude:: /usr/share/doc/vdirsyncer-doc/copyright
+--
+2.1.4
+
Added: packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -0,0 +1,32 @@
+From c758b0d86679aecfcd58750fe22c49696023cab2 Mon Sep 17 00:00:00 2001
+From: Filip Pytloun <filip at pytloun.cz>
+Date: Mon, 31 Oct 2016 14:42:00 +0100
+Subject: [PATCH 3/4] Skip SSL tests
+
+---
+ tests/utils/test_main.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py
+index 6e84846..cd5da79 100644
+--- a/tests/utils/test_main.py
++++ b/tests/utils/test_main.py
+@@ -29,6 +29,7 @@ def test_get_storage_init_args():
+ assert not required
+
+
++ at pytest.mark.skip(reason="See TODO.Debian")
+ def test_request_ssl(httpsserver):
+ httpsserver.serve_content('') # we need to serve something
+
+@@ -45,6 +46,7 @@ def _fingerprints_broken():
+ return broken_urllib3
+
+
++ at pytest.mark.skip(reason="See TODO.Debian")
+ @pytest.mark.skipif(_fingerprints_broken(),
+ reason='https://github.com/shazow/urllib3/issues/529')
+ @pytest.mark.parametrize('fingerprint', [
+--
+2.1.4
+
Deleted: packages/vdirsyncer/trunk/debian/patches/0003-Skip-ssl-tests.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0003-Skip-ssl-tests.patch 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/patches/0003-Skip-ssl-tests.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,29 +0,0 @@
-From 8ecb18e7e35d5325cb64798a3894a17b893979a2 Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 11 Aug 2016 14:20:36 +0200
-Subject: Skip ssl tests
-
----
- tests/utils/test_main.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py
-index 1790f2a..1601484 100644
---- a/tests/utils/test_main.py
-+++ b/tests/utils/test_main.py
-@@ -31,6 +31,7 @@ def test_get_storage_init_args():
- assert not required
-
-
-+ at pytest.mark.skip(reason="See TODO.Debian")
- def test_request_ssl(httpsserver):
- httpsserver.serve_content('') # we need to serve something
-
-@@ -50,6 +51,7 @@ def _fingerprints_broken():
- return broken_urllib3 and not tolerant_python
-
-
-+ at pytest.mark.skip(reason="See TODO.Debian")
- @pytest.mark.skipif(_fingerprints_broken(),
- reason='https://github.com/shazow/urllib3/issues/529')
- @pytest.mark.parametrize('fingerprint', [
Deleted: packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-health-check.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-health-check.patch 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-health-check.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,31 +0,0 @@
-From ee88afee6ad18219ef3d5fd579e8fd3073d8acb5 Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 25 Aug 2016 18:24:24 +0200
-Subject: Suppress HealthCheck.too_slow health check
-
-To fix tests on slow platforms like armhf
----
- tests/test_metasync.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_metasync.py b/tests/test_metasync.py
-index bccc779..02a2397 100644
---- a/tests/test_metasync.py
-+++ b/tests/test_metasync.py
-@@ -1,7 +1,7 @@
- # -*- coding: utf-8 -*-
-
- import hypothesis.strategies as st
--from hypothesis import example, given
-+from hypothesis import example, given, settings
-
- import pytest
-
-@@ -93,6 +93,7 @@ values = st.text().filter(lambda x: normalize_meta_value(x) == x)
- metadata = st.dictionaries(keys, values)
-
-
-+ at settings(suppress_health_check=["HealthCheck.too_slow"])
- @given(
- a=metadata, b=metadata,
- status=metadata, keys=st.sets(keys),
Added: packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch 2016-10-31 13:59:54 UTC (rev 13641)
@@ -0,0 +1,123 @@
+From b8b8d0efa570faa7d04425d7b964cea25dd6c860 Mon Sep 17 00:00:00 2001
+From: Filip Pytloun <filip at pytloun.cz>
+Date: Mon, 31 Oct 2016 14:51:50 +0100
+Subject: [PATCH 4/4] Suppress HealthCheck.too_slow to fix build on slow
+ platforms
+
+---
+ tests/cli/test_discover.py | 3 ++-
+ tests/cli/test_fetchparams.py | 3 ++-
+ tests/storage/__init__.py | 3 ++-
+ tests/test_metasync.py | 3 ++-
+ tests/test_repair.py | 4 ++--
+ 5 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tests/cli/test_discover.py b/tests/cli/test_discover.py
+index 6355232..d9368ea 100644
+--- a/tests/cli/test_discover.py
++++ b/tests/cli/test_discover.py
+@@ -2,7 +2,7 @@ import json
+ from textwrap import dedent
+
+ import hypothesis.strategies as st
+-from hypothesis import given
++from hypothesis import given, settings
+
+ from vdirsyncer import exceptions
+ from vdirsyncer.storage.base import Storage
+@@ -177,6 +177,7 @@ def test_null_collection_with_named_collection(tmpdir, runner):
+
+
+ @given(a_requires=st.booleans(), b_requires=st.booleans())
++ at settings(suppress_health_check=["HealthCheck.too_slow"])
+ def test_collection_required(a_requires, b_requires, tmpdir, runner,
+ monkeypatch):
+
+diff --git a/tests/cli/test_fetchparams.py b/tests/cli/test_fetchparams.py
+index 8c010ba..8a08873 100644
+--- a/tests/cli/test_fetchparams.py
++++ b/tests/cli/test_fetchparams.py
+@@ -3,7 +3,7 @@
+ from textwrap import dedent
+
+ import hypothesis.strategies as st
+-from hypothesis import given
++from hypothesis import given, settings
+
+ import pytest
+
+@@ -90,6 +90,7 @@ def test_key_conflict(monkeypatch, mystrategy):
+
+
+ @given(s=st.text(), t=st.text(min_size=1))
++ at settings(suppress_health_check=["HealthCheck.too_slow"])
+ def test_fuzzing(s, t, mystrategy):
+ config = expand_fetch_params({
+ '{}.fetch'.format(s): ['mystrategy', t]
+diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
+index 0ec4b94..d23b85b 100644
+--- a/tests/storage/__init__.py
++++ b/tests/storage/__init__.py
+@@ -6,7 +6,7 @@ import textwrap
+ from urllib.parse import quote as urlquote, unquote as urlunquote
+
+ import hypothesis.strategies as st
+-from hypothesis import given
++from hypothesis import given, settings
+
+ import pytest
+
+@@ -283,6 +283,7 @@ class StorageTests(object):
+ st.none(),
+ printable_characters_strategy.filter(lambda x: x.strip() != x)
+ ))
++ @settings(suppress_health_check=["HealthCheck.too_slow"])
+ def test_metadata_normalization(self, requires_metadata, s, value):
+ x = s.get_meta('displayname')
+ assert x == normalize_meta_value(x)
+diff --git a/tests/test_metasync.py b/tests/test_metasync.py
+index bccc779..7a2da4c 100644
+--- a/tests/test_metasync.py
++++ b/tests/test_metasync.py
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+
+ import hypothesis.strategies as st
+-from hypothesis import example, given
++from hypothesis import example, given, settings
+
+ import pytest
+
+@@ -98,6 +98,7 @@ metadata = st.dictionaries(keys, values)
+ status=metadata, keys=st.sets(keys),
+ conflict_resolution=st.just('a wins') | st.just('b wins')
+ )
++ at settings(suppress_health_check=["HealthCheck.too_slow"])
+ @example(a={u'0': u'0'}, b={}, status={u'0': u'0'}, keys={u'0'},
+ conflict_resolution='a wins')
+ def test_fuzzing(a, b, status, keys, conflict_resolution):
+diff --git a/tests/test_repair.py b/tests/test_repair.py
+index 6d8f837..a692fb7 100644
+--- a/tests/test_repair.py
++++ b/tests/test_repair.py
+@@ -11,7 +11,7 @@ from . import uid_strategy
+
+
+ @given(uid=uid_strategy)
+- at settings(perform_health_check=False) # Using the random module for UIDs
++ at settings(perform_health_check=False, suppress_health_check=["HealthCheck.too_slow"]) # Using the random module for UIDs
+ def test_repair_uids(uid):
+ s = MemoryStorage()
+ s.items = {
+@@ -35,7 +35,7 @@ def test_repair_uids(uid):
+
+
+ @given(uid=uid_strategy.filter(lambda x: not href_safe(x)))
+- at settings(perform_health_check=False) # Using the random module for UIDs
++ at settings(perform_health_check=False, suppress_health_check=["HealthCheck.too_slow"]) # Using the random module for UIDs
+ def test_repair_unsafe_uids(uid):
+ s = MemoryStorage()
+ item = Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))
+--
+2.1.4
+
Modified: packages/vdirsyncer/trunk/debian/patches/series
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/series 2016-10-27 04:03:18 UTC (rev 13640)
+++ packages/vdirsyncer/trunk/debian/patches/series 2016-10-31 13:59:54 UTC (rev 13641)
@@ -1,4 +1,4 @@
0001-Don-t-use-subtest.patch
0002-Include-license-from-copyright-file.patch
-0003-Skip-ssl-tests.patch
-0004-Suppress-HealthCheck.too_slow-health-check.patch
+0003-Skip-SSL-tests.patch
+0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
More information about the Python-apps-commits
mailing list