Skip to content

Commit

Permalink
Merge branch 'wip-NXDRIVE-2929-upgrade-python-from-3.9.5-to-3.12.3' of
Browse files Browse the repository at this point in the history
…https://github.com/nuxeo/nuxeo-drive into test_datetime_adapter_new
  • Loading branch information
gitofanindya committed Jan 6, 2025
2 parents ef063c1 + 620f79a commit 0582844
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 69 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/functional_tests_2023.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
32 changes: 10 additions & 22 deletions docs/changes/5.5.1.md
Original file line number Diff line number Diff line change
@@ -1,61 +1,48 @@
# 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
- [NXDRIVE-2925](https://jira.nuxeo.com/browse/NXDRIVE-2925): Ignore zero-byte files

### Task Management
- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):

## 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
- [NXDRIVE-2954](https://jira.nuxeo.com/browse/NXDRIVE-2954): [Mac] Certificate needs to be renewed
- [NXDRIVE-2976](https://hyland.atlassian.net/browse/NXDRIVE-2976): Fix security issue: Black vulnerable to Regular Expression Denial of Service (ReDoS)

## Tests

- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):

## Docs

- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
- [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
Expand All @@ -73,6 +60,7 @@ Release date: `2024-xx-xx`
- 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
Expand Down
42 changes: 42 additions & 0 deletions docs/changes/5.5.2.md
Original file line number Diff line number Diff line change
@@ -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

-
2 changes: 1 addition & 1 deletion nxdrive/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tools/deps/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ future==1.0.0; sys_platform == "win32" \
--hash=sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216 \
--hash=sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05
# via pefile
macholib==1.14 ; sys_platform == "darwin" \
--hash=sha256:c500f02867515e6c60a27875b408920d18332ddf96b4035ef03beddd782d4281 \
--hash=sha256:0c436bc847e7b1d9bda0560351bf76d7caf930fb585a828d13608839ef42c432
macholib==1.16.3 ; sys_platform == "darwin" \
--hash=sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30 \
--hash=sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c
# via pyinstaller
pefile==2024.8.26 ; sys_platform == "win32" \
--hash=sha256:3ff6c5d8b43e8c37bb6e6dd5085658d658a7a0bdcd20b6a07b1fcfc1c4e9d632 \
Expand Down
30 changes: 15 additions & 15 deletions tools/deps/requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ apipkg==3.0.2 \
atomicwrites==1.4.1; sys_platform == "win32" \
--hash=sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11
# via pytest
attrs==23.2.0 \
--hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \
--hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
attrs==24.2.0 \
--hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
--hash=sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2
# via pytest
black==24.10.0 \
--hash=sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f \
Expand Down Expand Up @@ -115,9 +115,9 @@ exceptiongroup==1.2.1 \
--hash=sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad \
--hash=sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16
# via pytest
execnet==2.0.2 \
--hash=sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41 \
--hash=sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af
execnet==2.1.1 \
--hash=sha256:26dee51f1b80cebd6d0ca8e74dd8745419761d3bef34163928cbebbdc4749fdc \
--hash=sha256:5189b52c6121c24feae288166ab41b32549c7e2348652736540b9e6e7d4e72e3
# via pytest-xdist
faker==29.0.0 \
--hash=sha256:32d0ee7d42925ff06e4a7d906ee7efbf34f5052a41a2a1eb8bb174a422a5498f \
Expand Down Expand Up @@ -148,9 +148,9 @@ mccabe==0.7.0 \
--hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \
--hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e
# via flake8
more-itertools==10.2.0 \
--hash=sha256:686b06abe565edfab151cb8fd385a05651e1fdf8f0a14191e4439283421f8684 \
--hash=sha256:8fccb480c43d3e99a00087634c06dd02b0d50fbf088b380de5a41a015ec239e1
more-itertools==10.5.0 \
--hash=sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef \
--hash=sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6
# via pytest
mypy==1.11.2 \
--hash=sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36 \
Expand Down Expand Up @@ -184,9 +184,9 @@ mypy-extensions==1.0.0 \
--hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
--hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
# via mypy
nodeenv==1.8.0 \
--hash=sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2 \
--hash=sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec
nodeenv==1.9.1 \
--hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \
--hash=sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9
# via pre-commit
packaging==24.0 \
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
Expand Down Expand Up @@ -228,9 +228,9 @@ pytest-cov==5.0.0 \
pytest-timeout==2.3.1 \
--hash=sha256:12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9 \
--hash=sha256:68188cb703edfc6a18fad98dc25a3c61e9f24d644b0b70f33af545219fc7813e
pytest-xdist==3.5.0 \
--hash=sha256:cbb36f3d67e0c478baa57fa4edc8843887e0f6cfc42d677530a36d7472b32d8a \
--hash=sha256:d075629c7e00b611df89f490a5063944bee7a4362a5ff11c7cc7824a03dfce24
pytest-xdist==3.6.1 \
--hash=sha256:9ed4adfb68a016610848639bb7e02c9352d5d9f03d04809919e2dafc3be4cca7 \
--hash=sha256:ead156a4db231eec769737f57668ef58a2084a34b2e55c4a8fa20d861107300d
pytest==8.2.1 \
--hash=sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd \
--hash=sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1
Expand Down
Loading

0 comments on commit 0582844

Please sign in to comment.