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

Author: Hugo Osvaldo Barrera

.travis.yml

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

docs/packaging.rst

@@ -15,13 +15,19 @@ Obtaining the source code
 
 The main distribution channel is `PyPI
 <https://pypi.python.org/pypi/vdirsyncer>`_, and source tarballs can be
-obtained there. Do not use the ones from GitHub: Their tarballs contain useless
-junk and are more of a distraction than anything else.
+obtained there. We mirror the same package tarball and wheel as GitHub
+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
 <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
 ===================
 

scripts/make_travisconf.py

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

tests/storage/dav/test_caldav.py

@@ -132,6 +132,8 @@ def request(session, method, url, **kwargs):
 
     @pytest.mark.skipif(dav_server == 'icloud',
                         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):
         event = s.upload(format_item(EVENT_TEMPLATE))[0]
         task = s.upload(format_item(TASK_TEMPLATE))[0]