Merge branch 'next'

Author: Hugo Osvaldo Barrera

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+      - id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
+      - id: end-of-file-fixer
+      - id: check-toml
+      - id: check-added-large-files
+      - id: debug-statements
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: "master" # pick a git hash / tag to point to
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-import-order, flake8-bugbear]

.travis.yml

@@ -2,6 +2,7 @@
   "branches": {
     "only": [
       "auto",
+      "next",
       "master",
       "/^.*-maintenance$/"
     ]
@@ -13,9 +14,6 @@
   },
   "install": [
     ". scripts/travis-install.sh",
-    "pip install -U pip setuptools",
-    "pip install wheel",
-    "make -e install-dev",
     "make -e install-$BUILD"
   ],
   "language": "python",

Makefile

@@ -71,7 +71,7 @@ install-servers:
 		(cd $(TESTSERVER_BASE)$$server && sh install.sh); \
 	done
 
-install-test: install-servers
+install-test: install-servers install-dev
 	pip install -Ur test-requirements.txt
 	set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \
 		pip install -U --force-reinstall \
@@ -81,9 +81,9 @@ install-test: install-servers
 	fi
 	[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
 
-install-style: install-docs
-	pip install -U flake8==3.5.0 flake8-import-order 'flake8-bugbear>=17.3.0' autopep8
-	
+install-style: install-docs install-dev
+	pip install -U flake8 flake8-import-order flake8-bugbear autopep8
+
 style:
 	flake8
 	! git grep -i syncroniz */*
@@ -114,6 +114,7 @@ release-deb:
 	sh scripts/release-deb.sh ubuntu zesty
 
 install-dev:
+	pip install -U pip setuptools wheel
 	pip install -e .
 	[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
 	set -xe && if [ "$(REQUIREMENTS)" = "devel" ]; then \

README.rst

@@ -2,6 +2,26 @@
 vdirsyncer
 ==========
 
+.. image:: https://travis-ci.org/pimutils/vdirsyncer.svg?branch=master
+  :target: https://travis-ci.org/pimutils/vdirsyncer
+  :alt: CI status
+
+.. image:: https://codecov.io/github/pimutils/vdirsyncer/coverage.svg?branch=master
+  :target: https://codecov.io/github/pimutils/vdirsyncer?branch=master
+  :alt: Codecov coverage report
+
+.. image:: https://readthedocs.org/projects/vdirsyncer/badge/
+  :target: https://vdirsyncer.rtfd.org/
+  :alt: documentation
+
+.. image:: https://img.shields.io/pypi/v/vdirsyncer.svg
+  :target: https://pypi.python.org/pypi/vdirsyncer
+  :alt: version on pypi
+
+.. image:: https://img.shields.io/pypi/l/vdirsyncer.svg
+  :target: https://github.com/pimutils/vdirsyncer/blob/master/LICENCE
+  :alt: licence: BSD
+
 - `Documentation <https://vdirsyncer.pimutils.org/en/stable/>`_
 - `Source code <https://github.com/pimutils/vdirsyncer>`_
 
@@ -20,15 +40,6 @@ It aims to be for calendars and contacts what `OfflineIMAP
 
 .. _programs: https://vdirsyncer.pimutils.org/en/latest/tutorials/
 
-.. image:: https://travis-ci.org/pimutils/vdirsyncer.svg?branch=master
-    :target: https://travis-ci.org/pimutils/vdirsyncer
-
-.. image:: https://codecov.io/github/pimutils/vdirsyncer/coverage.svg?branch=master
-    :target: https://codecov.io/github/pimutils/vdirsyncer?branch=master
-
-.. image:: https://badge.waffle.io/pimutils/vdirsyncer.svg?label=ready&title=Ready
-    :target: https://waffle.io/pimutils/vdirsyncer
-
 Links of interest
 =================
 

docs/changelog.rst

@@ -1 +1 @@
-.. include:: ../CHANGELOG.rst 
+.. include:: ../CHANGELOG.rst

docs/conf.py

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import os
 
-import setuptools_scm
+from pkg_resources import get_distribution
 
 extensions = ['sphinx.ext.autodoc']
 
@@ -12,11 +10,11 @@
 source_suffix = '.rst'
 master_doc = 'index'
 
-project = u'vdirsyncer'
-copyright = (u'2014-{}, Markus Unterwaditzer & contributors'
+project = 'vdirsyncer'
+copyright = ('2014-{}, Markus Unterwaditzer & contributors'
              .format(datetime.date.today().strftime('%Y')))
 
-release = setuptools_scm.get_version(root='..', relative_to=__file__)
+release = get_distribution('vdirsyncer').version
 version = '.'.join(release.split('.')[:2])  # The short X.Y version.
 
 rst_epilog = '.. |vdirsyncer_version| replace:: %s' % release
@@ -44,18 +42,18 @@
 
 latex_elements = {}
 latex_documents = [
-    ('index', 'vdirsyncer.tex', u'vdirsyncer Documentation',
-     u'Markus Unterwaditzer', 'manual'),
+    ('index', 'vdirsyncer.tex', 'vdirsyncer Documentation',
+     'Markus Unterwaditzer', 'manual'),
 ]
 
 man_pages = [
-    ('index', 'vdirsyncer', u'vdirsyncer Documentation',
-     [u'Markus Unterwaditzer'], 1)
+    ('index', 'vdirsyncer', 'vdirsyncer Documentation',
+     ['Markus Unterwaditzer'], 1)
 ]
 
 texinfo_documents = [
-    ('index', 'vdirsyncer', u'vdirsyncer Documentation',
-     u'Markus Unterwaditzer', 'vdirsyncer',
+    ('index', 'vdirsyncer', 'vdirsyncer Documentation',
+     'Markus Unterwaditzer', 'vdirsyncer',
      'Synchronize calendars and contacts.', 'Miscellaneous'),
 ]
 

docs/config.rst

@@ -286,7 +286,7 @@ Service to hardcode those into opensource software [googleterms]_:
 
 3. In the sidebar, select "Credentials" and create a new "OAuth Client ID". The
    application type is "Other".
-   
+
    You'll be prompted to create a OAuth consent screen first. Fill out that
    form however you like.
 
@@ -368,7 +368,7 @@ password. Neither are stored.
         secrets_dir = ...
         #server_path = ...
         #db_path = ...
-   
+
    :param email: The email address of your account.
    :param secrets_dir: A directory where vdirsyncer can store the encryption
                        key and authentication token.
@@ -386,7 +386,7 @@ password. Neither are stored.
         secrets_dir = ...
         #server_path = ...
         #db_path = ...
-   
+
     :param email: The email address of your account.
     :param secrets_dir: A directory where vdirsyncer can store the encryption
                         key and authentication token.

docs/keyring.rst

@@ -60,7 +60,7 @@ passwords from the OS's password store. Installation::
 Basic usage::
 
     password.fetch = ["command", "keyring", "get", "example.com", "foouser"]
-    
+
 .. _keyring: https://github.com/jaraco/keyring/
 
 Password Prompt

docs/tutorials/baikal.rst

@@ -7,4 +7,4 @@ Vdirsyncer is continuously tested against the latest version of Baikal_.
 - Baikal up to ``0.2.7`` also uses an old version of SabreDAV, with the same
   issue as ownCloud, see :gh:`160`. This issue is fixed in later versions.
 
-.. _Baikal: http://baikal-server.com/
+.. _Baikal: http://sabre.io/baikal/

docs/tutorials/claws-mail.rst

@@ -69,15 +69,15 @@ Now we discover and sync our contacts::
 Claws Mail
 ----------
 
-Open Claws-Mail. Got to **Tools** => **Addressbook**.
+Open Claws-Mail. Go to **Tools** => **Addressbook**.
 
 Click on **Addressbook** => **New vCard**. Choose a name for the book.
 
 Then search for the for the vCard in the folder **~/.contacts/**. Click
 ok, and you we will see your contacts.
 
 .. note::
-    
+
     Claws-Mail shows only contacts that have a mail address.
 
 Crontab