Skip to content

⬆️ Upgrade dependencies#3455

Merged
jamshale merged 11 commits intoopenwallet-foundation:mainfrom
didx-xyz:update-deps
Jan 23, 2025
Merged

⬆️ Upgrade dependencies#3455
jamshale merged 11 commits intoopenwallet-foundation:mainfrom
didx-xyz:update-deps

Conversation

@ff137
Copy link
Member

@ff137 ff137 commented Jan 20, 2025

Includes major upgrades, where I've eyeballed changelogs to confirm they don't include relevant breaking changes. We'll let the tests be the judge.

➖ Removes async-timeout, as it's been pulled into asyncio

⬆️ Upgrades:

  • deepmerge
  • jsonpath-ng
  • markupsafe
  • marhsmallow
  • packaging
  • portalocker
  • python-json-logger
  • qrcode
  • pre-commit
  • aiohttp-apispec-acapy

🎨 Resolves deprecation warnings


The only packages that remain outdated:
- apispec (6.6.1 vs 6.8.1)
- webargs (8.4.0 vs 8.6.0)

^ these are held back by aiohttp-apispec-acapy
@jamshale I've upgrade the fork to be more permissive for these dependencies, so they can be upgraded: https://github.com/ff137/aiohttp-apispec
Edit: thanks Jamie! Upgrade included


  • aries-askar (0.3.2 vs 0.4.1)
  • cached-property (1.5.2 vs 2.0.1)

^ held back by did-webvh, which needs more relaxed restriction on askar: decentralized-identity/didwebvh-py#18


Copy link
Contributor

@jamshale jamshale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to move forward on this but we need to get a patch release done before these changes go in. Will block until that is complete.

@ff137
Copy link
Member Author

ff137 commented Jan 20, 2025

Will also have to debug why agent in interop test doesn't start up

@ff137 ff137 marked this pull request as draft January 20, 2025 19:42
@swcurran
Copy link
Contributor

We're seeing that happening in the Agent Test Harness tests as well - intermittent non-starting of the agent. Might be the issue.

@ff137 ff137 marked this pull request as ready for review January 21, 2025 15:41
@jamshale jamshale self-requested a review January 22, 2025 18:09
@jamshale jamshale dismissed their stale review January 22, 2025 18:10

No longer blocked...

@ff137
Copy link
Member Author

ff137 commented Jan 23, 2025

@swcurran I included unpinning of the remaining dependencies that were set to 1 specific version, and some last improvements. Which will hopefully help improve on that scorecard.

Tried upgrading to next marshmallow release, but 1 pytest broke, and didn't have time to dig into it now. So leaving marshmallow upgrade for later

edit: managed to figure out the Marshmallow change -- just a TypeError that needs to be handled in deserialization, to fix test that expects a specific error

@jamshale
Copy link
Contributor

https://pypi.org/project/aiohttp-apispec-acapy/3.0.3/ Is now available with the unpinned dependencies if you want to include it in this PR.

ff137 added 10 commits January 23, 2025 19:48
async-timeout has been pulled into asyncio since python 3.11

Signed-off-by: ff137 <ff137@proton.me>
Includes major upgrades without breaking changes

Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Remove deprecated field (order is now preserved by default)

Handle new TypeError

Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Fixes: `ChangedInMarshmallow4Warning: Returning `False` from a validator is deprecated. Raise a `ValidationError` instead.`
Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
Signed-off-by: ff137 <ff137@proton.me>
@ff137
Copy link
Member Author

ff137 commented Jan 23, 2025

https://pypi.org/project/aiohttp-apispec-acapy/3.0.3/ Is now available with the unpinned dependencies if you want to include it in this PR.

Awesome, thank you! Included

One step closer to running with 3.13 👀

edit: just got saw all PR tests pass in python3.13 🚀

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jan 23, 2025

Copy link
Contributor

@jamshale jamshale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me and tests are all passing so should be safe 👍


async def asyncTearDown(self):
# Ensure the event loop is closed
await self.profile.close()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@jamshale jamshale merged commit d93518f into openwallet-foundation:main Jan 23, 2025
11 checks passed
ff137 added a commit to didx-xyz/acapy that referenced this pull request Jan 29, 2025
* ➖ Remove deprecated package

async-timeout has been pulled into asyncio since python 3.11

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade dependencies

Includes major upgrades without breaking changes

Signed-off-by: ff137 <ff137@proton.me>

* 📌 Unpin dependency versions

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pre-commit

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix deprecation warning - module moved

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade marshmallow

Remove deprecated field (order is now preserved by default)

Handle new TypeError

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Update lock file

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Resolve Marshmallow deprecation warning

Fixes: `ChangedInMarshmallow4Warning: Returning `False` from a validator is deprecated. Raise a `ValidationError` instead.`
Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix pytest-asyncio warning: unclosed event loop

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade aiohttp-apispec-acapy

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pydevd-pycharm

Signed-off-by: ff137 <ff137@proton.me>

---------

Signed-off-by: ff137 <ff137@proton.me>
ff137 added a commit to didx-xyz/acapy that referenced this pull request Feb 13, 2025
* ➖ Remove deprecated package

async-timeout has been pulled into asyncio since python 3.11

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade dependencies

Includes major upgrades without breaking changes

Signed-off-by: ff137 <ff137@proton.me>

* 📌 Unpin dependency versions

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pre-commit

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix deprecation warning - module moved

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade marshmallow

Remove deprecated field (order is now preserved by default)

Handle new TypeError

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Update lock file

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Resolve Marshmallow deprecation warning

Fixes: `ChangedInMarshmallow4Warning: Returning `False` from a validator is deprecated. Raise a `ValidationError` instead.`
Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix pytest-asyncio warning: unclosed event loop

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade aiohttp-apispec-acapy

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pydevd-pycharm

Signed-off-by: ff137 <ff137@proton.me>

---------

Signed-off-by: ff137 <ff137@proton.me>
ff137 added a commit to didx-xyz/acapy that referenced this pull request Feb 13, 2025
* ➖ Remove deprecated package

async-timeout has been pulled into asyncio since python 3.11

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade dependencies

Includes major upgrades without breaking changes

Signed-off-by: ff137 <ff137@proton.me>

* 📌 Unpin dependency versions

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pre-commit

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix deprecation warning - module moved

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade marshmallow

Remove deprecated field (order is now preserved by default)

Handle new TypeError

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Update lock file

Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Resolve Marshmallow deprecation warning

Fixes: `ChangedInMarshmallow4Warning: Returning `False` from a validator is deprecated. Raise a `ValidationError` instead.`
Signed-off-by: ff137 <ff137@proton.me>

* 🎨 Fix pytest-asyncio warning: unclosed event loop

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade aiohttp-apispec-acapy

Signed-off-by: ff137 <ff137@proton.me>

* ⬆️ Upgrade pydevd-pycharm

Signed-off-by: ff137 <ff137@proton.me>

---------

Signed-off-by: ff137 <ff137@proton.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants