[v7r0] Modify __init__.py to avoid conflicts with rel-v7r2#4894
Merged
Conversation
fstagni
approved these changes
Jan 14, 2021
atsareg
reviewed
Jan 18, 2021
| patchLevel = 44 | ||
| preVersion = 0 | ||
|
|
||
| version = "v%sr%s" % (majorVersion, minorVersion) |
Contributor
There was a problem hiding this comment.
If the (majorVersion, minorVersion) are not defined above (pythonVersion[0] == "3") this line will fail. This show up in the test now. I guess this is not a problem yet since we do not yet use python3 but somehow this should be corrected. For example, the subsequent code block should be indented to be inside the else: close
Contributor
There was a problem hiding this comment.
I see. Do you think that #4865 is ready to be merged ? Since I have not yet went through it I did not merge it as formally it is not yet approved. I have made a simple fix in the integration DIRAC/init.py to let the tests pass for the moment
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This isn't strictly needed but I think it will make the conflicts with #4865 easier to handle.