Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependabot/pip/cryptography 42.0.4 #6545

Merged

Conversation

matmair
Copy link
Member

@matmair matmair commented Feb 21, 2024

Replaces #6544 - contains merge fix
Closes #6544

dependabot bot and others added 3 commits February 21, 2024 20:41
Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.2 to 42.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.2...42.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@matmair matmair self-assigned this Feb 21, 2024
Copy link

netlify bot commented Feb 21, 2024

Deploy Preview for inventree-web-pui-preview canceled.

Name Link
🔨 Latest commit 35ed33c
🔍 Latest deploy log https://app.netlify.com/sites/inventree-web-pui-preview/deploys/65d669952eddf400086fcbcd

@matmair matmair added dependency Relates to a project dependency security Relates to a security issue python Pull requests that update Python code labels Feb 21, 2024
@matmair matmair marked this pull request as ready for review February 21, 2024 21:22
@matmair
Copy link
Member Author

matmair commented Feb 21, 2024

Important security update, enabling auto-merge

@matmair matmair added this to the 0.13.6 milestone Feb 21, 2024
@SchrodingersGat SchrodingersGat added backport Apply this label to a PR to enable auto-backport action backport-to-0.13.x labels Feb 21, 2024
@SchrodingersGat SchrodingersGat merged commit c4d68ae into inventree:master Feb 21, 2024
27 checks passed
Copy link
Contributor

💔 All backports failed

Status Branch Result
0.13.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

backport --pr 6545

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

SchrodingersGat pushed a commit to SchrodingersGat/InvenTree that referenced this pull request Feb 21, 2024
* Bump cryptography from 42.0.2 to 42.0.4

Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.2 to 42.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.2...42.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix merge

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@SchrodingersGat SchrodingersGat modified the milestones: 0.13.6, 0.14.0 Feb 21, 2024
SchrodingersGat added a commit that referenced this pull request Feb 21, 2024
* Dependabot/pip/cryptography 42.0.4 (#6545)

* Bump cryptography from 42.0.2 to 42.0.4

Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.2 to 42.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.2...42.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix merge

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix unused var

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Matthias Mair <code@mjmair.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot dependabot bot deleted the dependabot/pip/cryptography-42.0.4 branch February 22, 2024 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Apply this label to a PR to enable auto-backport action dependency Relates to a project dependency python Pull requests that update Python code security Relates to a security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants