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

*.py: s/python/python3/ (exclude tests) #3647

Merged
merged 1 commit into from Apr 20, 2021

Conversation

yifan19
Copy link

@yifan19 yifan19 commented Apr 15, 2021

As stated by #3603
python2 is EOL.

Fix all shebangs calling python instead of python3
except the tests.

(correcting lib/merge-grammar.py)
Signed-off-by: Joe Slater joe.slater@windriver.com
(adding the rest)2a1a44fade7e73872361568bd2dad235d083dcf1
Signed-off-by: Yi Fan Yu yifan.yu@windriver.com

@kira-syslogng
Copy link
Contributor

This user does not have permission to start the build. Can one of the admins verify this patch and start the build?
(admin: you have the next options (make sure you checked the code):
"ok to test" to accept this pull request (and further changes) for testing
"test this please" for a one time test run
"add to whitelist" add author of a Pull Request to whitelist (globally, be careful, it means this user can trigger kira for any PR)
do nothing -> CI won't start)

1 similar comment
@kira-syslogng
Copy link
Contributor

This user does not have permission to start the build. Can one of the admins verify this patch and start the build?
(admin: you have the next options (make sure you checked the code):
"ok to test" to accept this pull request (and further changes) for testing
"test this please" for a one time test run
"add to whitelist" add author of a Pull Request to whitelist (globally, be careful, it means this user can trigger kira for any PR)
do nothing -> CI won't start)

@Kokan
Copy link
Collaborator

Kokan commented Apr 16, 2021

@kira-syslogng ok to test

Copy link
Collaborator

@Kokan Kokan 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. The CI sadly fails, the one regarding mac os is an issue on the current master also, you can ignore that. The other one is a style check of the commit message, it does not like the * in the*.py, I would just replace it with python: and that should help.

@kira-syslogng
Copy link
Contributor

Build SUCCESS

As stated by syslog-ng#3603
python2 is EOL.

Fix all shebangs calling python instead of python3
except the tests.

(correcting lib/merge-grammar.py)
Signed-off-by: Joe Slater <joe.slater@windriver.com>
(adding the rest)
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
@yifan19
Copy link
Author

yifan19 commented Apr 16, 2021

Looks good to me. The CI sadly fails, the one regarding mac os is an issue on the current master also, you can ignore that. The other one is a style check of the commit message, it does not like the * in the*.py, I would just replace it with python: and that should help.

done.

@kira-syslogng
Copy link
Contributor

Build SUCCESS

Copy link
Collaborator

@gaborznagy gaborznagy 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.

I'm waiting with the merge, until an internal test is not finished.

@gaborznagy gaborznagy merged commit f3b7ce3 into syslog-ng:master Apr 20, 2021
gaborznagy pushed a commit to gaborznagy/syslog-ng that referenced this pull request May 5, 2021
…log-ng.spec

After PR syslog-ng#3647 lib/merge-grammar.py has python3 in it's shebang instead of "python",
there is no need for the sed command anymore in the .spec file (python2 is not supported).

Also, the sed expression currently creates an invalid python reference, see result:
"#!/usr/bin/python33"

Packaging CI jobs doesn't hit this issue, as they are creating packages from tarball
(as intended due to bison v3.7.6 which is not yet available on many platforms).
This bug prevented releasing on rpm platforms where the grammar files are changed.

Signed-off-by: Gabor Nagy <gabor.nagy@oneidentity.com>
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.

None yet

4 participants