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
85311f0116
fix .coverage processing
2016-08-22 01:15:03 +02: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
08d96099f1
pytest-benchmark: use git master code, fixes py32 issues
2015-10-12 00:52:52 +02:00
Thomas Waldmann
07d9132f05
travis: use tox -r so it rebuilds the tox envs
...
it seems to keep .tox envs even if one removes stuff from requirements file.
if that stuff causes troubles, as here with pytest-benchmark, the troubles stay...
2015-10-11 17:41:25 +02:00
Thomas Waldmann
9dccc809a9
create a separate requirements file for travis - without pytest-benchmark
...
pytest-benchmark (and its dependency "statistics") needs py 3.3+.
we do not want to run benchmarks on travis anyway, but even its presence
makes trouble due to this, so we just remove it from there again.
as --benchmark-skip is also removed from tox configuration, this means benchmarks
are run by default when pytest-benchmark is installed.
2015-10-11 17:06:12 +02: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
60e34968b0
codecov: fixes for env vars and osx
2015-08-08 20:46:58 +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
