Browse Source

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.
Thomas Waldmann 7 years ago
parent
commit
55314f807e
6 changed files with 7 additions and 20 deletions
  1. 1 9
      .travis.yml
  2. 0 4
      .travis/install.sh
  3. 2 2
      Vagrantfile
  4. 1 2
      setup.py
  5. 2 2
      src/borg/archiver.py
  6. 1 1
      tox.ini

+ 1 - 9
.travis.yml

@@ -8,15 +8,11 @@ cache:
 
 
 matrix:
 matrix:
     include:
     include:
-        - python: 3.5
-          os: linux
-          dist: trusty
-          env: TOXENV=py35
         - python: 3.6
         - python: 3.6
           os: linux
           os: linux
           dist: trusty
           dist: trusty
           env: TOXENV=py36
           env: TOXENV=py36
-        - python: 3.5
+        - python: 3.6
           os: linux
           os: linux
           dist: trusty
           dist: trusty
           env: TOXENV=flake8
           env: TOXENV=flake8
@@ -24,10 +20,6 @@ matrix:
           os: linux
           os: linux
           dist: trusty
           dist: trusty
           env: TOXENV=py36
           env: TOXENV=py36
-        - language: generic
-          os: osx
-          osx_image: xcode8.3
-          env: TOXENV=py35
         - language: generic
         - language: generic
           os: osx
           os: osx
           osx_image: xcode8.3
           osx_image: xcode8.3

+ 0 - 4
.travis/install.sh

@@ -19,10 +19,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     brew install Caskroom/cask/osxfuse
     brew install Caskroom/cask/osxfuse
 
 
     case "${TOXENV}" in
     case "${TOXENV}" in
-        py35)
-            pyenv install 3.5.2
-            pyenv global 3.5.2
-            ;;
         py36)
         py36)
             pyenv install 3.6.0
             pyenv install 3.6.0
             pyenv global 3.6.0
             pyenv global 3.6.0

+ 2 - 2
Vagrantfile

@@ -116,7 +116,7 @@ def install_borg(fuse)
     . ~/.bash_profile
     . ~/.bash_profile
     cd /vagrant/borg
     cd /vagrant/borg
     . borg-env/bin/activate
     . 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
     cd borg
     pip install -r requirements.d/development.txt
     pip install -r requirements.d/development.txt
     python setup.py clean
     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")
     b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd64")
   end
   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).
   # See branch 1.1-maint for a better equipped Vagrantfile (but still on py34 and openssl 1.0).
 end
 end

+ 1 - 2
setup.py

@@ -276,7 +276,6 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.6',
         'Topic :: Security :: Cryptography',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
         'Topic :: System :: Archiving :: Backup',
@@ -302,5 +301,5 @@ setup(
     setup_requires=['setuptools_scm>=1.7'],
     setup_requires=['setuptools_scm>=1.7'],
     install_requires=install_requires,
     install_requires=install_requires,
     extras_require=extras_require,
     extras_require=extras_require,
-    python_requires='>=3.5',
+    python_requires='>=3.6',
 )
 )

+ 2 - 2
src/borg/archiver.py

@@ -2024,11 +2024,11 @@ class Archiver:
 
 
         {now}
         {now}
             The current local date and time, by default in ISO-8601 format.
             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}
         {utcnow}
             The current UTC date and time, by default in ISO-8601 format.
             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}
         {user}
             The user name (or UID, if no name is available) of the user running borg.
             The user name (or UID, if no name is available) of the user running borg.

+ 1 - 1
tox.ini

@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 # fakeroot -u tox --recreate
 
 
 [tox]
 [tox]
-envlist = py{35,36},flake8
+envlist = py{36},flake8
 
 
 [testenv]
 [testenv]
 deps =
 deps =