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

Upgrade Python tools to Python3 #5846

Merged
merged 6 commits into from Oct 5, 2019
Merged

Conversation

adhaamehab
Copy link
Contributor

@adhaamehab adhaamehab commented Sep 30, 2019

A work in progress PR

This PR fixes #5762

Note: Commits will be squashed after all the changes are done!

  • The Python shebang lines should be #!/usr/bin/env python3 unless the code is compatible with both Python 2.x and 3.x. If our script says it requires Python2 but the shebang line just says python, it will fail if the system resolves that to Python 3.
    Python in the osquery build and test systems:

  • osquery/tools/analysis/*

  • osquery/tools/build_defs/oss/osquery/*

  • osquery/tools/codegen/*

  • osquery/tools/deployment/*

  • osquery/tools/get_platform.py

  • osquery/tools/hooks/pre_commit.py

  • osquery/tools/tests/*

  • osquery/tools/cmake/downloader.py

  • osquery/tools/formatting/*

@linux-foundation-easycla
Copy link

CLA Check
One or more committers are not authorized under a signed CLA as indicated below. Please click here to be authorized.

@mike-myers-tob mike-myers-tob added build macOS Catalina For things pertaining to macOS 10.15 test labels Oct 2, 2019
@adhaamehab adhaamehab force-pushed the master branch 5 times, most recently from cd3246b to e59a81e Compare October 2, 2019 21:57
tools/cmake/downloader.py Outdated Show resolved Hide resolved
@adhaamehab adhaamehab changed the title [WIP] Upgrade Python tools to Python3 Upgrade Python tools to Python3 Oct 3, 2019
@adhaamehab
Copy link
Contributor Author

@theopolis apparently the failed checks are issue with Buck build.

@theopolis
Copy link
Member

Thanks for the work here, do you mind rebasing onto master to fix the CI false positive?

@theopolis
Copy link
Member

Thanks for the work here, do you mind rebasing onto master to fix the CI false positive?

I can trigger the rebase too apparently.

@adhaamehab
Copy link
Contributor Author

@theopolis I think this is now ready for review whenever you have time!

@theopolis theopolis merged commit 657932c into osquery:master Oct 5, 2019
muffins pushed a commit to muffins/osquery that referenced this pull request Oct 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build macOS Catalina For things pertaining to macOS 10.15 test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade Python tools to Python3 before Python2 EOL
3 participants