From b1cddde63599c6b67a6ba872a1dd38c54d353e95 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 18 Jan 2018 23:18:42 +0100 Subject: [PATCH] Remove baikal and owncloud from docs, see #489 --- Makefile | 2 +- config.example | 4 ++-- docs/partial-sync.rst | 4 ---- docs/tutorial.rst | 9 +++++---- docs/tutorials/nextcloud.rst | 6 +++--- setup.cfg | 2 +- tests/storage/__init__.py | 6 ++---- 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 2113b17..75e60a7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # See the documentation on how to run the tests: # https://vdirsyncer.pimutils.org/en/stable/contributing.html -# Which DAV server to run the tests against (radicale, xandikos, skip, owncloud, nextcloud, ...) +# Which DAV server to run the tests against (radicale, xandikos, skip, nextcloud, ...) export DAV_SERVER := skip # release (install release versions of dependencies) diff --git a/config.example b/config.example index 418bb95..527a0ab 100644 --- a/config.example +++ b/config.example @@ -43,7 +43,7 @@ fileext = ".vcf" [storage bob_contacts_remote] type = "carddav" -url = "https://owncloud.example.com/remote.php/carddav/" +url = "https://nextcloud.example.com/" #username = # The password can also be fetched from the system password storage, netrc or a # custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html @@ -65,6 +65,6 @@ fileext = ".ics" [storage bob_calendar_remote] type = "caldav" -url = "https://owncloud.example.com/remote.php/caldav/" +url = "https://nextcloud.example.com/" #username = #password = diff --git a/docs/partial-sync.rst b/docs/partial-sync.rst index bdedd1f..920bb68 100644 --- a/docs/partial-sync.rst +++ b/docs/partial-sync.rst @@ -66,7 +66,3 @@ For such purposes you can set the ``partial_sync`` parameter to ``ignore``:: partial_sync = ignore See :ref:`the config docs ` for more information. - -.. _nextCloud: https://nextcloud.com/ -.. _Baikal: http://sabre.io/baikal/ -.. _DAViCal: http://www.davical.org/ diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 7b22bc5..41045d2 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -53,7 +53,8 @@ pairs of storages should actually be synchronized is defined in :ref:`pair section `. This format is copied from OfflineIMAP, where storages are called repositories and pairs are called accounts. -The following example synchronizes ownCloud's addressbooks to ``~/.contacts/``:: +The following example synchronizes addressbooks from a :doc:`NextCloud` to +``~/.contacts/``:: [pair my_contacts] @@ -70,7 +71,7 @@ The following example synchronizes ownCloud's addressbooks to ``~/.contacts/``:: type = "carddav" # We can simplify this URL here as well. In theory it shouldn't matter. - url = "https://owncloud.example.com/remote.php/carddav/" + url = "https://nextcloud.example.com/" username = "bob" password = "asdf" @@ -162,13 +163,13 @@ let's switch to a different base example. This time we'll synchronize calendars: [storage my_calendars_remote] type = "caldav" - url = "https://owncloud.example.com/remote.php/caldav/" + url = "https://nextcloud.example.com/" username = "bob" password = "asdf" Run ``vdirsyncer discover`` for discovery. Then you can use ``vdirsyncer metasync`` to synchronize the ``color`` property between your local calendars -in ``~/.calendars/`` and your ownCloud. Locally the color is just represented +in ``~/.calendars/`` and your NextCloud. Locally the color is just represented as a file called ``color`` within the calendar folder. .. _collections_tutorial: diff --git a/docs/tutorials/nextcloud.rst b/docs/tutorials/nextcloud.rst index 3e8fcc9..3b4cc97 100644 --- a/docs/tutorials/nextcloud.rst +++ b/docs/tutorials/nextcloud.rst @@ -1,8 +1,8 @@ ========= -nextCloud +NextCloud ========= -Vdirsyncer is continuously tested against the latest version of nextCloud_:: +Vdirsyncer is continuously tested against the latest version of NextCloud_:: [storage cal] type = "caldav" @@ -17,4 +17,4 @@ Vdirsyncer is continuously tested against the latest version of nextCloud_:: - WebCAL-subscriptions can't be discovered by vdirsyncer. See `this relevant issue `_. -.. _nextCloud: https://nextcloud.com/ +.. _NextCloud: https://nextcloud.com/ diff --git a/setup.cfg b/setup.cfg index a0181d3..dc239ed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,5 +7,5 @@ addopts = --tb=short --duration 3 # E743: Ambiguous function definition ignore = E731, E743 select = C,E,F,W,B,B9 -exclude = .eggs/, tests/storage/servers/owncloud/, tests/storage/servers/nextcloud/, tests/storage/servers/baikal/, build/, vdirsyncer/_native* +exclude = .eggs/, tests/storage/servers/nextcloud/, build/, vdirsyncer/_native* application-package-names = tests,vdirsyncer diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index c93683f..cfe8e09 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -299,10 +299,8 @@ class StorageTests(object): x = s.get_meta('displayname') assert x == normalize_meta_value(x) - if not getattr(self, 'dav_server', None): - # ownCloud replaces "" with "unnamed" - s.set_meta('displayname', value) - assert s.get_meta('displayname') == normalize_meta_value(value) + s.set_meta('displayname', value) + assert s.get_meta('displayname') == normalize_meta_value(value) def test_recurring_events(self, s, item_type): if item_type != 'VEVENT':