[Python-apps-commits] r13927 - in packages/vdirsyncer/trunk/debian (6 files)
jelmer at users.alioth.debian.org
jelmer at users.alioth.debian.org
Wed Mar 22 02:11:34 UTC 2017
Date: Wednesday, March 22, 2017 @ 02:11:33
Author: jelmer
Revision: 13927
d/patches: Rebased for new release.
Modified:
packages/vdirsyncer/trunk/debian/TODO.Debian
packages/vdirsyncer/trunk/debian/changelog
packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch
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
packages/vdirsyncer/trunk/debian/patches/0005-Direct-users-to-Debian-BTS.patch
Modified: packages/vdirsyncer/trunk/debian/TODO.Debian
===================================================================
--- packages/vdirsyncer/trunk/debian/TODO.Debian 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/TODO.Debian 2017-03-22 02:11:33 UTC (rev 13927)
@@ -4,7 +4,7 @@
Following tests are failing and are disabled for now:
-tests/cli/test_sync.py
+tests/system/cli/test_sync.py
fixture 'subtest' not found
would require to package pytest-subtesthack
Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/changelog 2017-03-22 02:11:33 UTC (rev 13927)
@@ -2,6 +2,7 @@
* New upstream release.
* Add myself to uploaders.
+ * d/patches: Rebased for new release.
-- Jelmer Vernooij <jelmer at debian.org> Wed, 22 Mar 2017 02:00:10 +0000
Modified: packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2017-03-22 02:11:33 UTC (rev 13927)
@@ -4,23 +4,23 @@
Subject: [PATCH 1/4] Don't use subtest
---
- tests/cli/test_sync.py | 68 --------------------------------------------------
+ tests/system/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 f30670b..5a8ed4e 100644
---- a/tests/cli/test_sync.py
-+++ b/tests/cli/test_sync.py
-@@ -5,7 +5,6 @@ import sys
- import unicodedata
+diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
+index c015367..a2dd0b9 100644
+--- a/tests/system/cli/test_sync.py
++++ b/tests/system/cli/test_sync.py
+@@ -3,7 +3,6 @@
+ import json
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
+@@ -269,98 +268,6 @@ def test_multiple_pairs(tmpdir, runner):
+ ])
- at given(collections=st.sets(
@@ -38,7 +38,8 @@
- min_size=1
-))
- at example(collections=[u'persönlich'])
-- at example(collections=set('aA'))
+- at example(collections={'a', 'A'})
+- at example(collections={'\ufffe'})
-def test_create_collections(subtest, collections):
-
- @subtest
@@ -66,33 +67,54 @@
- )
- 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
-- # example, and then do a os.listdir you will see that the filename got
-- # converted to u'e\u0301'. This is normal unicode NFD normalization
-- # that the Python unicodedata module can handle.
-- #
-- # Quoted from
-- # https://stackoverflow.com/questions/18137554/how-to-convert-path-to-mac-os-x-path-the-almost-nfd-normal-form # noqa
-- 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)
--
- result = runner.invoke(
- ['sync'] + ['foobar/' + x for x in collections]
- )
- assert not result.exception, result.output
-
+- assert set(x.basename for x in tmpdir.join('foo').listdir()) == \
+- set(x.basename for x in tmpdir.join('bar').listdir())
-
- def test_ident_conflict(tmpdir, runner):
- runner.write_with_general(dedent('''
- [pair foobar]
---
-2.1.4
-
+-
+-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'),
Modified: packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch 2017-03-22 02:11:33 UTC (rev 13927)
@@ -4,13 +4,13 @@
Subject: [PATCH 3/4] Skip SSL tests
---
- tests/utils/test_main.py | 2 ++
+ tests/system/utils/test_main.py | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py
+diff --git a/tests/system/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
+--- a/tests/system/utils/test_main.py
++++ b/tests/system/utils/test_main.py
@@ -29,6 +29,7 @@ def test_get_storage_init_args():
assert not required
Modified: 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 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch 2017-03-22 02:11:33 UTC (rev 13927)
@@ -5,17 +5,17 @@
platforms
---
- tests/cli/test_discover.py | 3 ++-
- tests/cli/test_fetchparams.py | 3 ++-
+ tests/system/cli/test_discover.py | 3 ++-
+ tests/system/cli/test_fetchparams.py | 3 ++-
tests/storage/__init__.py | 3 ++-
- tests/test_metasync.py | 3 ++-
- tests/test_repair.py | 4 ++--
+ tests/unit/test_metasync.py | 3 ++-
+ tests/unit/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
+diff --git a/tests/system/cli/test_discover.py b/tests/system/cli/test_discover.py
index 6355232..d9368ea 100644
---- a/tests/cli/test_discover.py
-+++ b/tests/cli/test_discover.py
+--- a/tests/system/cli/test_discover.py
++++ b/tests/system/cli/test_discover.py
@@ -2,7 +2,7 @@ import json
from textwrap import dedent
@@ -33,10 +33,10 @@
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
+diff --git a/tests/system/cli/test_fetchparams.py b/tests/system/cli/test_fetchparams.py
index 8c010ba..8a08873 100644
---- a/tests/cli/test_fetchparams.py
-+++ b/tests/cli/test_fetchparams.py
+--- a/tests/system/cli/test_fetchparams.py
++++ b/tests/system/cli/test_fetchparams.py
@@ -3,7 +3,7 @@
from textwrap import dedent
@@ -75,10 +75,10 @@
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
+diff --git a/tests/unit/test_metasync.py b/tests/unit/test_metasync.py
index bccc779..7a2da4c 100644
---- a/tests/test_metasync.py
-+++ b/tests/test_metasync.py
+--- a/tests/unit/test_metasync.py
++++ b/tests/unit/test_metasync.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
@@ -96,10 +96,10 @@
@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
+diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py
index 6d8f837..a692fb7 100644
---- a/tests/test_repair.py
-+++ b/tests/test_repair.py
+--- a/tests/unit/test_repair.py
++++ b/tests/unit/test_repair.py
@@ -11,7 +11,7 @@ from . import uid_strategy
Modified: packages/vdirsyncer/trunk/debian/patches/0005-Direct-users-to-Debian-BTS.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0005-Direct-users-to-Debian-BTS.patch 2017-03-22 02:01:54 UTC (rev 13926)
+++ packages/vdirsyncer/trunk/debian/patches/0005-Direct-users-to-Debian-BTS.patch 2017-03-22 02:11:33 UTC (rev 13927)
@@ -10,12 +10,12 @@
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/docs/contact.rst b/docs/contact.rst
-index 30c38ec..492b48a 100644
+index d4ad160..cb20591 100644
--- a/docs/contact.rst
+++ b/docs/contact.rst
@@ -6,6 +6,10 @@ Support and Contact
- your timezone. Use it for support and general (including off-topic)
- discussion.
+ might be active, depending on your timezone. Use it for support and general
+ (including off-topic) discussion.
+* Use Debian `BTS <https://www.debian.org/Bugs/Reporting>`_ to report bugs
+ against Debian stable versions. Do not use upstream bugtracker before
@@ -25,10 +25,10 @@
concrete bug reports and feature requests.
diff --git a/docs/contributing.rst b/docs/contributing.rst
-index bec000b..91580a3 100644
+index 4fab23c..44e82d3 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
-@@ -37,6 +37,10 @@ further information.
+@@ -43,6 +43,10 @@ further information.
Reporting bugs
--------------
@@ -38,9 +38,9 @@
+
* Make sure your problem isn't already listed in :doc:`problems`.
- * Make sure you have the latest version by executing ``pip install --user
+ * Make sure you have the absolutely latest version of vdirsyncer. For users of
diff --git a/vdirsyncer/__init__.py b/vdirsyncer/__init__.py
-index e658625..b94ec06 100644
+index 5943278..170aae3 100644
--- a/vdirsyncer/__init__.py
+++ b/vdirsyncer/__init__.py
@@ -6,7 +6,7 @@ Vdirsyncer synchronizes calendars and contacts.
@@ -52,6 +52,3 @@
DOCS_HOME = 'https://vdirsyncer.pimutils.org/en/stable'
try:
---
-2.1.4
-
More information about the Python-apps-commits
mailing list