Commit Graph

33 Commits

Author SHA1 Message Date
Thomas Waldmann e431d60cc5 merge 1.0-maint into master
# Conflicts:
#	src/borg/crypto.pyx
#	src/borg/hashindex.pyx
#	src/borg/helpers.py
#	src/borg/platform/__init__.py
#	src/borg/platform/darwin.pyx
#	src/borg/platform/freebsd.pyx
#	src/borg/platform/linux.pyx
#	src/borg/remote.py
2017-01-14 03:07:11 +01:00
Thomas Waldmann 93d7d3c1db travis: require succeeding OS X tests, fixes #2028 2017-01-13 21:03:18 +01:00
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 9533493047 tox / travis: also test on Python 3.6 2017-01-04 00:57:35 +01:00
Thomas Waldmann 38fe61947e Merge branch '1.0-maint' 2016-11-14 03:22:36 +01:00
Thomas Waldmann 372ebb4e55 travis: allow OS X failures until the brew cask osxfuse issue is fixed 2016-11-14 02:08:11 +01:00
Thomas Waldmann c9a3a201e5 travis: use 3.6-dev
nightly points to python 3.7 now.
2016-10-13 20:02:31 +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 d27a3521ec test on py36 2016-05-21 19:24:18 +02:00
Thomas Waldmann 47e6304711 add flake8 tox env to travis config 2016-01-30 22:03:09 +01: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 9d0d37fab0 also test py35 on travis 2015-10-27 23:06:32 +01: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
Thomas Waldmann 906ea629f6 use py.test for testing, document it
locally (via tox) and also on travis ci.
2015-05-22 21:26:41 +02:00
Thomas Waldmann 5e98400a5a fix all references to package name
use relative imports if possible
reorder imports (1. stdlib 2. dependencies 3. borg 4. borg.testsuite)
2015-05-22 19:21:41 +02:00
Jonas Borgström c90c6c9e9d travis: Enable python 3.4 2014-05-01 14:08:12 +02:00
Jonas Borgström 337892c635 travis: forgot to use sudo when installing packages 2014-04-13 20:44:24 +02:00
Jonas Borgström 14808b77cb Fix Python3.2 compatibility 2014-04-13 20:34:32 +02:00
Jonas Borgström e8e3289d8a travis: Don't try to use fuse since it's not available 2013-07-25 23:18:34 +02:00
Jonas Borgström f4acacef30 travis: install libattr1-dev 2013-07-25 23:08:03 +02:00
Jonas Borgström 071dfc2ce8 travis: install libfuse-dev and fuse-utils 2013-07-25 23:01:05 +02:00
Jonas Borgström 0b19df3cea Added initial fuse test case 2013-07-25 22:54:19 +02:00
Jonas Borgström b718a443a8 Project rename 2013-07-09 20:14:18 +02:00
Jonas Borgström 7dd937fb4e Remove attempts to enable user_xattr
[no ci]
2013-07-04 11:58:48 +02:00
Jonas Borgström f4f9138945 Try /home/travis next 2013-07-03 23:41:25 +02:00
Jonas Borgström 2a7753c0c9 Try /home instead 2013-07-03 23:32:42 +02:00
Jonas Borgström 36e6f35d9b Enable xattr on the current fs instead of / 2013-07-03 23:29:40 +02:00
Jonas Borgström 4321b01134 Use sudo to run apt-get 2013-07-03 23:23:55 +02:00
Jonas Borgström 7c18073760 Use fakeroot when running tests and enable user_xattr 2013-07-03 23:10:54 +02:00
Jonas Borgström 40e28909e6 Use pip install -e instead of setup.py install 2013-07-03 22:52:16 +02:00
Jonas Borgström 46491eb07d Added .travis.yml 2013-07-03 22:46:46 +02:00