From b4bb21bf6eb9f2716c7426a0e74bc59db2c5189c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:00:46 +0100 Subject: [PATCH 1/9] remove .github from pypi package, fixes #2051 --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 309c1f8dc..8a4123fea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,5 +5,6 @@ recursive-exclude docs *.pyc recursive-exclude docs *.pyo prune docs/_build prune .travis +prune .github exclude .coveragerc .gitattributes .gitignore .travis.yml Vagrantfile include borg/_version.py From dedc4c0695963ee5344ad69a347198583639b368 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:06:16 +0100 Subject: [PATCH 2/9] setup.cfg: fix pytest deprecation warning, fixes #2050 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 6f408a95f..93f009af5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ -[pytest] +[tool:pytest] python_files = testsuite/*.py [flake8] From 0a15530f9afbf7127a227dbd6e0992c287e38f5b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:10:12 +0100 Subject: [PATCH 3/9] pytest-xdist: adjust parallelism, fixes #2053 it's either auto or env var XDISTN value. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ce0aaacb0..c0de8a527 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ deps = -rrequirements.d/development.txt -rrequirements.d/attic.txt -rrequirements.d/fuse.txt -commands = py.test -n 8 -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} +commands = py.test -n {env:XDISTN:auto} -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} # fakeroot -u needs some env vars: passenv = * From c0fb8da595b43ef7e17709199c5c97cc1cf35a1a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:19:40 +0100 Subject: [PATCH 4/9] fix xattr test race condition, fixes #2047 --- borg/testsuite/xattr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/borg/testsuite/xattr.py b/borg/testsuite/xattr.py index 5693c753e..db01a29a3 100644 --- a/borg/testsuite/xattr.py +++ b/borg/testsuite/xattr.py @@ -11,7 +11,7 @@ class XattrTestCase(BaseTestCase): def setUp(self): self.tmpfile = tempfile.NamedTemporaryFile() - self.symlink = os.path.join(os.path.dirname(self.tmpfile.name), 'symlink') + self.symlink = self.tmpfile.name + '.symlink' os.symlink(self.tmpfile.name, self.symlink) def tearDown(self): From 555c6a95e4ef6e06f0a548e698817d3ca81984e2 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:23:36 +0100 Subject: [PATCH 5/9] 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. --- requirements.d/development.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.d/development.txt b/requirements.d/development.txt index a07f0b02a..f62a50710 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,3 +1,5 @@ +setuptools +pip virtualenv<14.0 tox pytest From a9cd6a09cbbc9b2e380e3554c21fecad32287219 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 14 Jan 2017 23:42:38 +0100 Subject: [PATCH 6/9] 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 --- Vagrantfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 3d6ad05d4..0f1bcee2a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -467,11 +467,13 @@ Vagrant.configure(2) do |config| end # BSD + # note: the FreeBSD-10.3-STABLE box needs "vagrant up" twice to start. config.vm.define "freebsd64" do |b| - b.vm.box = "geoffgarside/freebsd-10.2" + b.vm.box = "freebsd/FreeBSD-10.3-STABLE" b.vm.provider :virtualbox do |v| v.memory = 768 end + b.ssh.shell = "sh" b.vm.provision "install system packages", :type => :shell, :inline => packages_freebsd b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd") b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd") From 0e1f050440ea9b61274ade5ad2f46a10edcfd686 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 15 Jan 2017 00:18:00 +0100 Subject: [PATCH 7/9] 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). --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c0de8a527..8a73c41cc 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ deps = -rrequirements.d/development.txt -rrequirements.d/attic.txt -rrequirements.d/fuse.txt -commands = py.test -n {env:XDISTN:auto} -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} +commands = py.test -n {env:XDISTN:4} -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} # fakeroot -u needs some env vars: passenv = * From 94e35fc52b208f82f741ff5e17a7b8eb876e9b44 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 15 Jan 2017 00:23:09 +0100 Subject: [PATCH 8/9] 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. --- .travis/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index d90254370..688bd10a0 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -21,12 +21,12 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then case "${TOXENV}" in py34) - pyenv install 3.4.3 - pyenv global 3.4.3 + pyenv install 3.4.5 + pyenv global 3.4.5 ;; py35) - pyenv install 3.5.1 - pyenv global 3.5.1 + pyenv install 3.5.2 + pyenv global 3.5.2 ;; py36) pyenv install 3.6.0 From 9e8af73d7f22657ecebc457a9aad3da70f07097a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 15 Jan 2017 01:05:40 +0100 Subject: [PATCH 9/9] update CHANGES (1.0-maint) --- docs/changes.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index 96f28b2d9..24e360606 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -155,9 +155,13 @@ Other changes: - vagrant / travis / tox: add Python 3.6 based testing - vagrant: fix openbsd repo, fixes #2042 + - vagrant: fix the freebsd64 machine, #2037 - travis: fix osxfuse install (fixes OS X testing on Travis CI) - travis: require succeeding OS X tests, #2028 + - travis: use latest pythons for OS X based testing - use pytest-xdist to parallelize testing + - fix xattr test race condition, #2047 + - setup.cfg: fix pytest deprecation warning, #2050 - docs: - language clarification - VM backup FAQ @@ -167,6 +171,8 @@ Other changes: - remote: include data hexdump in "unexpected RPC data" error message - remote: log SSH command line at debug level - API_VERSION: use numberspaces, #2023 +- remove .github from pypi package, #2051 +- add pip and setuptools to requirements file, #2030 Version 1.0.9 (2016-12-20)