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

2-3-Compatibility of Python Code #75

Merged
merged 7 commits into from
Apr 3, 2020
Merged

Conversation

vvolkl
Copy link
Contributor

@vvolkl vvolkl commented Mar 24, 2020

BEGINRELEASENOTES

  • Fixes in python code for 2-3 compatibility

ENDRELEASENOTES

python/EventStore.py Outdated Show resolved Hide resolved
@petricm
Copy link

petricm commented Mar 24, 2020

Please check the gihub actions for python, you still have several problems

@petricm
Copy link

petricm commented Mar 24, 2020

Also it would be good to install the python stuff under lib[64]/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages

@vvolkl
Copy link
Contributor Author

vvolkl commented Mar 24, 2020

Also it would be good to install the python stuff under lib[64]/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages

Agreed, as there are actually a few issues to fix with the python code organization. I'd propose I do it in a separate PR.

Copy link
Member

@andresailer andresailer left a comment

Choose a reason for hiding this comment

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

Thanks for quickly taking care of this.
Not sure if this was using an automated tool or by hand?

I think we don't have to use six either otherwise we should ship it to make sure it exists, and I made proposals inline to that effect, though maybe I missed some cases.
Also some other proposals to do change some code for niceness

python/podio_class_generator.py Outdated Show resolved Hide resolved
python/EventStore.py Outdated Show resolved Hide resolved
python/podio_class_generator.py Outdated Show resolved Hide resolved
python/podio_class_generator.py Outdated Show resolved Hide resolved
python/podio_class_generator.py Outdated Show resolved Hide resolved
python/podio_config_reader.py Outdated Show resolved Hide resolved
python/podio_config_reader.py Outdated Show resolved Hide resolved
python/podio_config_reader.py Outdated Show resolved Hide resolved
python/podio_class_generator.py Outdated Show resolved Hide resolved
python/podio_class_generator.py Outdated Show resolved Hide resolved
@vvolkl vvolkl requested a review from petricm March 27, 2020 08:24
Copy link
Member

@andresailer andresailer left a comment

Choose a reason for hiding this comment

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

Looks good to me

Copy link

@petricm petricm left a comment

Choose a reason for hiding this comment

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

You still did not resolved 2 vs 4 indent or what are we doing about this?

setup.cfg Outdated
# line break after binary operator (contradicts W503)
W504
# module level import not at top of file (poblem with ROOT)
E402
Copy link

Choose a reason for hiding this comment

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

E402 what if you just flag the lines of ROOT as false positives

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@vvolkl
Copy link
Contributor Author

vvolkl commented Mar 30, 2020

@petricm good point, I just switched everything to 4 spaces now.

@vvolkl
Copy link
Contributor Author

vvolkl commented Mar 31, 2020

As discussed in the EDM4hep meeting, I changed this to 2 spaces indent. @gaede should be good to merge now!

@gaede gaede merged commit bb3e1a6 into AIDASoft:master Apr 3, 2020
gaede pushed a commit that referenced this pull request Apr 3, 2020
@vvolkl vvolkl deleted the python3-compat branch April 4, 2020 14:17
@vvolkl vvolkl mentioned this pull request Apr 4, 2020
@andresailer andresailer linked an issue Sep 21, 2020 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add python3 compatibility
4 participants