Marian Beermann
ecad0ed53a
Merge branch '1.0-maint' into merge/1.0-maint
...
# Conflicts: ... everywhere ...
# .travis.yml
# Vagrantfile
# borg/testsuite/key.py
# docs/changes.rst
# docs/quickstart.rst
# docs/usage.rst
# docs/usage/upgrade.rst.inc
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/crypto.pyx
# src/borg/helpers.py
# src/borg/key.py
# src/borg/remote.py
# src/borg/repository.py
# src/borg/testsuite/archive.py
# src/borg/testsuite/archiver.py
# src/borg/testsuite/crypto.py
# src/borg/testsuite/helpers.py
# src/borg/testsuite/repository.py
# src/borg/upgrader.py
# tox.ini
2017-01-12 15:01:41 +01:00
Thomas Waldmann
e119042f4c
travis: install py36 on OS X
2017-01-06 07:12:29 +01:00
Thomas Waldmann
370cb1f19a
travis: fix osxfuse install
2017-01-06 07:12:29 +01:00
Thomas Waldmann
6290e70c80
partially remove virtualenv/pip version requirement, fixes #1738
...
Is needed only for python 3.2 support.
For normal development, we expect you have py34+ for borg 1.1.
For vagrant, it is still needed because of older VMs like wheezy (py32).
Not needed for Travis-CI any more, we moved to trusty VMs (py34) there.
2016-11-29 21:30:23 +01:00
Marian Beermann
0d2b76fa7d
Merge branch '1.0-maint' into merge/1.0-maint
2016-11-13 15:58:42 +01:00
Thomas Waldmann
cd8dfda318
caskroom osxfuse-beta gone, it's osxfuse now (3.5.3)
2016-11-12 23:02:13 +01:00
Thomas Waldmann
ebe1143570
travis: test fuse-enabled borg
2016-08-22 00:14:08 +02:00
Thomas Waldmann
2a41569fec
use trusty for testing, to have a recent FUSE
2016-08-22 00:12:57 +02:00
Thomas Waldmann
32bd29548b
travis: test fuse-enabled borg
2016-08-21 22:07:59 +02:00
Thomas Waldmann
7e80f6821d
use trusty for testing, to have a recent FUSE
2016-08-21 22:07:59 +02:00
Thomas Waldmann
735d058a8d
travis: use ubuntu trusty beta infrastructure (not: precise)
...
use python 3.5.2 on trusty travis-ci machines
their 3.5(.0) misses lzma support at the moment.
after this is fixed, we likely want to go back to 3.5(.0) to run the tests.
2016-07-06 19:18:09 +02:00
Thomas Waldmann
f44b4bb9b7
travis / OSX: add xz package for python lzma support
2016-05-03 19:57:44 +02:00
Thomas Waldmann
7d591226d2
remove support for python 3.2.x and 3.3.x, require 3.4+, fixes #65 , fixes #221
2016-01-24 14:57:48 +01:00
Thomas Waldmann
69c8edc4e3
require virtualenv<14.0 so we get a py32 compatible pip
2016-01-22 22:14:41 +01:00
Thomas Waldmann
9d0d37fab0
also test py35 on travis
2015-10-27 23:06:32 +01:00
Thomas Waldmann
034e3477bd
travis: use requirements file
2015-08-21 01:10:34 +02:00
Thomas Waldmann
abe29583f2
install lz4 from brew
2015-08-10 01:21:27 +02:00
Thomas Waldmann
8af3aa3397
merged master
2015-08-09 23:51:46 +02:00
Thomas Waldmann
5864bd76eb
fix test coverage / codecov.io, use xcode6.4
2015-08-08 18:31:41 +02:00
Thomas Waldmann
ba75356314
add OS X to travis
2015-08-08 01:44:12 +02:00
