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.

Sign up for GitHub

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

Jump to bottom

Bump ipaddress python package #403

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Bump ipaddress python package #403

merged 1 commit into from
Jul 24, 2023

Conversation

Fryguy
Copy link
Member

@Fryguy Fryguy commented Jul 24, 2023

@agrare Please review.

@Fryguy Fryguy marked this pull request as ready for review July 24, 2023 13:22
@agrare
Copy link
Member

agrare commented Jul 24, 2023 •
edited
Loading

This is for the error:
/var/lib/manageiq/venv/lib/python3.8/site-packages/ipaddress.py:1106: SyntaxWarning: 'str' object is not callable; perhaps you missed a comma?

Fixed by phihag/ipaddress#48
pypa/pip#7215 (comment)

@miq-bot
Copy link
Member

miq-bot commented Jul 24, 2023

Checked commit Fryguy@a12bbc7 with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 👍

@agrare agrare merged commit b390789 into ManageIQ:master Jul 24, 2023
3 of 4 checks passed
@Fryguy Fryguy deleted the bump_ipaddress branch July 25, 2023 13:06
@Fryguy
Copy link
Member Author

Fryguy commented Jul 25, 2023

Backported to petrosian in commit 436b95d.

commit 436b95d9c5fa4a32f52c932dc4b2958e41ac8a90
Author: Adam Grare <[email protected]>
Date:   Mon Jul 24 09:37:14 2023 -0400

    Merge pull request #403 from Fryguy/bump_ipaddress
    
    Bump ipaddress python package
    
    (cherry picked from commit b39078998ec68f0adcb1cb07347cba41a17ff3a2)

Fryguy pushed a commit that referenced this pull request Jul 25, 2023
@agrare @Fryguy
Merge pull request #403 from Fryguy/bump_ipaddress
436b95d 
Bump ipaddress python package

(cherry picked from commit b390789)
@Fryguy
Copy link
Member Author

Fryguy commented Jul 26, 2023

@Fryguy A conflict occurred during the backport of this pull request to morphy.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the morphy branch in order to resolve this.

Conflict details:

* Unmerged path config/requirements.txt

Fryguy added a commit to Fryguy/manageiq-appliance-build that referenced this pull request Jul 26, 2023
@Fryguy
Bump ipaddress python package
dac5841 
morphy backport of ManageIQ/manageiq-rpm_build#403
@Fryguy Fryguy mentioned this pull request Jul 26, 2023
Merged
@Fryguy
Copy link
Member Author

Fryguy commented Jul 26, 2023

Backported to morphy via ManageIQ/manageiq-appliance-build#553

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agrare agrare agrare approved these changes

Assignees

@agrare agrare

Labels
dependencies morphy/backported petrosian/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Fryguy @agrare @miq-bot