Skip to content

[v7r0] Modify __init__.py to avoid conflicts with rel-v7r2 #4894

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

Merged
atsareg merged 1 commit into from
Jan 18, 2021
Merged

[v7r0] Modify __init__.py to avoid conflicts with rel-v7r2 #4894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@
import _strptime


# Define Version

majorVersion = 7
minorVersion = 0
patchLevel = 44
preVersion = 0
# Define Version, use an unsual structure to minimise conflicts with rel-v7r2
pythonVersion = pyPlatform.python_version_tuple()
if pythonVersion[0] == "3":
pass
else:
majorVersion = 7
minorVersion = 0
patchLevel = 44
preVersion = 0

version = "v%sr%s" % (majorVersion, minorVersion)

@atsareg atsareg Jan 18, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@chrisburr chrisburr Jan 18, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It's intended to be combined with #4865

@atsareg atsareg Jan 18, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

buildVersion = "v%dr%d" % (majorVersion, minorVersion)
Expand All @@ -108,8 +111,6 @@

__pythonMajorVersion = ("2", )
__pythonMinorVersion = ("7")

pythonVersion = pyPlatform.python_version_tuple()
if str(pythonVersion[0]) not in __pythonMajorVersion or str(pythonVersion[1]) not in __pythonMinorVersion:
print("Python Version %s not supported by DIRAC" % pyPlatform.python_version())
print("Supported versions are: ")
Expand Down