mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,763 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

3763 Commits

Author SHA1 Message Date
TW bdab5deb2f Merge pull request #2084 from ThomasWaldmann/binaries-with-py353 
Binaries with py353
 2017-01-19 21:25:37 +01:00
Thomas Waldmann 7b9ff75960 use osxfuse 3.5.4 for tests / to build binaries 2017-01-19 19:02:13 +01:00
Thomas Waldmann 2b6e8a19e3 use python 3.5.3 to build binaries, fixes #2078 2017-01-19 18:58:14 +01:00
TW 27674d89e6 Merge pull request #2072 from ThomasWaldmann/pyi321 
upgrade pyinstaller from 3.1.1+ to 3.2.1
 2017-01-19 18:38:45 +01:00
TW c44d9ad3c2 Merge pull request #2076 from ThomasWaldmann/fix-pyinstaller-bootloader 
pyinstaller: use fixed AND freshly compiled bootloader, fixes #2002
 2017-01-19 18:38:01 +01:00
Thomas Waldmann cdffd93139 pyinstaller: use fixed AND freshly compiled bootloader, fixes #2002 2017-01-17 02:09:28 +01:00
Thomas Waldmann 007d4797d8 pyinstaller: automatically builds bootloader if missing 2017-01-16 08:10:08 +01:00
Thomas Waldmann 1c3ec747d0 upgrade pyinstaller from 3.1.1+ to 3.2.1 2017-01-16 06:31:12 +01:00
TW 9c045806c2 Merge pull request #2070 from ThomasWaldmann/release-1.1.0b3 
Release 1.1.0b3
 2017-01-15 19:54:46 +01:00
Thomas Waldmann d67cc229f6 MANIFEST: exclude *.so 2017-01-15 19:23:07 +01:00
Thomas Waldmann e0dfb656ee fix crc32 compilation issues on wheezy 
moving the declaration / assignment from the middle of the function to the beginning.
 2017-01-15 15:09:40 +01:00
Thomas Waldmann e32503b84c ran setup.py build_usage 2017-01-15 02:10:55 +01:00
Thomas Waldmann 1845074b2e update CHANGES (master) 2017-01-15 02:10:55 +01:00
TW 8fa63aff86 Merge pull request #2065 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2017-01-15 02:09:50 +01:00
Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	requirements.d/development.txt
#	tox.ini
 2017-01-15 01:15:04 +01:00
TW e022cf117c Merge pull request #2064 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2017-01-15 01:06:28 +01:00
Thomas Waldmann 9e8af73d7f update CHANGES (1.0-maint) 2017-01-15 01:05:40 +01:00
TW f266299e5f Merge pull request #2063 from ThomasWaldmann/travis-osx-pythons 
travis: use latest pythons for OS X based testing
 2017-01-15 00:49:52 +01:00
TW 3b8beb98f0 Merge pull request #2061 from ThomasWaldmann/fix-vagrant-freebsd 
fix the freebsd64 vagrant machine, fixes #2037
 2017-01-15 00:25:04 +01:00
Thomas Waldmann 94e35fc52b travis: use latest pythons for OS X based testing 
we test on old pythons (3.x.0) on Linux, so we can test on 3.x.latest on OS X.
 2017-01-15 00:23:09 +01:00
TW cc69d40848 Merge pull request #2062 from ThomasWaldmann/xdist-parallelism 
pytest -n 4 as default (4 parallel workers)
 2017-01-15 00:18:41 +01:00
Thomas Waldmann 0e1f050440 pytest -n 4 as default (4 parallel workers) 
auto does not produce enough load, e.g. on freebsd64 vagrant VM,
cpu is 80-90% idle (1 core == 1 parallel tox worker).
 2017-01-15 00:18:00 +01:00
TW c716df4ce6 Merge pull request #2060 from ThomasWaldmann/require-current-pip-setuptools 
add pip and setuptools to requirements file, fixes #2030
 2017-01-15 00:14:25 +01:00
TW 52c27846ef Merge pull request #2059 from ThomasWaldmann/fix-xattr-test-race 
fix xattr test race condition, fixes #2047
 2017-01-15 00:12:20 +01:00
Thomas Waldmann a9cd6a09cb fix the freebsd64 vagrant machine, fixes #2037 
The previous 10.2 got unusable due to missing backwards compatibility of 10.3 binaries it installed.
The 10.3 box from freebsd project has some issues:
- it needs "vagrant up" twice to start (first start with MAC warning)
- it needs shell set to sh
 2017-01-14 23:42:38 +01:00
Thomas Waldmann 555c6a95e4 add pip and setuptools to requirements file, fixes #2030 
sometimes the system pip/setuptools is rather old and causes
warnings or malfunctions in the primary virtual env.
 2017-01-14 23:23:36 +01:00
Thomas Waldmann c0fb8da595 fix xattr test race condition, fixes #2047 2017-01-14 23:19:40 +01:00
TW e0094f78a1 Merge pull request #2057 from ThomasWaldmann/fix-pytest-deprecation 
setup.cfg: fix pytest deprecation warning, fixes #2050
 2017-01-14 23:13:28 +01:00
TW c3e4d7a273 Merge pull request #2056 from ThomasWaldmann/remove-dot-github 
remove .github from pypi package, fixes #2051
 2017-01-14 23:11:23 +01:00
TW 8e9cf5dcca Merge pull request #2058 from ThomasWaldmann/adjust-xdist-parallelism 
pytest-xdist: adjust parallelism, fixes #2053
 2017-01-14 23:10:59 +01:00
Thomas Waldmann 0a15530f9a pytest-xdist: adjust parallelism, fixes #2053 
it's either auto or env var XDISTN value.
 2017-01-14 23:10:12 +01:00
Thomas Waldmann dedc4c0695 setup.cfg: fix pytest deprecation warning, fixes #2050 2017-01-14 23:06:16 +01:00
Thomas Waldmann b4bb21bf6e remove .github from pypi package, fixes #2051 2017-01-14 23:02:52 +01:00
TW 29a9e995e6 Merge pull request #2054 from enkore/issue/2052 
setup.py: add crc32.c to sdist
 2017-01-14 22:55:32 +01:00
Marian Beermann eace147611 setup.py: add crc32.c to sdist 2017-01-14 22:27:39 +01:00
TW 605deead2a Merge pull request #2049 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2017-01-14 16:54:56 +01:00
Thomas Waldmann 70cc201377 Merge branch '1.0-maint' into merge-1.0-maint 2017-01-14 16:53:38 +01:00
TW 32e58e88e6 Merge pull request #2038 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2017-01-14 16:52:20 +01:00
Thomas Waldmann 85b3625bca update CHANGES (1.0-maint) 2017-01-14 16:51:08 +01:00
TW abfcf9955b Merge pull request #2045 from ThomasWaldmann/fix-platform 
posix platform module: only build / import on non-win32 platforms
 2017-01-14 16:06:28 +01:00
enkore 77e2416ee6 Merge pull request #2046 from enkore/issue/2043 
crc: openbsd has no Intel intrinsics
 2017-01-14 15:57:06 +01:00
Marian Beermann ae0f1422bf crc: openbsd has no Intel intrinsics 2017-01-14 15:24:03 +01:00
enkore aea1305b0b Merge pull request #2044 from ThomasWaldmann/fix-openbsd-repo 
vagrant: fix openbsd repo, fixes #2042
 2017-01-14 15:14:48 +01:00
Thomas Waldmann e4c5db4efc posix platform module: only build / import on non-win32 platforms, fixes #2041 
rather use a inverted check like "not windows".
also: add a base implementation for this stuff, just raising NotImplementedError
 2017-01-14 14:48:49 +01:00
Thomas Waldmann 00c7a4f886 vagrant: fix openbsd repo, fixes #2042 
original repo is 404.
 2017-01-14 14:12:39 +01:00
enkore c925ac018e Merge pull request #2040 from ThomasWaldmann/fix-crc32-compile 
fix crc32 compile error, fixes #2039
 2017-01-14 12:23:13 +01:00
Thomas Waldmann ededb6f2c8 fix crc32 compile error, fixes #2039 2017-01-14 05:06:15 +01:00
TW 9575edc446 Merge pull request #2036 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2017-01-14 03:59:34 +01:00
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
enkore 82fd84e865 Merge pull request #2035 from ThomasWaldmann/docs-backup-from-stdin 
borg create: document how to backup stdin, fixes #2013
 2017-01-14 00:27:18 +01:00