Fix Pydantic models for Borg 1.4 JSON output

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Migrate code style to Black
+7957af562d5ce8266b177039783be4dc8bdd7898

.github/FUNDING.yml

@@ -1,5 +1,6 @@
 # These are supported funding model platforms
 
-# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-# liberapay: borgbackup
+github: borgbackup
+liberapay: borgbackup
+open_collective: borgbackup
 custom: ['https://www.borgbackup.org/support/fund.html']

.github/ISSUE_TEMPLATE.md

@@ -5,14 +5,14 @@ Thank you for reporting an issue.
  - Borgbackup documentation: http://borgbackup.readthedocs.io/en/stable/index.html
  - FAQ: https://borgbackup.readthedocs.io/en/stable/faq.html
  and
- - open issues in Github tracker: https://github.com/borgbackup/borg/issues
+ - open issues in GitHub tracker: https://github.com/borgbackup/borg/issues
 
 If you cannot find a similar problem, then create a new issue.
 
 Please fill in as much of the template as possible.
 -->
 
-## Have you checked borgbackup docs, FAQ, and open Github issues?
+## Have you checked borgbackup docs, FAQ, and open GitHub issues?
 
 No
 
@@ -46,7 +46,7 @@ results and any steps you took to troubleshoot.
 How to run benchmark: http://borgbackup.readthedocs.io/en/stable/usage/benchmark.html
 
 *IMPORTANT* - Please mark logs and text output from terminal commands 
-or else Github will not display them correctly. 
+or else GitHub will not display them correctly. 
 An example is provided below.
 
 Example:

.github/workflows/black.yaml

@@ -0,0 +1,15 @@
+# https://black.readthedocs.io/en/stable/integrations/github_actions.html#usage
+# see also what we use locally, requirements.d/codestyle.txt - should be the same version here.
+
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable
+        with:
+            version: "~= 23.0"

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ on:
     - '**.c'
     - '**.h'
     - '**.yml'
+    - '**.toml'
     - '**.cfg'
     - '**.ini'
     - 'requirements.d/*'
@@ -23,6 +24,7 @@ on:
     - '**.c'
     - '**.h'
     - '**.yml'
+    - '**.toml'
     - '**.cfg'
     - '**.ini'
     - 'requirements.d/*'
@@ -31,58 +33,56 @@ on:
 jobs:
   lint:
 
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
+    runs-on: ubuntu-22.04
+    timeout-minutes: 5
 
     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
+    - uses: actions/checkout@v4
+    - uses: chartboost/ruff-action@v1
 
-  pytest:
+  linux:
 
     needs: lint
     strategy:
+      fail-fast: true
       matrix:
         include:
-            - os: ubuntu-20.04
-              python-version: '3.8'
-              toxenv: py38-fuse2
-            - os: ubuntu-20.04
+            - os: ubuntu-22.04
               python-version: '3.9'
-              toxenv: py39-fuse3
-            - os: ubuntu-20.04
+              toxenv: mypy
+            - os: ubuntu-22.04
+              python-version: '3.11'
+              toxenv: docs
+            - os: ubuntu-22.04
+              python-version: '3.9'
+              toxenv: py39-fuse2
+            - os: ubuntu-22.04
               python-version: '3.10'
               toxenv: py310-fuse3
-            - os: macos-10.15  # macos-latest is macos 11.6.2 and hanging at test_fuse, #6099
-              python-version: '3.8'
-              toxenv: py38-fuse2
+            - os: ubuntu-22.04
+              python-version: '3.11'
+              toxenv: py311-fuse3
+            - os: ubuntu-22.04
+              python-version: '3.12'
+              toxenv: py312-fuse3
 
     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
+    timeout-minutes: 120
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       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
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache pip
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }}
@@ -91,24 +91,13 @@ jobs:
             ${{ 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 pkg-config build-essential
+        sudo apt-get install -y libssl-dev libacl1-dev libxxhash-dev liblz4-dev libzstd-dev
         sudo apt-get install -y libfuse-dev fuse || true  # Required for Python llfuse module
         sudo apt-get install -y libfuse3-dev fuse3 || true  # Required for Python pyfuse3 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 --cask macfuse || brew upgrade --cask macfuse  # Required for Python llfuse module
-
     - name: Install Python requirements
       run: |
         python -m pip install --upgrade pip setuptools wheel
@@ -117,16 +106,129 @@ jobs:
       run: |
         # pip install -e .
         python setup.py -v develop
-    - name: run pytest via tox
+    - name: run tox env
+      env:
+        XDISTN: "4"
       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
+      uses: codecov/codecov-action@v4
       env:
         OS: ${{ runner.os }}
         python: ${{ matrix.python-version }}
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         env_vars: OS, python
+
+  macOS:
+
+    needs: linux
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+            - os: macos-14
+              python-version: '3.11'
+              toxenv: py311-none  # note: no fuse testing, due to #6099, see also #6196.
+
+    env:
+      # Configure pkg-config to use OpenSSL from Homebrew
+      PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
+      TOXENV: ${{ matrix.toxenv }}
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 180
+
+    steps:
+    - uses: actions/checkout@v4
+      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@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache pip
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }}
+        restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+    - name: Install macOS packages
+      run: brew bundle install
+
+    - name: Install Python requirements
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        pip install -r requirements.d/development.txt
+    - name: Install borgbackup
+      env:
+        # we already have that in the global env, but something is broken and overwrites that.
+        # so, set it here, again.
+        PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
+      run: |
+        pip install -ve .
+    - name: run tox env
+      env:
+        # we already have that in the global env, but something is broken and overwrites that.
+        # so, set it here, again.
+        PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
+        XDISTN: "6"
+      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@v4
+      env:
+        OS: ${{ runner.os }}
+        python: ${{ matrix.python-version }}
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        env_vars: OS, python
+
+  windows:
+
+    if: false  # build is broken, thus disabled, see #8264
+    runs-on: windows-latest
+    timeout-minutes: 120
+    needs: linux
+
+    env:
+      SETUPTOOLS_USE_DISTUTILS: stdlib # Needed for pip to work - https://www.msys2.org/docs/python/#known-issues
+      PY_COLORS: 1
+
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+      - name: Install dependencies
+        run: ./scripts/msys2-install-deps development
+      - name: Build
+        run: |
+          # build borg.exe
+          SETUPTOOLS_USE_DISTUTILS=stdlib pip install -e .
+          pyinstaller -y scripts/borg.exe.spec
+          # build sdist and wheel in dist/...
+          SETUPTOOLS_USE_DISTUTILS=stdlib python -m build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: borg-windows
+          path: dist/borg.exe
+      - name: Run tests
+        run: |
+          ./dist/borg.exe -V
+          pytest -n4 --benchmark-skip -vv -rs -k "not remote"