From 1031b073496b820db65efcb1833dc7d11cd889ab Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Tue, 9 Jun 2020 17:02:40 +0200 Subject: [PATCH 1/2] Fix test failures that ONLY happen on master --- .travis.yml | 1 - scripts/make_travisconf.py | 3 +-- tests/storage/dav/test_caldav.py | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e12bc0c..59a2f35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,6 @@ }, { "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ", - "if": "NOT (type IN (pull_request))", "python": "3.6" }, { diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py index 07f4342..8a2d630 100755 --- a/scripts/make_travisconf.py +++ b/scripts/make_travisconf.py @@ -64,8 +64,7 @@ for python, requirements in itertools.product( if python == '3.5': job['dist'] = 'trusty' - 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) diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py index 1d3f2fa..b999e25 100644 --- a/tests/storage/dav/test_caldav.py +++ b/tests/storage/dav/test_caldav.py @@ -133,6 +133,8 @@ class TestCalDAVStorage(DAVStorageTests): @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] From 5eef4b1ba1ea6cecf7fd546ad46aff809f50c09c Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Wed, 10 Jun 2020 16:42:35 +0200 Subject: [PATCH 2/2] Document GH Releases and signing --- docs/packaging.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/packaging.rst b/docs/packaging.rst index 67a29e3..4089f82 100644 --- a/docs/packaging.rst +++ b/docs/packaging.rst @@ -15,13 +15,19 @@ Obtaining the source code The main distribution channel is `PyPI `_, 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 `_ 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 ===================