-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
tools: Port to Python 3 #9500
tools: Port to Python 3 #9500
Conversation
Keep tap-{gtester,driver} as python 2, as they are also run on RHEL/CentOS images. But they also work with Python 3 now. Closes cockpit-project#9500
This needs a new ubuntu-1604 image to get python3 into its pbuilder. The other images already have it. |
image-refresh in progress on cockpit-tasks-zgqmz. |
image-refresh ubuntu-1604 done: https://github.com/cockpituous/cockpit/commits/image-refresh-ubuntu-1604-20180626-110303 |
@Gundersanne : I assigned this to you for review, to get you into the mood and show you around more places of Cockpit. This is a rather easy one which self-tests. For any review, please don't shy away to ask about anything that's unclear - often these are a sign that some change needs a better commit message, or a comment, or needs more legible code, and so on. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just one small question.
@@ -27,7 +27,7 @@ from glob import glob | |||
|
|||
proj_dir = os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))) | |||
|
|||
max_version = 0 | |||
max_version = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A bit further on there's a max_version == 0
check. Won't that always be False now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well spotted, thanks! Fixed.
Keep tap-{gtester,driver} as python 2, as they are also run on RHEL/CentOS images. But they also work with Python 3 now. This requires an updated ubuntu-1604 image with python3 in the pbuilder chroot (the other images already have it). Closes cockpit-project#9500
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks 👍
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also returned the following commits that are not included in Cockpit: * 918ab83 * 7e75a62 * 7120f44 Maybe they should be upstreamed.
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also included are the following gnome-keyring commits that are not included in Cockpit: * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/918ab836fd23f9b2c0bf655c7f4f575bffff3189 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7e75a62e846551c19b9c875f7b237a07ee3b93e1 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7120f44ceedd5c10802781d64a5829b3c6d8e13f Basically a copy of https://gitlab.gnome.org/GNOME/gnome-keyring/merge_requests/4
…kpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also included are the following gnome-keyring commits that are not included in Cockpit: * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/918ab836fd23f9b2c0bf655c7f4f575bffff3189 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7e75a62e846551c19b9c875f7b237a07ee3b93e1 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7120f44ceedd5c10802781d64a5829b3c6d8e13f Basically a copy of https://gitlab.gnome.org/GNOME/gnome-keyring/merge_requests/4
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also included are the following gnome-keyring commits that are not included in Cockpit: * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/918ab836fd23f9b2c0bf655c7f4f575bffff3189 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7e75a62e846551c19b9c875f7b237a07ee3b93e1 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7120f44ceedd5c10802781d64a5829b3c6d8e13f Basically a copy of https://gitlab.gnome.org/GNOME/gnome-keyring/merge_requests/4
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also included are the following commits that are not included in Cockpit: * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/918ab836fd23f9b2c0bf655c7f4f575bffff3189 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7e75a62e846551c19b9c875f7b237a07ee3b93e1 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7120f44ceedd5c10802781d64a5829b3c6d8e13f * https://gitlab.gnome.org/GNOME/libsecret/commit/98d12ea2201ec5b52e561e06b3af85be95fcb482 Basically a copy of https://gitlab.gnome.org/GNOME/gnome-keyring/merge_requests/4
This replaces tap-driver and tap-gtester with fresh versions from Cockpit. cockpit-project/cockpit#9500 https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting Also included are the following gnome-keyring commits that are not included in Cockpit: * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/918ab836fd23f9b2c0bf655c7f4f575bffff3189 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7e75a62e846551c19b9c875f7b237a07ee3b93e1 * https://gitlab.gnome.org/GNOME/gnome-keyring/commit/7120f44ceedd5c10802781d64a5829b3c6d8e13f Basically a copy of https://gitlab.gnome.org/GNOME/gnome-keyring/merge_requests/4
Keep tap-{gtester,driver} as python 2, as they are also run on
RHEL/CentOS images. But they also work with Python 3 now.