Merge pull request #830 from pimutils/next

Keep moving forward

Author: Hugo Barrera

.pre-commit-config.yaml

@@ -14,6 +14,10 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies: [flake8-import-order, flake8-bugbear]
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v2.3.0
+    hooks:
+    -   id: reorder-python-imports
   - repo: local
     hooks:
       - id: update-travis

.travis.yml

@@ -19,74 +19,22 @@
     "include": [
       {
         "env": "BUILD=style",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test REQUIREMENTS=release",
-        "python": "3.5"
-      },
-      {
-        "dist": "trusty",
-        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
-        "python": "3.5"
-      },
-      {
-        "dist": "trusty",
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
-        "python": "3.5"
-      },
-      {
-        "env": "BUILD=test REQUIREMENTS=minimal",
-        "python": "3.5"
-      },
-      {
-        "dist": "trusty",
-        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
-        "python": "3.5"
-      },
-      {
-        "dist": "trusty",
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
-        "python": "3.5"
+        "python": "3.7"
       },
       {
         "env": "BUILD=test REQUIREMENTS=release",
-        "python": "3.6"
+        "python": "3.7"
       },
       {
         "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test REQUIREMENTS=minimal",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
-        "python": "3.6"
-      },
-      {
-        "env": "BUILD=test REQUIREMENTS=release",
         "python": "3.7"
       },
       {
-        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
         "python": "3.7"
       },
       {
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
+        "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
         "python": "3.7"
       },
       {
@@ -127,7 +75,7 @@
       },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
-        "python": "3.6"
+        "python": "3.7"
       }
     ]
   },

Makefile

@@ -30,11 +30,6 @@ PYTEST_ARGS =
 
 TEST_EXTRA_PACKAGES =
 
-ifeq ($(COVERAGE), true)
-	TEST_EXTRA_PACKAGES += pytest-cov
-	PYTEST_ARGS += --cov-config .coveragerc --cov vdirsyncer
-endif
-
 ifeq ($(ETESYNC_TESTS), true)
 	TEST_EXTRA_PACKAGES += git+https://github.com/etesync/[email protected]
 	TEST_EXTRA_PACKAGES += django djangorestframework==3.8.2 wsgi_intercept drf-nested-routers
@@ -106,9 +101,6 @@ docs:
 linkcheck:
 	sphinx-build -W -b linkcheck ./docs/ ./docs/_build/linkcheck/
 
-release:
-	python setup.py sdist bdist_wheel upload
-
 release-deb:
 	sh scripts/release-deb.sh debian jessie
 	sh scripts/release-deb.sh debian stretch

docs/conf.py

@@ -65,7 +65,7 @@ def github_issue_role(name, rawtext, text, lineno, inliner,
         if issue_num <= 0:
             raise ValueError()
     except ValueError:
-        msg = inliner.reporter.error('Invalid GitHub issue: {}'.format(text),
+        msg = inliner.reporter.error(f'Invalid GitHub issue: {text}',
                                      line=lineno)
         prb = inliner.problematic(rawtext, rawtext, msg)
         return [prb], [msg]

docs/installation.rst

@@ -41,7 +41,7 @@ If your distribution doesn't provide a package for vdirsyncer, you still can
 use Python's package manager "pip". First, you'll have to check that the
 following things are installed:
 
-- Python 3.5+ and pip.
+- Python 3.7+ and pip.
 - ``libxml`` and ``libxslt``
 - ``zlib``
 - Linux or OS X. **Windows is not supported**, see :gh:`535`.

scripts/make_travisconf.py

@@ -1,10 +1,8 @@
 #!/usr/bin/env python
-
 import itertools
 import json
 
-python_versions = ("3.5", "3.6", "3.7", "3.8")
-latest_python = "3.6"
+python_versions = ["3.7", "3.8"]
 
 cfg = {}
 
@@ -34,7 +32,7 @@
 cfg['matrix'] = {'include': matrix, 'fast_finish': True}
 
 matrix.append({
-    'python': latest_python,
+    'python': python_versions[0],
     'env': 'BUILD=style'
 })
 
@@ -51,7 +49,7 @@
         'env': f"BUILD=test REQUIREMENTS={requirements}",
     })
 
-    if python == latest_python and requirements == "release":
+    if python == python_versions[0] and requirements == "release":
         dav_servers += ("fastmail",)
 
     for dav_server in dav_servers:
@@ -61,16 +59,14 @@
                     f"DAV_SERVER={dav_server} "
                     f"REQUIREMENTS={requirements} ")
         }
-        if python == '3.5':
-            job['dist'] = 'trusty'
 
         if dav_server in ("davical", "icloud"):
             job['if'] = 'NOT (type IN (pull_request))'
 
         matrix.append(job)
 
 matrix.append({
-    'python': latest_python,
+    'python': python_versions[0],
     'env': ("BUILD=test "
             "ETESYNC_TESTS=true "
             "REQUIREMENTS=latest")

setup.cfg

@@ -3,7 +3,12 @@ universal = 1
 
 [tool:pytest]
 norecursedirs = tests/storage/servers/*
-addopts = --tb=short
+addopts =
+  --tb=short
+  --cov-config .coveragerc
+  --cov=vdirsyncer
+  --cov-report=term-missing
+  --no-cov-on-fail
 
 [flake8]
 # E731: Use a def instead of lambda expr

setup.py

@@ -4,14 +4,14 @@
 Please refer to https://vdirsyncer.pimutils.org/en/stable/packaging.html for
 how to package vdirsyncer.
 '''
-
-
-from setuptools import Command, find_packages, setup
+from setuptools import Command
+from setuptools import find_packages
+from setuptools import setup
 
 
 requirements = [
     # https://github.com/mitsuhiko/click/issues/200
-    'click>=5.0,<6.0',
+    'click>=5.0',
     'click-log>=0.3.0, <0.4.0',
 
     # https://github.com/pimutils/vdirsyncer/issues/478
@@ -87,8 +87,6 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: POSIX',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Topic :: Internet',

test-requirements.txt

@@ -1,4 +1,5 @@
 hypothesis>=5.0.0
 pytest
+pytest-cov
 pytest-localserver
 pytest-subtesthack

tests/__init__.py

@@ -1,14 +1,11 @@
 '''
 Test suite for vdirsyncer.
 '''
-
 import hypothesis.strategies as st
+import urllib3.exceptions
 
 from vdirsyncer.vobject import normalize_item
 
-import urllib3
-import urllib3.exceptions
-
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)