10 commits

Author	SHA1	Message	Date
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