Merge branch '1.0-maint' into merge-1.0-maint

# Conflicts:
#	requirements.d/development.txt
#	tox.ini

.travis/install.sh

@@ -22,12 +22,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

MANIFEST.in

@@ -7,4 +7,5 @@ recursive-exclude docs *.pyc
 recursive-exclude docs *.pyo
 prune docs/_build
 prune .travis
+prune .github
 exclude .coveragerc .gitattributes .gitignore .travis.yml Vagrantfile

Vagrantfile

@@ -470,11 +470,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")

docs/changes.rst

@@ -234,9 +234,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
@@ -246,6 +250,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)

requirements.d/development.txt

@@ -1,3 +1,5 @@
+setuptools
+pip
 virtualenv
 tox
 pytest

setup.cfg

@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 python_files = testsuite/*.py
 
 [flake8]

src/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):

tox.ini

@@ -9,7 +9,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:4} -rs --cov=borg --cov-config=.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite}
 # fakeroot -u needs some env vars:
 passenv = *