Skip to content

[Build System: build-script] Adopt the six compatibility library in the build_swift module. #29244

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

Jump to bottom
Merged
merged 1 commit into from
Jan 18, 2020
Merged

[Build System: build-script] Adopt the six compatibility library in the build_swift module. #29244

merged 1 commit into from
Jan 18, 2020

Conversation

Rostepher
Copy link
Contributor

@Rostepher Rostepher commented Jan 16, 2020 •
edited
Loading

Based on the changes in #29243

@Rostepher Rostepher requested review from compnerd and edymtt January 16, 2020 02:37
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher
Copy link
Contributor Author

Looks like six is not installed on the Linux nodes. It comes default with macOS, so maybe we should also consider adding it to the Linux images we use?

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 0104dae to 786ddd1 Compare January 16, 2020 07:16
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher mentioned this pull request Jan 16, 2020
Merged
@compnerd
Copy link
Member

@Rostepher - yeah, I think @shahmishal would be able to help with that.

@shahmishal
Copy link
Member

Yes, I will look into this tomorrow.

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 786ddd1 to 74db77d Compare January 17, 2020 06:41
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 74db77d to 14c10e4 Compare January 17, 2020 06:55
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 14c10e4 to edb7fee Compare January 17, 2020 07:36
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher mentioned this pull request Jan 17, 2020
Merged
@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from edb7fee to 8ee1805 Compare January 17, 2020 08:36
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 8ee1805 to fe75013 Compare January 17, 2020 10:55
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher
Copy link
Contributor Author

Fun fact, I think the version of six that comes pre-installed on macOS (or at least the one on the macOS build nodes) is at least 5 years old as it doesn't include six.moves.shlex_quote.

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from fe75013 to 71f5cf3 Compare January 17, 2020 23:20
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher force-pushed the adopt-six-in-build-swift branch from 71f5cf3 to 0fdef59 Compare January 17, 2020 23:44
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@Rostepher Rostepher merged commit 516ad28 into swiftlang:master Jan 18, 2020
@Rostepher
Copy link
Contributor Author

And thus the age of Python 2 fades into the twilight, Python 3 looms over the horizon.

@Rostepher Rostepher deleted the adopt-six-in-build-swift branch January 18, 2020 19:57
@drodriguez
Copy link
Contributor

@shahmishal: maybe on Tuesday someone should send an email about this new requirement for the community CI nodes maintainers. The Android ones didn't have this dependency installed.

@Rostepher: maybe you should create an additional PR to change the READMEs (https://github.com/apple/swift/blob/master/README.md in the Linux section, and maybe https://github.com/apple/swift/blob/master/docs/Ubuntu14.md if it is still necessary). And maybe create a requirements.txt as a reference.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd Awaiting requested review from compnerd

@edymtt edymtt Awaiting requested review from edymtt

@shahmishal shahmishal Awaiting requested review from shahmishal

@gottesmm gottesmm Awaiting requested review from gottesmm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Rostepher @compnerd @shahmishal @drodriguez