[Python-apps-commits] r14162 - in packages/vdirsyncer/trunk/debian (6 files)

jelmer at users.alioth.debian.org jelmer at users.alioth.debian.org
Mon Jul 3 01:05:10 UTC 2017


    Date: Monday, July 3, 2017 @ 01:05:09
  Author: jelmer
Revision: 14162

Add myself to uploaders.

Modified:
  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/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/rules

Modified: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog	2017-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/changelog	2017-07-03 01:05:09 UTC (rev 14162)
@@ -1,6 +1,7 @@
 vdirsyncer (0.16.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Add myself to uploaders.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Mon, 03 Jul 2017 00:44:12 +0000
 

Modified: packages/vdirsyncer/trunk/debian/control
===================================================================
--- packages/vdirsyncer/trunk/debian/control	2017-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/control	2017-07-03 01:05:09 UTC (rev 14162)
@@ -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>
+Uploaders: Filip Pytloun <filip at pytloun.cz>, Jelmer Vernooij <jelmer at debian.org>
 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-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch	2017-07-03 01:05:09 UTC (rev 14162)
@@ -7,22 +7,16 @@
  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 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
+diff -ur vdirsyncer-0.16.0/tests/system/cli/test_sync.py vdirsyncer-0.16.0-patched/tests/system/cli/test_sync.py
+--- vdirsyncer-0.16.0/tests/system/cli/test_sync.py	2017-06-18 16:00:02.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/system/cli/test_sync.py	2017-07-03 00:46:37.868104879 +0000
+@@ -270,62 +270,6 @@
+     ])
  
--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
- 
- 
+-# XXX: https://github.com/pimutils/vdirsyncer/issues/617
+- at pytest.mark.skipif(sys.platform == 'darwin',
+-                    reason='This test inexplicably fails')
 - at given(collections=st.sets(
 -    st.text(
 -        st.characters(
@@ -38,7 +32,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 +61,16 @@
 -        )
 -        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.11.0
-
+Only in vdirsyncer-0.16.0-patched/tests/system/cli: test_sync.py~

Modified: packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch	2017-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/patches/0003-Skip-SSL-tests.patch	2017-07-03 01:05:09 UTC (rev 14162)
@@ -7,11 +7,10 @@
  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():
+diff -ur vdirsyncer-0.16.0/tests/system/utils/test_main.py vdirsyncer-0.16.0-patched/tests/system/utils/test_main.py
+--- vdirsyncer-0.16.0/tests/system/utils/test_main.py	2017-04-15 16:02:12.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/system/utils/test_main.py	2017-07-03 00:49:11.851209431 +0000
+@@ -25,6 +25,7 @@
      assert not required
  
  
@@ -19,7 +18,7 @@
  def test_request_ssl(httpsserver):
      httpsserver.serve_content('')  # we need to serve something
  
-@@ -45,6 +46,7 @@ def _fingerprints_broken():
+@@ -41,6 +42,7 @@
      return broken_urllib3
  
  
@@ -27,6 +26,3 @@
  @pytest.mark.skipif(_fingerprints_broken(),
                      reason='https://github.com/shazow/urllib3/issues/529')
  @pytest.mark.parametrize('fingerprint', [
--- 
-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-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch	2017-07-03 01:05:09 UTC (rev 14162)
@@ -12,11 +12,31 @@
  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
+diff -ur vdirsyncer-0.16.0/tests/storage/__init__.py vdirsyncer-0.16.0-patched/tests/storage/__init__.py
+--- vdirsyncer-0.16.0/tests/storage/__init__.py	2017-06-18 16:00:02.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/storage/__init__.py	2017-07-03 00:53:30.893700323 +0000
+@@ -7,7 +7,7 @@
+ 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
+ 
+@@ -301,6 +301,7 @@
+         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)
+Only in vdirsyncer-0.16.0-patched/tests/storage: __init__.py.orig
+diff -ur vdirsyncer-0.16.0/tests/system/cli/test_discover.py vdirsyncer-0.16.0-patched/tests/system/cli/test_discover.py
+--- vdirsyncer-0.16.0/tests/system/cli/test_discover.py	2017-02-24 17:22:44.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/system/cli/test_discover.py	2017-07-03 00:54:01.749520344 +0000
+@@ -2,7 +2,7 @@
  from textwrap import dedent
  
  import hypothesis.strategies as st
@@ -25,7 +45,7 @@
  
  from vdirsyncer import exceptions
  from vdirsyncer.storage.base import Storage
-@@ -177,6 +177,7 @@ def test_null_collection_with_named_collection(tmpdir, runner):
+@@ -177,6 +177,7 @@
  
  
  @given(a_requires=st.booleans(), b_requires=st.booleans())
@@ -33,10 +53,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
-index 8c010ba..b9af08e 100644
---- a/tests/cli/test_fetchparams.py
-+++ b/tests/cli/test_fetchparams.py
+Only in vdirsyncer-0.16.0-patched/tests/system/cli: test_discover.py~
+diff -ur vdirsyncer-0.16.0/tests/system/cli/test_fetchparams.py vdirsyncer-0.16.0-patched/tests/system/cli/test_fetchparams.py
+--- vdirsyncer-0.16.0/tests/system/cli/test_fetchparams.py	2017-02-24 17:22:44.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/system/cli/test_fetchparams.py	2017-07-03 00:53:30.893700323 +0000
 @@ -3,7 +3,7 @@
  from textwrap import dedent
  
@@ -46,7 +66,7 @@
  
  import pytest
  
-@@ -89,6 +89,7 @@ def test_key_conflict(monkeypatch, mystrategy):
+@@ -89,6 +89,7 @@
      assert 'Can\'t set foo.fetch and foo.' in str(excinfo.value)
  
  
@@ -54,31 +74,10 @@
  @given(s=st.text(), t=st.text(min_size=1))
  def test_fuzzing(s, t, mystrategy):
      config = expand_fetch_params({
-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
+Only in vdirsyncer-0.16.0-patched/tests/unit/cli: test_discover.py.orig
+diff -ur vdirsyncer-0.16.0/tests/unit/test_metasync.py vdirsyncer-0.16.0-patched/tests/unit/test_metasync.py
+--- vdirsyncer-0.16.0/tests/unit/test_metasync.py	2017-06-18 16:00:02.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/unit/test_metasync.py	2017-07-03 00:53:30.893700323 +0000
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8 -*-
  
@@ -88,19 +87,19 @@
  
  import pytest
  
-@@ -98,6 +98,7 @@ metadata = st.dictionaries(keys, values)
+@@ -130,6 +130,7 @@
      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 6a0d97a..10725b6 100644
---- a/tests/test_repair.py
-+++ b/tests/test_repair.py
-@@ -11,7 +11,7 @@ from . import uid_strategy
+ @example(a={'0': '0'}, b={'0': '1'}, status={'0': '0'}, keys={'0'},
+Only in vdirsyncer-0.16.0-patched/tests/unit: test_metasync.py.orig
+diff -ur vdirsyncer-0.16.0/tests/unit/test_repair.py vdirsyncer-0.16.0-patched/tests/unit/test_repair.py
+--- vdirsyncer-0.16.0/tests/unit/test_repair.py	2017-04-15 16:02:12.000000000 +0000
++++ vdirsyncer-0.16.0-patched/tests/unit/test_repair.py	2017-07-03 00:53:30.893700323 +0000
+@@ -11,7 +11,7 @@
  
  
  @given(uid=uid_strategy)
@@ -109,7 +108,7 @@
  def test_repair_uids(uid):
      s = MemoryStorage()
      s.items = {
-@@ -35,7 +35,7 @@ def test_repair_uids(uid):
+@@ -35,7 +35,7 @@
  
  
  @given(uid=uid_strategy.filter(lambda x: not href_safe(x)))
@@ -118,6 +117,3 @@
  def test_repair_unsafe_uids(uid):
      s = MemoryStorage()
      item = Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))
--- 
-2.11.0
-

Modified: packages/vdirsyncer/trunk/debian/rules
===================================================================
--- packages/vdirsyncer/trunk/debian/rules	2017-07-03 01:04:20 UTC (rev 14161)
+++ packages/vdirsyncer/trunk/debian/rules	2017-07-03 01:05:09 UTC (rev 14162)
@@ -8,11 +8,11 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=$(CURDIR) make -C docs man
+	PYTHONPATH=$(CURDIR) make -C docs man SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. sphinx-build -b html docs $(CURDIR)/debian/vdirsyncer-doc/usr/share/doc/vdirsyncer-doc/html
+	PYTHONPATH=. /usr/share/sphinx/scripts/python3/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