[Python-apps-commits] r13541 - in packages/vdirsyncer/trunk (23 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Mon Aug 22 17:25:54 UTC 2016
Date: Monday, August 22, 2016 @ 17:25:53
Author: fpytloun-guest
Revision: 13541
[svn-inject] Applying Debian modifications (0.11.3-1) to trunk
Added:
packages/vdirsyncer/trunk/debian/
packages/vdirsyncer/trunk/debian/.git-dpm
packages/vdirsyncer/trunk/debian/TODO.Debian
packages/vdirsyncer/trunk/debian/changelog
packages/vdirsyncer/trunk/debian/compat
packages/vdirsyncer/trunk/debian/control
packages/vdirsyncer/trunk/debian/copyright
packages/vdirsyncer/trunk/debian/docs
packages/vdirsyncer/trunk/debian/install
packages/vdirsyncer/trunk/debian/manpages
packages/vdirsyncer/trunk/debian/patches/
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/series
packages/vdirsyncer/trunk/debian/rules
packages/vdirsyncer/trunk/debian/source/
packages/vdirsyncer/trunk/debian/source/format
packages/vdirsyncer/trunk/debian/source/options
packages/vdirsyncer/trunk/debian/tests/
packages/vdirsyncer/trunk/debian/tests/control
packages/vdirsyncer/trunk/debian/vdirsyncer-doc.doc-base
packages/vdirsyncer/trunk/debian/watch
Property changes on: packages/vdirsyncer/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/vdirsyncer/trunk/debian/.git-dpm
===================================================================
--- packages/vdirsyncer/trunk/debian/.git-dpm (rev 0)
+++ packages/vdirsyncer/trunk/debian/.git-dpm 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+8ecb18e7e35d5325cb64798a3894a17b893979a2
+8ecb18e7e35d5325cb64798a3894a17b893979a2
+3218c262064681dd46d49bf2997687aaa6bd5406
+3218c262064681dd46d49bf2997687aaa6bd5406
+vdirsyncer_0.11.3.orig.tar.gz
+186b8bb33954e67a3a16127f6478fb5ea458a688
+99414
Added: packages/vdirsyncer/trunk/debian/TODO.Debian
===================================================================
--- packages/vdirsyncer/trunk/debian/TODO.Debian (rev 0)
+++ packages/vdirsyncer/trunk/debian/TODO.Debian 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,14 @@
+
+Failing tests
+-------------
+
+Following tests are failing and are disabled for now:
+
+tests/cli/test_sync.py
+
+ fixture 'subtest' not found
+ would require to package pytest-subtesthack
+
+tests/utils/test_main.py test_request_ssl*
+
+ requests.exceptions.ProxyError: HTTPSConnectionPool(host='127.0.0.1', port=46025): Max retries exceeded with url: / (Caused by ProxyError('Cannot connect to proxy.', NewConnectionError('<requests.packages.urllib3.connection.VerifiedHTTPSConnection object at 0x7f8ca8d2bc18>: Failed to establish a new connection: [Errno 111] Connection refused',)))
Added: packages/vdirsyncer/trunk/debian/changelog
===================================================================
--- packages/vdirsyncer/trunk/debian/changelog (rev 0)
+++ packages/vdirsyncer/trunk/debian/changelog 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,5 @@
+vdirsyncer (0.11.3-1) unstable; urgency=low
+
+ * initial release (Closes: #745027)
+
+ -- Filip Pytloun <filip at pytloun.cz> Thu, 11 Aug 2016 14:25:28 +0200
Added: packages/vdirsyncer/trunk/debian/compat
===================================================================
--- packages/vdirsyncer/trunk/debian/compat (rev 0)
+++ packages/vdirsyncer/trunk/debian/compat 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1 @@
+9
Added: packages/vdirsyncer/trunk/debian/control
===================================================================
--- packages/vdirsyncer/trunk/debian/control (rev 0)
+++ packages/vdirsyncer/trunk/debian/control 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,53 @@
+Source: vdirsyncer
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Filip Pytloun <filip at pytloun.cz>
+Section: utils
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ dh-exec,
+ dh-python (>= 2.20160609~),
+ python3-all,
+ python3-atomicwrites (>= 0.1.7),
+ python3-click (>= 5.0),
+ python3-click-log (>= 0.1.3),
+ python3-click-threading (>= 0.2),
+ python3-hypothesis (>= 3.1),
+ python3-lxml,
+ python3-pytest,
+ python3-pytest-localserver,
+ python3-requests (>=2.4.1),
+ python3-requests-toolbelt (>= 0.4.0),
+ python3-setuptools,
+ python3-setuptools-scm,
+ python3-sphinx,
+ python3-sphinx-rtd-theme
+Standards-Version: 3.9.8
+Homepage: https://github.com/untitaker/vdirsyncer
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/vdirsyncer/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/vdirsyncer/trunk/
+
+Package: vdirsyncer
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: python3-requests-oauthlib
+Description: Synchronize calendars and contacts
+ Vdirsyncer synchronizes your calendars and addressbooks between two storages.
+ The most popular purpose is to synchronize a CalDAV/CardDAV server with a local
+ folder or file. The local data can then be accessed via a variety of programs,
+ none of which have to know or worry about syncing to a server.
+ .
+ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP.
+
+Package: vdirsyncer-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Synchronize calendars and contacts - documentation
+ Vdirsyncer synchronizes your calendars and addressbooks between two storages.
+ The most popular purpose is to synchronize a CalDAV/CardDAV server with a local
+ folder or file. The local data can then be accessed via a variety of programs,
+ none of which have to know or worry about syncing to a server.
+ .
+ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP.
+ .
+ This package contains the documentation for vdirsyncer.
Added: packages/vdirsyncer/trunk/debian/copyright
===================================================================
--- packages/vdirsyncer/trunk/debian/copyright (rev 0)
+++ packages/vdirsyncer/trunk/debian/copyright 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: vdirsyncer
+Source: https://github.com/untitaker/vdirsyncer
+
+Files: *
+Copyright: (c) 2014-2016 Markus Unterwaditzer & contributors
+License: Expat
+
+Files: debian/*
+Copyright: 2016 Filip Pytloun <filip at pytloun.cz>
+License: Expat
+
+License: Expat
+ 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.
Added: packages/vdirsyncer/trunk/debian/docs
===================================================================
--- packages/vdirsyncer/trunk/debian/docs (rev 0)
+++ packages/vdirsyncer/trunk/debian/docs 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1 @@
+README.rst
Added: packages/vdirsyncer/trunk/debian/install
===================================================================
--- packages/vdirsyncer/trunk/debian/install (rev 0)
+++ packages/vdirsyncer/trunk/debian/install 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec --with=install
+config.example => /usr/share/doc/vdirsyncer/examples/config
Property changes on: packages/vdirsyncer/trunk/debian/install
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/vdirsyncer/trunk/debian/manpages
===================================================================
--- packages/vdirsyncer/trunk/debian/manpages (rev 0)
+++ packages/vdirsyncer/trunk/debian/manpages 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1 @@
+docs/_build/man/vdirsyncer.1
Added: packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0001-Don-t-use-subtest.patch 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,125 @@
+From d19dcd0d478714ebfc541f68081566de967e0b7f 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
+
+---
+ tests/cli/test_sync.py | 105 -------------------------------------------------
+ 1 file changed, 105 deletions(-)
+
+diff --git a/tests/cli/test_sync.py b/tests/cli/test_sync.py
+index a93951d..6251ea8 100644
+--- a/tests/cli/test_sync.py
++++ b/tests/cli/test_sync.py
+@@ -272,111 +272,6 @@ def test_multiple_pairs(tmpdir, runner):
+ assert not result.exception
+
+
+- at given(collections=st.sets(
+- st.text(
+- 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'])
+- ),
+- min_size=1,
+- max_size=50
+- ),
+- min_size=1
+-))
+- at example(collections=[u'persönlich'])
+-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
+- collections = {colls}
+-
+- [storage foo]
+- type = filesystem
+- path = {base}/foo/
+- fileext = .txt
+-
+- [storage bar]
+- 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
+-
+- # 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
+- u = lambda xs: set(
+- unicodedata.normalize('NFKD', to_unicode(x, 'utf-8'))
+- for x in 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
+-
+-
+-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'),
Added: packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/0002-Include-license-from-copyright-file.patch 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,19 @@
+From fb8bfa5fb6d4f40d3be29e6e8a9bde1de60ae603 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
+
+---
+ docs/license.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/license.rst b/docs/license.rst
+index a9bbc81..1df0f2f 100644
+--- a/docs/license.rst
++++ b/docs/license.rst
+@@ -7,4 +7,4 @@ Credits and License
+ License
+ =======
+
+-.. include:: ../LICENSE
++.. literalinclude:: /usr/share/doc/vdirsyncer-doc/copyright
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-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,29 @@
+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', [
Added: packages/vdirsyncer/trunk/debian/patches/series
===================================================================
--- packages/vdirsyncer/trunk/debian/patches/series (rev 0)
+++ packages/vdirsyncer/trunk/debian/patches/series 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,3 @@
+0001-Don-t-use-subtest.patch
+0002-Include-license-from-copyright-file.patch
+0003-Skip-ssl-tests.patch
Added: packages/vdirsyncer/trunk/debian/rules
===================================================================
--- packages/vdirsyncer/trunk/debian/rules (rev 0)
+++ packages/vdirsyncer/trunk/debian/rules 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+export PYBUILD_DESTDIR_python3=debian/vdirsyncer
+export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/.hypothesis'
+export PYBUILD_NAME=vdirsyncer
+%:
+ dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_auto_build:
+ dh_auto_build
+ PYTHONPATH=$(CURDIR) make -C docs man
+
+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
+ 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
+endif
+
+override_dh_auto_test:
+ LC_ALL=C.UTF-8 \
+ DETERMINISTIC_TESTS=false \
+ CI=false \
+ REMOTESTORAGE_SERVER=skip \
+ DAV_SERVER=skip \
+ RADICALE_BACNEND=filesystem \
+ dh_auto_test
Property changes on: packages/vdirsyncer/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/vdirsyncer/trunk/debian/source/format
===================================================================
--- packages/vdirsyncer/trunk/debian/source/format (rev 0)
+++ packages/vdirsyncer/trunk/debian/source/format 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/vdirsyncer/trunk/debian/source/options
===================================================================
--- packages/vdirsyncer/trunk/debian/source/options (rev 0)
+++ packages/vdirsyncer/trunk/debian/source/options 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
Added: packages/vdirsyncer/trunk/debian/tests/control
===================================================================
--- packages/vdirsyncer/trunk/debian/tests/control (rev 0)
+++ packages/vdirsyncer/trunk/debian/tests/control 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,5 @@
+Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "import vdirsyncer; print(vdirsyncer)" ; done
+Depends: python3-all, vdirsyncer
+
+Test-Command: vdirsyncer --help
+Depends: vdirsyncer
Added: packages/vdirsyncer/trunk/debian/vdirsyncer-doc.doc-base
===================================================================
--- packages/vdirsyncer/trunk/debian/vdirsyncer-doc.doc-base (rev 0)
+++ packages/vdirsyncer/trunk/debian/vdirsyncer-doc.doc-base 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,9 @@
+Document: vdirsyncer-doc
+Title: Vdirsyncer Documentation
+Author: Markus Unterwaditzer
+Abstract: Sphinx documentation for Vdirsyncer
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/vdirsyncer-doc/html/index.html
+Files: /usr/share/doc/vdirsyncer-doc/html/*
Added: packages/vdirsyncer/trunk/debian/watch
===================================================================
--- packages/vdirsyncer/trunk/debian/watch (rev 0)
+++ packages/vdirsyncer/trunk/debian/watch 2016-08-22 17:25:53 UTC (rev 13541)
@@ -0,0 +1,3 @@
+version=3
+#opts=pgpsigurlmangle=s/$/.asc/ \
+https://pypi.debian.net/vdirsyncer/vdirsyncer-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Python-apps-commits
mailing list