Replace functools.wraps with six.wraps #674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thank you for contributing to the Leapp project!Please note that every PR needs to comply with the If you want to re-run tests or request review, you can use following commands as a comment:
Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please consider rerunning the CI by commenting leapp-ci build (might require several comments). If the problem persists, contact leapp-infra. |
vinzenz
force-pushed
the
six_wraps_move
branch
from
3ee84c0
to
a69c164
Compare
|
Adding reference for the orig issue discussion on pytest upstream pytest-dev/pytest#2782 Fix seems good. I will wait for test results. |
pirat89
previously approved these changes
Oct 27, 2020
Previously we have been using functools.wraps. However if any decorator that uses functools.wraps is used, some code that relies on __wrapped__ being present, e.g. pytest, will fail on Python2. Switching to six.wraps will solve this problem, as it introduces this change as well and solves the missing __wrapped__ attribute. Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>
vinzenz
force-pushed
the
six_wraps_move
branch
from
a69c164
to
52de6da
Compare
pirat89
approved these changes
Oct 27, 2020
drehak
added a commit
to drehak/leapp
that referenced
this pull request
Feb 2, 2021
## Packaging - Bump leapp-framework capability to 1.4 ## Framework ### Fixes - Replace functools.wraps with six.wraps (oamg#674) ### Enhancements - Add a stable report identifier (oamg#669) - Add a way to override default python version through environment variables (oamg#675) - Add a possibility to overwrite virtualenv name through environment variables (oamg#675) Related leapp-repository release: https://github.com/oamg/leapp-repository/releases/tag/v0.13.0
drehak
added a commit
to drehak/leapp
that referenced
this pull request
Feb 2, 2021
## Packaging - Bump leapp-framework capability to 1.4 ## Framework ### Fixes - Replace functools.wraps with six.wraps (oamg#674) ### Enhancements - Add a stable report identifier (oamg#669) - Add a way to override default python version through environment variables (oamg#675) - Add a possibility to overwrite virtualenv name through environment variables (oamg#675) Related leapp-repository release: https://github.com/oamg/leapp-repository/releases/tag/v0.13.0 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Tue Feb 2 15:57:58 2021 +0100 # # On branch release/202102 # Your branch is up to date with 'drehak/release/202102'. # # No changes
Merged
drehak
added a commit
to drehak/leapp
that referenced
this pull request
Feb 4, 2021
## Packaging - Add JSON schema of leapp reports for validation (oamg#681) - Bump leapp-framework capability to 1.4 (oamg#684) ## Framework ### Fixes - Fix Py2/Py3 issues for unit-tests relying on __wrapped__ for decorators (oamg#674) ### Enhancements - Add a stable report identifier for each generated report (oamg#669) ## Additional changes interesting for devels - Add a possibility to overwrite virtualenv name for testing `$VENVNAME` (oamg#675) - Add a way to override default python version using `$PYTHON_VENV` (oamg#675) Related leapp-repository release: https://github.com/oamg/leapp-repository/releases/tag/v0.13.0
drehak
added a commit
to drehak/leapp
that referenced
this pull request
Feb 4, 2021
## Packaging - Add JSON schema of leapp reports for validation (oamg#681) - Bump leapp-framework capability to 1.4 (oamg#684) ## Framework ### Fixes - Fix Py2/Py3 issues for unit-tests relying on __wrapped__ for decorators (oamg#674) ### Enhancements - Add a stable report identifier for each generated report (oamg#669) ## Additional changes interesting for devels - Add a possibility to overwrite virtualenv name for testing `$VENVNAME` (oamg#675) - Add a way to override default python version using `$PYTHON_VENV` (oamg#675) Related leapp-repository release: https://github.com/oamg/leapp-repository/releases/tag/v0.13.0
pirat89
pushed a commit
that referenced
this pull request
Feb 4, 2021
## Packaging - Add JSON schema of leapp reports for validation (#681) - Bump leapp-framework capability to 1.4 (#684) ## Framework ### Fixes - Fix Py2/Py3 issues for unit-tests relying on __wrapped__ for decorators (#674) ### Enhancements - Add a stable report identifier for each generated report (#669) ## Additional changes interesting for devels - Add a possibility to overwrite virtualenv name for testing `$VENVNAME` (#675) - Add a way to override default python version using `$PYTHON_VENV` (#675) Related leapp-repository release: https://github.com/oamg/leapp-repository/releases/tag/v0.13.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we have been using functools.wraps. However if any decorator
that uses functools.wraps is used, some code that relies on wrapped
being present, e.g. pytest, will fail on Python2. Switching to six.wraps
will solve this problem, as it introduces this change as well and solves
the missing wrapped attribute.
Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com