Drop support for Python 3.5 and 3.6

Author: Hugo Osvaldo Barrera

.travis.yml

@@ -19,75 +19,23 @@
     "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"
+        "python": "3.7"
       },
       {
         "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
-        "python": "3.6"
+        "python": "3.7"
       },
       {
         "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
         "if": "NOT (type IN (pull_request))",
-        "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 ",
-        "python": "3.7"
-      },
-      {
-        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
         "python": "3.7"
       },
       {
@@ -128,7 +76,7 @@
       },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
-        "python": "3.6"
+        "python": "3.7"
       }
     ]
   },

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

@@ -3,8 +3,7 @@
 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 +33,7 @@
 cfg['matrix'] = {'include': matrix, 'fast_finish': True}
 
 matrix.append({
-    'python': latest_python,
+    'python': python_versions[0],
     'env': 'BUILD=style'
 })
 
@@ -51,7 +50,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,8 +60,6 @@
                     f"DAV_SERVER={dav_server} "
                     f"REQUIREMENTS={requirements} ")
         }
-        if python == '3.5':
-            job['dist'] = 'trusty'
 
         build_prs = dav_server not in ("fastmail", "davical", "icloud")
         if not build_prs:
@@ -71,7 +68,7 @@
         matrix.append(job)
 
 matrix.append({
-    'python': latest_python,
+    'python': python_versions[0],
     'env': ("BUILD=test "
             "ETESYNC_TESTS=true "
             "REQUIREMENTS=latest")

setup.py

@@ -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',

tests/storage/__init__.py

@@ -19,7 +19,7 @@
 
 def get_server_mixin(server_name):
     from . import __name__ as base
-    x = __import__('{}.servers.{}'.format(base, server_name), fromlist=[''])
+    x = __import__(f'{base}.servers.{server_name}', fromlist=[''])
     return x.ServerMixin
 
 
@@ -183,7 +183,7 @@ def test_repr(self, s, get_storage_args):
     def test_discover(self, requires_collections, get_storage_args, get_item):
         collections = set()
         for i in range(1, 5):
-            collection = 'test{}'.format(i)
+            collection = f'test{i}'
             s = self.storage_class(**get_storage_args(collection=collection))
             assert not list(s.list())
             s.upload(get_item())

tests/system/cli/test_repair.py

@@ -19,7 +19,7 @@ def storage(tmpdir, runner):
 def test_basic(storage, runner, collection):
     if collection is not None:
         storage = storage.mkdir(collection)
-        collection_arg = 'foo/{}'.format(collection)
+        collection_arg = f'foo/{collection}'
     else:
         collection_arg = 'foo'
 

tests/system/cli/test_sync.py

@@ -461,7 +461,7 @@ def test_partial_sync(tmpdir, runner, partial_sync):
     fileext = ".txt"
     path = "{base}/bar"
     '''.format(
-        partial_sync=('partial_sync = "{}"\n'.format(partial_sync)
+        partial_sync=(f'partial_sync = "{partial_sync}"\n'
                       if partial_sync else ''),
         base=str(tmpdir)
     )))

tests/unit/cli/test_fetchparams.py

@@ -47,7 +47,7 @@ def test_key_conflict(monkeypatch, mystrategy):
 @given(s=st.text(), t=st.text(min_size=1))
 def test_fuzzing(s, t, mystrategy):
     config = expand_fetch_params({
-        '{}.fetch'.format(s): ['mystrategy', t]
+        f'{s}.fetch': ['mystrategy', t]
     })
 
     assert config[s] == t

tests/unit/sync/test_sync.py

@@ -253,7 +253,7 @@ def test_conflict_resolution_both_etags_new(winning_storage):
     b.update(href_b, item_b, etag_b)
     with pytest.raises(SyncConflict):
         sync(a, b, status)
-    sync(a, b, status, conflict_resolution='{} wins'.format(winning_storage))
+    sync(a, b, status, conflict_resolution=f'{winning_storage} wins')
     assert items(a) == items(b) == {
         item_a.raw if winning_storage == 'a' else item_b.raw
     }
@@ -563,7 +563,7 @@ def newstatus(self):
           uid=uid_strategy,
           etag=st.text())
     def upload(self, storage, uid, etag):
-        item = Item('UID:{}'.format(uid))
+        item = Item(f'UID:{uid}')
         storage.items[uid] = (etag, item)
 
     @rule(storage=Storage, href=st.text())