backport

.coveragerc

@@ -1,5 +1,6 @@
 [run]
 branch = True
+disable_warnings = module-not-measured
 source = src/borg
 omit =
     */borg/__init__.py

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://editorconfig.org/
 
 root = true
 

.github/workflows/ci.yml

@@ -0,0 +1,142 @@
+# badge: https://github.com/borgbackup/borg/workflows/CI/badge.svg?branch=master
+
+name: CI
+
+on:
+  push:
+    branches: [ 1.1-maint ]
+    paths:
+    - '**.py'
+    - '**.pyx'
+    - '**.c'
+    - '**.h'
+    - '**.yml'
+    - '**.cfg'
+    - '**.ini'
+    - 'requirements.d/*'
+    - '!docs/**'
+  pull_request:
+    branches: [ 1.1-maint ]
+    paths:
+    - '**.py'
+    - '**.pyx'
+    - '**.c'
+    - '**.h'
+    - '**.yml'
+    - '**.cfg'
+    - '**.ini'
+    - 'requirements.d/*'
+    - '!docs/**'
+
+jobs:
+  lint:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        flake8 src scripts conftest.py
+
+  pytest:
+
+    needs: lint
+    strategy:
+      matrix:
+        include:
+            - os: ubuntu-20.04
+              python-version: '3.5'
+              toxenv: py35
+            - os: ubuntu-20.04
+              python-version: '3.6'
+              toxenv: py36
+            - os: ubuntu-20.04
+              python-version: '3.7'
+              toxenv: py37
+            - os: ubuntu-20.04
+              python-version: '3.8'
+              toxenv: py38
+            - os: ubuntu-20.04
+              python-version: '3.9'
+              toxenv: py39
+            - os: ubuntu-20.04
+              python-version: '3.10-dev'
+              toxenv: py310
+            - os: macos-latest
+              # note: it seems that 3.8 and 3.9 are currently broken,
+              # neverending RuntimeError crashes...
+              python-version: '3.7'
+              toxenv: py37
+
+    env:
+      # Configure pkg-config to use OpenSSL from Homebrew
+      PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig
+      TOXENV: ${{ matrix.toxenv }}
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 40
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # just fetching 1 commit is not enough for setuptools-scm, so we fetch all
+        fetch-depth: 0
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }}
+        restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+    - name: Install Linux packages
+      if: ${{ runner.os == 'Linux' }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libssl-dev libacl1-dev liblz4-dev libzstd-dev pkg-config build-essential
+        sudo apt-get install -y libxxhash-dev || true
+        sudo apt-get install -y libb2-dev || true
+        sudo apt-get install -y libfuse-dev fuse || true  # Required for Python llfuse module
+
+    - name: Install macOS packages
+      if: ${{ runner.os == 'macOS' }}
+      run: |
+        brew install pkg-config || brew upgrade pkg-config
+        brew install zstd || brew upgrade zstd
+        brew install lz4 || brew upgrade lz4
+        brew install openssl@1.1 || brew upgrade openssl@1.1
+        brew install homebrew/cask/osxfuse || brew upgrade homebrew/cask/osxfuse  # Required for Python llfuse module
+
+    - name: Install Python requirements
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        pip install -r requirements.d/development.txt
+    - name: Install borgbackup
+      run: |
+        # pip install -e .
+        python setup.py -v develop
+    - name: run pytest via tox
+      run: |
+        # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482.
+        #sudo -E bash -c "tox -e py"
+        tox --skip-missing-interpreters
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      env:
+        OS: ${{ runner.os }}
+        python: ${{ matrix.python-version }}
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        env_vars: OS, python

.gitignore

@@ -13,14 +13,18 @@ src/borg/algorithms/checksums.c
 src/borg/platform/darwin.c
 src/borg/platform/freebsd.c
 src/borg/platform/linux.c
+src/borg/platform/syncfilerange.c
 src/borg/platform/posix.c
+src/borg/algorithms/msgpack/_packer.cpp
+src/borg/algorithms/msgpack/_unpacker.cpp
 src/borg/_version.py
 *.egg-info
 *.pyc
 *.pyo
 *.so
 .idea/
 .cache/
+.vscode/
 borg.build/
 borg.dist/
 borg.exe

AUTHORS

@@ -1,8 +1,12 @@
+E-mail addresses listed here are not intended for support, please see
+the `support section`_ instead.
+
+.. _support section: https://borgbackup.readthedocs.io/en/stable/support.html
+
 Borg authors ("The Borg Collective")
 ------------------------------------
 
 - Thomas Waldmann <tw@waldmann-edv.de>
-- Antoine Beaupré <anarcat@debian.org>
 - Radek Podgorny <radek@podgorny.cz>
 - Yuri D'Elia
 - Michael Hanselmann <public@hansmi.ch>
@@ -12,6 +16,12 @@ Borg authors ("The Borg Collective")
 - Daniel Reichelt <hacking@nachtgeist.net>
 - Lauri Niskanen <ape@ape3000.com>
 - Abdel-Rahman A. (Abogical)
+- Gu1nness <guinness@crans.org>
+
+Retired
+```````
+
+- Antoine Beaupré <anarcat@debian.org>
 
 Borg is a fork of Attic.
 
@@ -52,6 +62,12 @@ Folding CRC32
 Borg includes an extremely fast folding implementation of CRC32, Copyright 2013 Intel Corporation,
 licensed under the terms of the zlib license.
 
+msgpack
+-------
+
+Borg includes Python msgpack, Copyright 2008-2011 INADA Naoki
+licensed under the terms of the Apache License 2.0.
+
 xxHash
 ------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2017 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2021 The Borg Collective (see AUTHORS file)
 Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 

MANIFEST.in

@@ -1,8 +1,5 @@
-include README.rst AUTHORS LICENSE CHANGES.rst MANIFEST.in
-exclude .coafile .coveragerc .gitattributes .gitignore .travis.yml Vagrantfile
-prune .travis
+# stuff we need to include into the sdist is handled automatically by
+# setuptools_scm - it includes all git-committed files.
+# but we want to exclude some committed files/dirs not needed in the sdist:
+exclude .coafile .editorconfig .gitattributes .gitignore .mailmap Vagrantfile
 prune .github
-graft src
-graft docs
-prune docs/_build
-global-exclude *.py[co] *.orig *.so *.dll