sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into next

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2020-06-10 21:10:02 +02:00
commit 14deb20ce5
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -35,7 +35,6 @@
}, },
{ {
"env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ", "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
"if": "NOT (type IN (pull_request))",
"python": "3.7" "python": "3.7"
}, },
{ {

12
docs/packaging.rst
View file

@ -15,13 +15,19 @@ Obtaining the source code
The main distribution channel is `PyPI The main distribution channel is `PyPI
<https://pypi.python.org/pypi/vdirsyncer>`_, and source tarballs can be <https://pypi.python.org/pypi/vdirsyncer>`_, and source tarballs can be
obtained there. Do not use the ones from GitHub: Their tarballs contain useless obtained there. We mirror the same package tarball and wheel as GitHub
junk and are more of a distraction than anything else. releases. Please do not confuse these with the auto-generated GitHub "Source
Code" tarball; that one contains useless junk and are more of a distraction
than anything else.
I give each release a tag in the git repo. If you want to get notified of new We give each release a tag in the git repo. If you want to get notified of new
releases, `GitHub's feed releases, `GitHub's feed
<https://github.com/pimutils/vdirsyncer/releases.atom>`_ is a good way. <https://github.com/pimutils/vdirsyncer/releases.atom>`_ is a good way.
Tags will be signed by the maintainer who is doing the release (starting with
0.16.8), and generation of the tarball and wheel is done by CI. Hence, only the
tag itself is signed.
Dependency versions Dependency versions
=================== ===================

3
scripts/make_travisconf.py
View file

@ -60,8 +60,7 @@ for python, requirements in itertools.product(
f"REQUIREMENTS={requirements} ") f"REQUIREMENTS={requirements} ")
} }
build_prs = dav_server not in ("fastmail", "davical", "icloud") if dav_server in ("davical", "icloud"):
if not build_prs:
job['if'] = 'NOT (type IN (pull_request))' job['if'] = 'NOT (type IN (pull_request))'
matrix.append(job) matrix.append(job)

2
tests/storage/dav/test_caldav.py
View file

@ -132,6 +132,8 @@ class TestCalDAVStorage(DAVStorageTests):
@pytest.mark.skipif(dav_server == 'icloud', @pytest.mark.skipif(dav_server == 'icloud',
reason='iCloud only accepts VEVENT') reason='iCloud only accepts VEVENT')
@pytest.mark.skipif(dav_server == 'fastmail',
reason='Fastmail has non-standard hadling of VTODOs.')
def test_item_types_general(self, s): def test_item_types_general(self, s):
event = s.upload(format_item(EVENT_TEMPLATE))[0] event = s.upload(format_item(EVENT_TEMPLATE))[0]
task = s.upload(format_item(TASK_TEMPLATE))[0] task = s.upload(format_item(TASK_TEMPLATE))[0]