From 55314f807e89d19f50fb4682adca0fb84ab0d1aa Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 30 Jun 2018 21:02:19 +0200
Subject: [PATCH] drop support for python 3.5, fixes #3919

if you do not have python 3.6.x, you can still use borg 1.1.x or 1.0.x.

another option is to use the fat binary from github releases, which
includes python 3.6 and all other stuff needed.
---
 .travis.yml          | 10 +---------
 .travis/install.sh   |  4 ----
 Vagrantfile          |  4 ++--
 setup.py             |  3 +--
 src/borg/archiver.py |  4 ++--
 tox.ini              |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d9865431..c3936d76c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,11 @@ cache:
 
 matrix:
     include:
-        - python: 3.5
-          os: linux
-          dist: trusty
-          env: TOXENV=py35
         - python: 3.6
           os: linux
           dist: trusty
           env: TOXENV=py36
-        - python: 3.5
+        - python: 3.6
           os: linux
           dist: trusty
           env: TOXENV=flake8
@@ -24,10 +20,6 @@ matrix:
           os: linux
           dist: trusty
           env: TOXENV=py36
-        - language: generic
-          os: osx
-          osx_image: xcode8.3
-          env: TOXENV=py35
         - language: generic
           os: osx
           osx_image: xcode8.3
diff --git a/.travis/install.sh b/.travis/install.sh
index 5bad12264..7363aa64c 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -19,10 +19,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     brew install Caskroom/cask/osxfuse
 
     case "${TOXENV}" in
-        py35)
-            pyenv install 3.5.2
-            pyenv global 3.5.2
-            ;;
         py36)
             pyenv install 3.6.0
             pyenv global 3.6.0
diff --git a/Vagrantfile b/Vagrantfile
index 0492551bc..055094720 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -116,7 +116,7 @@ def install_borg(fuse)
     . ~/.bash_profile
     cd /vagrant/borg
     . borg-env/bin/activate
-    pip install -U wheel  # upgrade wheel, too old for 3.5
+    pip install -U wheel  # upgrade wheel, too old for 3.6
     cd borg
     pip install -r requirements.d/development.txt
     python setup.py clean
@@ -261,6 +261,6 @@ Vagrant.configure(2) do |config|
     b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd64")
   end
 
-  # TODO: create more VMs with python 3.5+ and openssl 1.1.
+  # TODO: create more VMs with python 3.6 and openssl 1.1.
   # See branch 1.1-maint for a better equipped Vagrantfile (but still on py34 and openssl 1.0).
 end
diff --git a/setup.py b/setup.py
index b5d59a16c..e527379c3 100644
--- a/setup.py
+++ b/setup.py
@@ -276,7 +276,6 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
@@ -302,5 +301,5 @@ setup(
     setup_requires=['setuptools_scm>=1.7'],
     install_requires=install_requires,
     extras_require=extras_require,
-    python_requires='>=3.5',
+    python_requires='>=3.6',
 )
diff --git a/src/borg/archiver.py b/src/borg/archiver.py
index b84daeb90..532338da7 100644
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@@ -2024,11 +2024,11 @@ class Archiver:
 
         {now}
             The current local date and time, by default in ISO-8601 format.
-            You can also supply your own `format string <https://docs.python.org/3.5/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {now:%Y-%m-%d_%H:%M:%S}
+            You can also supply your own `format string <https://docs.python.org/3.6/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {now:%Y-%m-%d_%H:%M:%S}
 
         {utcnow}
             The current UTC date and time, by default in ISO-8601 format.
-            You can also supply your own `format string <https://docs.python.org/3.5/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S}
+            You can also supply your own `format string <https://docs.python.org/3.6/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S}
 
         {user}
             The user name (or UID, if no name is available) of the user running borg.
diff --git a/tox.ini b/tox.ini
index 8fb3f31bd..2f888ef8d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{35,36},flake8
+envlist = py{36},flake8
 
 [testenv]
 deps =