Rebased with master

.github/workflows/functional_tests.yml

@@ -50,15 +50,15 @@ jobs:
           DISPLAY: ":99"
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: functional
           env_vars: OS,PYTHON
 
   functional-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -80,7 +80,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -111,7 +111,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

.github/workflows/functional_tests_2023.yml

@@ -50,15 +50,15 @@ jobs:
           DISPLAY: ":99"
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: functional
           env_vars: OS,PYTHON
 
   functional-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -80,7 +80,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -105,7 +105,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

.github/workflows/integration_tests.yml

@@ -61,7 +61,7 @@ jobs:
         run: tox -e integration
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, 'macos-latest']
+        os: [ubuntu-latest, windows-latest, 'macos-13']
 
     steps:
       - name: Checkout
@@ -96,29 +96,29 @@ jobs:
       #
 
       - name: "[macOS] Setup certificates"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         run: |
           wget https://www.apple.com/appleca/AppleIncRootCertificate.cer
-          echo "${{ secrets.CERT_APP_MACOS }}" | base64 --decode > developerID_application.cer
+          echo "${{ secrets.CERT_APP_MACOS }}" | base64 --decode > developerID_application.p12
           echo "${{ secrets.PRIV_APP_MACOS }}" | base64 --decode > nuxeo-drive.priv
 
       #- name: "[macOS] Downloading Python"
-      #  if: matrix.os == 'macos-latest'
+      #  if: matrix.os == 'macos-13'
       #  run: curl https://www.python.org/ftp/python/3.9.5/python-3.9.5-macosx10.9.pkg -o "python.pkg" # XXX_PYTHON
 
       #- name: "[macOS] Install Python"
-      #  if: matrix.os == 'macos-latest'
+      #  if: matrix.os == 'macos-13'
       #  run: sudo installer -pkg python.pkg -target /
 
       - name: "[macOS] Setup the environment"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         env:
           MACOSX_DEPLOYMENT_TARGET: "11.3"
           SYSTEM_VERSION_COMPAT: 0
         run: bash tools/osx/deploy_ci_agent.sh --install-release
 
       - name: "[macOS] Generate the .dmg and validate against 2021"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         timeout-minutes: 20
         env:
           NXDRIVE_TEST_NUXEO_URL: "https://drive-2021.beta.nuxeocloud.com/nuxeo"
@@ -134,7 +134,7 @@ jobs:
         run: bash tools/osx/deploy_ci_agent.sh --check-upgrade
 
       - name: "[macOS] Generate the .dmg and validate against 2023"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         timeout-minutes: 20
         env:
           NXDRIVE_TEST_NUXEO_URL: "https://drive-2023.beta.nuxeocloud.com/nuxeo"

.github/workflows/unit_tests.yml

@@ -40,15 +40,15 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: unit
           env_vars: OS,PYTHON
 
   unit-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     env:
       SYSTEM_VERSION_COMPAT: 0
     steps:
@@ -73,7 +73,7 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -106,7 +106,7 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

docs/changes.md

@@ -22,7 +22,8 @@
 - [5.4.0](changes/5.4.0.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.3.2...release-5.4.0))
 - [5.4.1](changes/5.4.1.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.4.0...release-5.4.1))
 - [5.5.0](changes/5.5.0.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.4.1...release-5.5.0))
-- [5.5.1](changes/5.5.0.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.5.0...master))
+- [5.5.1](changes/5.5.1.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.5.0...release-5.5.1))
+- [5.5.2](changes/5.5.2.md) ([diff](https://github.com/nuxeo/nuxeo-drive/compare/release-5.5.1...master))
 
 ## 4.x
 

docs/changes/5.5.1.md

@@ -1,60 +1,72 @@
 # 5.5.1
 
-Release date: `2024-xx-xx`
-
-## Core
-
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
-
-### Direct Edit
-
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+Release date: `2024-12-12`
 
 ### Direct Transfer
 
 - [NXDRIVE-2909](https://jira.nuxeo.com/browse/NXDRIVE-2909): Set container title when defining the Folder type from Document Type Selection using Direct Transfer
 - [NXDRIVE-2915](https://jira.nuxeo.com/browse/NXDRIVE-2915): Translate "Document type" and "container type" labels on Direct Transfer popup
-
-### Task Management
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+- [NXDRIVE-2925](https://jira.nuxeo.com/browse/NXDRIVE-2925): Ignore zero-byte files
 
 ## GUI
 
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
 - [NXDRIVE-2962] (https://jira.nuxeo.com/browse/NXDRIVE-2962): Update Translation Files
 
 ## Packaging / Build
 
+- [NXDRIVE-2954](https://jira.nuxeo.com/browse/NXDRIVE-2954): [Mac] Certificate needs to be renewed
 - [NXDRIVE-2970](https://jira.nuxeo.com/browse/NXDRIVE-2970): Fix security issue: urllib3's Proxy-Authorization request header isn't stripped during cross-origin redirects
 - [NXDRIVE-2971](https://jira.nuxeo.com/browse/NXDRIVE-2971): Fix security issue: pyca/cryptography has a vulnerable OpenSSL included in cryptography wheels
-
-## Tests
-
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
-
-## Docs
-
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+- [NXDRIVE-2976](https://hyland.atlassian.net/browse/NXDRIVE-2976): Fix security issue: Black vulnerable to Regular Expression Denial of Service (ReDoS)
+- [NXDRIVE-2980](https://jira.nuxeo.com/browse/NXDRIVE-2980): Implement GitHub runner for macos intel based architecture
 
 ## Minor Changes
 
+- Upgraded `altgraph` from 0.17 to 0.17.4
+- Upgraded `attrs` from 23.2.0 to 24.2.0
 - Upgraded `authlib` from 1.3.0 to 1.3.1
+- Upgraded `black` from 23.12.1 to 24.10.0
 - Upgraded `boto3` from 1.34.17 to 1.35.21
 - Upgraded `botocore` from 1.34.17 to 1.35.21
+- Upgraded `build` from 1.2.1 to 1.2.2
 - Upgraded `cachetools` from 5.3.3 to 5.5.0
 - Upgraded `certifi` from 2023.7.22 to 2024.7.4
+- Upgraded `codecov/codecov-action` from 3.1.5 to 5.1.1 
 - Upgraded `cryptography` from 42.0.5 to 43.0.1
 - Upgraded `docutils` from 0.20.1 to 0.21.2
+- Upgraded `execnet` from 2.0.2 to 2.1.1
+- Upgraded `faker` from 22.0.0 to 29.0.0
 - Upgraded `filelock` from 3.14.0 to 3.16.1
 - Upgraded `flake8` from 6.1.0 to 7.1.1
+- Upgraded `future` from 0.18.3 to 1.0.0
+- Upgraded `macholib` from 1.14 to 1.16.3
+- Upgraded `more-itertools` from 10.2.0 to 10.5.0
+- Upgraded `mypy` from 1.10.0 to 1.11.2
+- Upgraded `nodeenv` from 1.8.0 to 1.9.1
+- Upgraded `types-python-dateutil` from 2.8.19.20240106 to 2.9.0.20240906
 - Upgraded `typing-extensions` from 4.9.0 to 4.12.2
+- Upgraded `pefile` from 2023.2.7 to 2024.8.26
+- Upgraded `platformdirs` from 4.2.2 to 4.3.6
 - Upgraded `pre-commit` from 2.16.0 to 3.8.0
 - Upgraded `pycodestyle` from 2.11.1 to 2.12.1
+- Upgraded `pycparser` from 2.21 to 2.22
 - Upgraded `py-cpuinfo` from 8.0.0 to 9.0.0
 - Upgraded `pyflakes` from 3.1.0 to 3.2.0
+- Upgraded `pyobjc-core` from 10.1 to 10.3.1
+- Upgraded `pyobjc-framework-cocoa` from 10.1 to 10.3.1
+- Upgraded `pyobjc-framework-coreservices` from 10.1 to 10.3.1
+- Upgraded `pyobjc-framework-scriptingbridge` from 10.1 to 10.3.1
+- Upgraded `pyobjc-framework-fsevents` from 10.1 to 10.3.1
+- Upgraded `pyobjc-framework-systemconfiguration` from 10.1 to 10.3.1
 - Upgraded `pytest-benchmark` from 3.4.1 to 4.0.0
+- Upgraded `python-dateutil` from 2.8.2 to 2.9.0.post0
+- Upgraded `pytest-xdist` from 3.5.0 to 3.6.1
+- Upgraded `responses` from 0.24.1 to 0.25.3
+- Upgraded `requests` from 2.31.0 to 2.32.3
+- Upgraded `send2trash` from 1.7.1 to 1.8.3
 - Upgraded `setuptools` from 69.5.1 to 72.1.0
 - Upgraded `urllib3` from 1.26.12 to 1.26.19
+- Upgraded `watchdog` from 3.0.0 to 5.0.2
 - Upgraded `zipp` from 3.18.0 to 3.20.0
 
 ## Technical Changes

docs/changes/5.5.2.md

@@ -0,0 +1,42 @@
+# 5.5.2
+
+Release date: `2025-xx-xx`
+
+## Core
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+### Direct Edit
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+### Direct Transfer
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+### Task Management
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+## GUI
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+## Packaging / Build
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+## Tests
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+## Docs
+
+- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
+
+## Minor Changes
+
+-
+
+## Technical Changes
+
+-

nxdrive/__init__.py

@@ -27,7 +27,7 @@
 """
 
 __author__ = "Nuxeo"
-__version__ = "5.5.1"
+__version__ = "5.5.2"
 __copyright__ = """
     Copyright © 2024 Hyland Software, Inc. and its affiliates. All rights reserved.
     All Hyland product names are registered or unregistered trademarks of Hyland Software, Inc. or its affiliates

nxdrive/__main__.py

@@ -2,6 +2,7 @@
 In this file we cannot use a relative import here, else Drive will not start when packaged.
 See https://github.com/pyinstaller/pyinstaller/issues/2560
 """
+
 import locale
 import platform
 import signal

nxdrive/behavior.py

@@ -11,6 +11,7 @@
     Allow or disallow server deletions.
 
 """
+
 from types import SimpleNamespace
 
 Behavior = SimpleNamespace(server_deletion=True)

nxdrive/client/local/__init__.py

@@ -1,4 +1,5 @@
 """ API to access local resources for synchronization. """
+
 from .base import FileInfo, get
 
 # Get the local client related to the current OS

nxdrive/client/uploader/__init__.py

@@ -1,6 +1,7 @@
 """
 Uploader used by the Remote client for all upload stuff.
 """
+
 import json
 from abc import abstractmethod
 from logging import getLogger

nxdrive/client/uploader/direct_transfer.py

@@ -1,6 +1,7 @@
 """
 Uploader used by the Direct Transfer feature.
 """
+
 import json
 from logging import getLogger
 from pathlib import Path

nxdrive/client/uploader/sync.py

@@ -1,6 +1,7 @@
 """
 Uploader used by the synchronization engine.
 """
+
 from pathlib import Path
 from typing import Any, Dict, Optional
 

nxdrive/dao/base.py

@@ -1,6 +1,7 @@
 """
 Query formatting in this file is based on http://www.sqlstyle.guide/
 """
+
 import sys
 from contextlib import suppress
 from logging import getLogger

nxdrive/dao/engine.py

@@ -1,6 +1,7 @@
 """
 Query formatting in this file is based on http://www.sqlstyle.guide/
 """
+
 import json
 import os
 import shutil

nxdrive/dao/manager.py

@@ -1,6 +1,7 @@
 """
 Query formatting in this file is based on http://www.sqlstyle.guide/
 """
+
 from logging import getLogger
 from pathlib import Path
 from sqlite3 import Cursor, IntegrityError, Row