[Python-apps-commits] r13932 - in packages/vdirsyncer/trunk/debian (10 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Mon Mar 27 07:53:26 UTC 2017
Date: Monday, March 27, 2017 @ 07:53:25
Author: fpytloun-guest
Revision: 13932
[svn-inject] Applying Debian modifications (0.14.1-1) to trunk
Modified:
packages/vdirsyncer/trunk/debian/TODO.Debian
packages/vdirsyncer/trunk/debian/changelog
packages/vdirsyncer/trunk/debian/control
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/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/series
packages/vdirsyncer/trunk/debian/rules
Deleted:
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-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/TODO.Debian 2017-03-27 07:53:25 UTC (rev 13932)
@@ -4,7 +4,7 @@
Following tests are failing and are disabled for now:
-tests/system/cli/test_sync.py
+tests/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-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/changelog 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,11 +1,10 @@
-vdirsyncer (0.15.0-1) experimental; urgency=low
+vdirsyncer (0.14.1-1) unstable; urgency=medium
- * New upstream release.
- * Add myself to uploaders.
- * d/patches: Rebased for new release.
- * Force building sphinx documentation with python3 version.
+ * New upstream release
+ * d/patches: drop 0005-Direct-users-to-Debian-BTS.patch as upstream docs
+ already covers Debian packages
- -- Jelmer Vernooij <jelmer at debian.org> Wed, 22 Mar 2017 02:00:10 +0000
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 27 Mar 2017 09:41:21 +0200
vdirsyncer (0.14.0-3) unstable; urgency=medium
Modified: packages/vdirsyncer/trunk/debian/control
===================================================================
--- packages/vdirsyncer/trunk/debian/control 2017-03-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/control 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,6 +1,6 @@
Source: vdirsyncer
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Filip Pytloun <filip at pytloun.cz>, Jelmer Vernooij <jelmer at debian.org>
+Uploaders: Filip Pytloun <filip at pytloun.cz>
Section: utils
Priority: optional
Build-Depends: debhelper (>= 10),
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-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,26 +1,26 @@
-From 0c7227f42c25525f3029da0086b94597b318361c Mon Sep 17 00:00:00 2001
+From e952d015f28441a703edbee4b26051145047ef0f Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Mon, 31 Oct 2016 14:40:47 +0100
Subject: [PATCH 1/4] Don't use subtest
---
- tests/system/cli/test_sync.py | 68 --------------------------------------------------
+ tests/cli/test_sync.py | 68 --------------------------------------------------
1 file changed, 68 deletions(-)
-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
+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
from textwrap import dedent
-import hypothesis.strategies as st
from hypothesis import example, given
import pytest
-@@ -269,98 +268,6 @@ def test_multiple_pairs(tmpdir, runner):
- ])
+@@ -271,73 +270,6 @@ def test_multiple_pairs(tmpdir, runner):
+ assert not result.exception
- at given(collections=st.sets(
@@ -38,8 +38,7 @@
- min_size=1
-))
- at example(collections=[u'persönlich'])
-- at example(collections={'a', 'A'})
-- at example(collections={'\ufffe'})
+- at example(collections=set('aA'))
-def test_create_collections(subtest, collections):
-
- @subtest
@@ -67,54 +66,33 @@
- )
- 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]
-- 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.11.0
+
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 2017-03-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,4 +1,4 @@
-From 76db0343cbdd6b48dabcaecee255b28d30c838a6 Mon Sep 17 00:00:00 2001
+From 82598e72b021eab12ba2e7fb0918788bf96052f7 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Thu, 11 Aug 2016 14:35:29 +0200
Subject: [PATCH 2/4] Include license from copyright file
@@ -18,5 +18,5 @@
-.. include:: ../LICENSE
+.. literalinclude:: /usr/share/doc/vdirsyncer-doc/copyright
--
-2.1.4
+2.11.0
Modified: packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch 2017-03-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,16 +1,16 @@
-From c758b0d86679aecfcd58750fe22c49696023cab2 Mon Sep 17 00:00:00 2001
+From a341ff03f0dcecead442e174b5d1a89775e68097 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/system/utils/test_main.py | 2 ++
+ tests/utils/test_main.py | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/tests/system/utils/test_main.py b/tests/utils/test_main.py
+diff --git a/tests/utils/test_main.py b/tests/utils/test_main.py
index 6e84846..cd5da79 100644
---- a/tests/system/utils/test_main.py
-+++ b/tests/system/utils/test_main.py
+--- 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
@@ -28,5 +28,5 @@
reason='https://github.com/shazow/urllib3/issues/529')
@pytest.mark.parametrize('fingerprint', [
--
-2.1.4
+2.11.0
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-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,21 +1,21 @@
-From b8b8d0efa570faa7d04425d7b964cea25dd6c860 Mon Sep 17 00:00:00 2001
+From e576980183561df6c06ff0ad546d2be489288a68 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/system/cli/test_discover.py | 3 ++-
- tests/system/cli/test_fetchparams.py | 3 ++-
+ tests/cli/test_discover.py | 3 ++-
+ tests/cli/test_fetchparams.py | 3 ++-
tests/storage/__init__.py | 3 ++-
- tests/unit/test_metasync.py | 3 ++-
- tests/unit/test_repair.py | 4 ++--
+ tests/test_metasync.py | 3 ++-
+ tests/test_repair.py | 4 ++--
5 files changed, 10 insertions(+), 6 deletions(-)
-diff --git a/tests/system/cli/test_discover.py b/tests/system/cli/test_discover.py
+diff --git a/tests/cli/test_discover.py b/tests/cli/test_discover.py
index 6355232..d9368ea 100644
---- a/tests/system/cli/test_discover.py
-+++ b/tests/system/cli/test_discover.py
+--- a/tests/cli/test_discover.py
++++ b/tests/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/system/cli/test_fetchparams.py b/tests/system/cli/test_fetchparams.py
-index 8c010ba..8a08873 100644
---- a/tests/system/cli/test_fetchparams.py
-+++ b/tests/system/cli/test_fetchparams.py
+diff --git a/tests/cli/test_fetchparams.py b/tests/cli/test_fetchparams.py
+index 8c010ba..b9af08e 100644
+--- a/tests/cli/test_fetchparams.py
++++ b/tests/cli/test_fetchparams.py
@@ -3,7 +3,7 @@
from textwrap import dedent
@@ -46,14 +46,14 @@
import pytest
-@@ -90,6 +90,7 @@ def test_key_conflict(monkeypatch, mystrategy):
+@@ -89,6 +89,7 @@ def test_key_conflict(monkeypatch, mystrategy):
+ assert 'Can\'t set foo.fetch and foo.' in str(excinfo.value)
+ at settings(suppress_health_check=["HealthCheck.too_slow"])
@given(s=st.text(), t=st.text(min_size=1))
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
@@ -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/unit/test_metasync.py b/tests/unit/test_metasync.py
+diff --git a/tests/test_metasync.py b/tests/test_metasync.py
index bccc779..7a2da4c 100644
---- a/tests/unit/test_metasync.py
-+++ b/tests/unit/test_metasync.py
+--- a/tests/test_metasync.py
++++ b/tests/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/unit/test_repair.py b/tests/unit/test_repair.py
-index 6d8f837..a692fb7 100644
---- a/tests/unit/test_repair.py
-+++ b/tests/unit/test_repair.py
+diff --git a/tests/test_repair.py b/tests/test_repair.py
+index 6a0d97a..10725b6 100644
+--- a/tests/test_repair.py
++++ b/tests/test_repair.py
@@ -11,7 +11,7 @@ from . import uid_strategy
@@ -119,5 +119,5 @@
s = MemoryStorage()
item = Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))
--
-2.1.4
+2.11.0
Deleted: 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-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/0005-Direct-users-to-Debian-BTS.patch 2017-03-27 07:53:25 UTC (rev 13932)
@@ -1,54 +0,0 @@
-From 1eb7764dfde4953a0a555ddd0c1c9c6f72961497 Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 5 Jan 2017 10:26:33 +0100
-Subject: [PATCH] Direct users to Debian BTS
-
----
- docs/contact.rst | 4 ++++
- docs/contributing.rst | 4 ++++
- vdirsyncer/__init__.py | 2 +-
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/docs/contact.rst b/docs/contact.rst
-index d4ad160..cb20591 100644
---- a/docs/contact.rst
-+++ b/docs/contact.rst
-@@ -6,6 +6,10 @@ Support and Contact
- 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
-+ testing latest upstream release!
-+
- * Open `a GitHub issue <https://github.com/pimutils/vdirsyncer/issues/>`_ for
- concrete bug reports and feature requests.
-
-diff --git a/docs/contributing.rst b/docs/contributing.rst
-index 4fab23c..44e82d3 100644
---- a/docs/contributing.rst
-+++ b/docs/contributing.rst
-@@ -43,6 +43,10 @@ further information.
- Reporting bugs
- --------------
-
-+* Use Debian `BTS <https://www.debian.org/Bugs/Reporting>`_ to report bugs
-+ against Debian stable versions. Do not use upstream bugtracker before
-+ testing latest upstream release!
-+
- * Make sure your problem isn't already listed in :doc:`problems`.
-
- * Make sure you have the absolutely latest version of vdirsyncer. For users of
-diff --git a/vdirsyncer/__init__.py b/vdirsyncer/__init__.py
-index 5943278..170aae3 100644
---- a/vdirsyncer/__init__.py
-+++ b/vdirsyncer/__init__.py
-@@ -6,7 +6,7 @@ Vdirsyncer synchronizes calendars and contacts.
- from __future__ import print_function
-
- PROJECT_HOME = 'https://github.com/pimutils/vdirsyncer'
--BUGTRACKER_HOME = PROJECT_HOME + '/issues'
-+BUGTRACKER_HOME = 'https://www.debian.org/Bugs/Reporting'
- DOCS_HOME = 'https://vdirsyncer.pimutils.org/en/stable'
-
- try:
Modified: packages/vdirsyncer/trunk/debian/patches/series
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/series 2017-03-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/patches/series 2017-03-27 07:53:25 UTC (rev 13932)
@@ -2,4 +2,3 @@
0002-Include-license-from-copyright-file.patch
0003-Skip-SSL-tests.patch
0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
-0005-Direct-users-to-Debian-BTS.patch
Modified: packages/vdirsyncer/trunk/debian/rules
===================================================================
--- packages/vdirsyncer/trunk/debian/rules 2017-03-26 15:53:47 UTC (rev 13931)
+++ packages/vdirsyncer/trunk/debian/rules 2017-03-27 07:53:25 UTC (rev 13932)
@@ -3,18 +3,16 @@
export PYBUILD_DESTDIR_python3=debian/vdirsyncer
export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/.hypothesis'
export PYBUILD_NAME=vdirsyncer
-export SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
-
%:
dh $@ --with python3,sphinxdoc --buildsystem=pybuild
override_dh_auto_build:
dh_auto_build
- PYTHONPATH=$(CURDIR) make -C docs man SPHINXBUILD=$(SPHINXBUILD)
+ PYTHONPATH=$(CURDIR) make -C docs man
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
- PYTHONPATH=. $(SPHINXBUILD) -b html docs $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html
+ PYTHONPATH=. sphinx-build -b html docs $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html
dh_sphinxdoc -O--buildsystem=python_distutils
# Remove unwanted license file, we already reference d/copyright
rm -f $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html/_sources/license.txt
More information about the Python-apps-commits
mailing list