binary build: install cockpit,s3,sftp extras

.github/workflows/ci.yml

@@ -199,7 +199,6 @@ jobs:
     - name: Install macOS packages
       if: ${{ runner.os == 'macOS' }}
       run: |
-        brew unlink pkg-config@0.29.2 || true
         brew bundle install
 
     - name: Configure OpenSSH SFTP server (test only)
@@ -267,13 +266,13 @@ jobs:
     - name: Install borgbackup
       run: |
         if [[ "$TOXENV" == *"llfuse"* ]]; then
-          pip install -ve ".[llfuse]"
+          pip install -ve ".[llfuse,cockpit,s3,sftp]"
         elif [[ "$TOXENV" == *"pyfuse3"* ]]; then
-          pip install -ve ".[pyfuse3]"
+          pip install -ve ".[pyfuse3,cockpit,s3,sftp]"
         elif [[ "$TOXENV" == *"mfusepy"* ]]; then
-          pip install -ve ".[mfusepy]"
+          pip install -ve ".[mfusepy,cockpit,s3,sftp]"
         else
-          pip install -ve .
+          pip install -ve ".[cockpit,s3,sftp]"
         fi
 
     - name: Build Borg fat binaries (${{ matrix.binary }})
@@ -295,6 +294,8 @@ jobs:
         ./borg-dir/borg.exe -V
         tar czf borg.tgz borg-dir
         popd
+        # Ensure locally built binary in ./dist/binary/borg-dir is found during tests
+        export PATH="$GITHUB_WORKSPACE/dist/binary/borg-dir:$PATH"
         echo "borg.exe binary in PATH"
         borg.exe -V
 
@@ -425,7 +426,7 @@ jobs:
                 pip -V
                 python -m pip install --upgrade pip wheel
                 pip install -r requirements.d/development.txt
-                pip install -e ".[mfusepy]"
+                pip install -e ".[mfusepy,cockpit,s3,sftp]"
                 tox -e py311-mfusepy
 
                 if [[ "${{ matrix.do_binaries }}" == "true" && "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
@@ -582,7 +583,7 @@ jobs:
         run: |
           # build borg.exe
           . env/bin/activate
-          pip install -e .
+          pip install -e ".[cockpit,s3,sftp]"
           mkdir -p dist/binary
           pyinstaller -y --clean --distpath=dist/binary scripts/borg.exe.spec
           # build sdist and wheel in dist/...

pyproject.toml

@@ -41,12 +41,12 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+nofuse = []  # no fuse support.
 llfuse = ["llfuse >= 1.3.8"]  # fuse 2, low-level
 pyfuse3 = ["pyfuse3 >= 3.1.1"]  # fuse 3, low-level, async
 mfusepy = ["mfusepy >= 3.1.0, <4.0.0"]  # fuse 2+3, high-level
 # a pypi release of borgbackup can't contain a dependency on github!
 # mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"]
-nofuse = []
 s3 = ["borgstore[s3] ~= 0.3.0"]
 sftp = ["borgstore[sftp] ~= 0.3.0"]
 cockpit = ["textual>=6.8.0"]  # might also work with older versions, untested

scripts/borg.exe.spec

@@ -21,6 +21,7 @@ a = Analysis([os.path.join(basepath, 'src', 'borg', '__main__.py'), ],
              binaries=[],
              datas=[
                 (os.path.join(basepath, 'src', 'borg', 'paperkey.html'), 'borg'),
+                (os.path.join(basepath, 'src', 'borg', 'cockpit', 'cockpit.tcss'), os.path.join('borg', 'cockpit')),
              ],
              hiddenimports=hiddenimports,
              hookspath=[],