mirror of
https://github.com/borgbackup/borg.git
synced 2024-09-11 12:36:12 +03:00
Revert "drop support for python 3.5, fixes #3919"
This reverts commit 55314f807e
.
This commit is contained in:
parent
f7a5d3fb15
commit
2be5446098
12
.travis.yml
12
.travis.yml
@ -8,10 +8,10 @@ cache:
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- python: 3.6
|
||||
- python: 3.5
|
||||
os: linux
|
||||
dist: trusty
|
||||
env: TOXENV=flake8
|
||||
env: TOXENV=py35
|
||||
- python: 3.6
|
||||
os: linux
|
||||
dist: trusty
|
||||
@ -28,6 +28,14 @@ matrix:
|
||||
os: linux
|
||||
dist: xenial
|
||||
env: TOXENV=py37
|
||||
- python: 3.5
|
||||
os: linux
|
||||
dist: xenial
|
||||
env: TOXENV=flake8
|
||||
- language: generic
|
||||
os: osx
|
||||
osx_image: xcode8.3
|
||||
env: TOXENV=py35
|
||||
- language: generic
|
||||
os: osx
|
||||
osx_image: xcode8.3
|
||||
|
@ -19,6 +19,10 @@ 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
|
||||
|
4
Vagrantfile
vendored
4
Vagrantfile
vendored
@ -140,7 +140,7 @@ def install_borg(fuse)
|
||||
. ~/.bash_profile
|
||||
cd /vagrant/borg
|
||||
. borg-env/bin/activate
|
||||
pip install -U wheel # upgrade wheel, too old for 3.6
|
||||
pip install -U wheel # upgrade wheel, too old for 3.5
|
||||
cd borg
|
||||
pip install -r requirements.d/development.txt
|
||||
python setup.py clean
|
||||
@ -310,6 +310,6 @@ Vagrant.configure(2) do |config|
|
||||
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("darwin64")
|
||||
end
|
||||
|
||||
# TODO: create more VMs with python 3.6 and openssl 1.1.
|
||||
# TODO: create more VMs with python 3.5+ and openssl 1.1.
|
||||
# See branch 1.1-maint for a better equipped Vagrantfile (but still on py34 and openssl 1.0).
|
||||
end
|
||||
|
3
setup.py
3
setup.py
@ -276,6 +276,7 @@ def run(self):
|
||||
'Operating System :: POSIX :: Linux',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Topic :: Security :: Cryptography',
|
||||
@ -302,5 +303,5 @@ def run(self):
|
||||
setup_requires=['setuptools_scm>=1.7'],
|
||||
install_requires=install_requires,
|
||||
extras_require=extras_require,
|
||||
python_requires='>=3.6',
|
||||
python_requires='>=3.5',
|
||||
)
|
||||
|
@ -2138,11 +2138,11 @@ def do_break_lock(self, args, repository):
|
||||
|
||||
{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.6/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.5/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.6/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.5/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.
|
||||
|
Loading…
Reference in New Issue
Block a user