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

Update infrastructure python code to be compatible with python 2 and python 3 #39133

Merged
merged 10 commits into from Jan 26, 2023

Conversation

ricardoamador
Copy link
Contributor

@ricardoamador ricardoamador commented Jan 25, 2023

Python 2 is going to be deprecated so we are making infrastructure code python 2 and python 3 compatible. Changes on the recipes side have already been merged.

List which issues are fixed by this PR. You must list at least one issue.
TODO find/add issue.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@ricardoamador ricardoamador marked this pull request as ready for review January 25, 2023 20:21
@ricardoamador ricardoamador changed the title Updating to py3 Update infrastructure python code to be compatible with python 2 and python 3 Jan 25, 2023
ci/firebase_testlab.py Outdated Show resolved Hide resolved
@@ -0,0 +1,25 @@
#!/usr/bin/env python3
#
# Copyright 2023 The Flutter Authors. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

Fix copyright year.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

2013?

@ricardoamador ricardoamador added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 26, 2023
@auto-submit auto-submit bot merged commit ba188d7 into flutter:main Jan 26, 2023
@ricardoamador ricardoamador deleted the updating_to_py3 branch January 26, 2023 16:16
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 26, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 26, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 26, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 26, 2023
…119279)

* 99270b81c Roll Fuchsia Mac SDK from _H53AyDxR9Pm2TbwN... to KLzrg8eFD9m5J9xa-... (flutter/engine#39155)

* 9c20d2afb Roll Fuchsia Linux SDK from pGX7tanT1okL8XCg-... to ggI4a2jNo5aj6Rp6w... (flutter/engine#39157)

* 664e7d3ae Roll Skia from 3d0e2ad41911 to 0e1cb7bc43dc (1 revision) (flutter/engine#39156)

* ca38bb2e6 Roll Skia from 0e1cb7bc43dc to 5e363a69efbe (3 revisions) (flutter/engine#39158)

* ce3bfa124 Roll Dart SDK from f61211592196 to 160774c04493 (2 revisions) (flutter/engine#39159)

* 36cb5c8ce Roll Dart SDK from 160774c04493 to 5a8b34f040f5 (1 revision) (flutter/engine#39160)

* ba188d7ca Update infrastructure python code to be compatible with python 2 and python 3 (flutter/engine#39133)

* 8baff3e90 Roll Skia from 5e363a69efbe to ad7955820dc6 (2 revisions) (flutter/engine#39161)

* ed9fc3610 Roll Skia from ad7955820dc6 to e9ac244d61b2 (6 revisions) (flutter/engine#39165)

* cb6df8585 Roll Dart SDK from 5a8b34f040f5 to 4a8615b7e3ed (1 revision) (flutter/engine#39167)

* d85ec02b0 [fuchsia] Migrate to new RealmBuilder API (flutter/engine#39163)

* 939012600 [Impeller] partially remove remap sampler support (flutter/engine#39147)
zanderso added a commit that referenced this pull request Jan 31, 2023
zanderso added a commit that referenced this pull request Jan 31, 2023
godofredoc added a commit that referenced this pull request Feb 7, 2023
…and … (#39443)

* Update infrastructure python code to be compatible with python 2 and python 3 (#39133)

* Compatibility with python2 and python3

* Formatting

* Updated to use a function instead of decoding bytes in multiple places.

* Formatting and whitespace cleanup.

* Fix import statement.

* Linter change for docstring.

* Formatting.

* Remove function from run_tests.py since it is a pain to import.

* Add todo message for python 2 deprecation.

* Updated copyright year.

* Migrate engine_v2_builds to python3. (#39404)

* Migrate engine_v2_builds to python3.

Python2 has already been deprecated and the the python binary removed
from path.

* Also use python3 for global generators.

* Update bytes str code (#39275)

* Fix conflicts.

---------

Co-authored-by: Ricardo Amador <32242716+ricardoamador@users.noreply.github.com>
godofredoc added a commit that referenced this pull request Feb 8, 2023
Missed in #39133

Co-authored-by: Zachary Anderson <zanderso@users.noreply.github.com>
godofredoc added a commit that referenced this pull request Apr 11, 2023
CP: 9574129

Missed in #39133

## Pre-launch Checklist

- [X] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [X] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [X] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [X] I listed at least one issue that this PR fixes in the description
above.
- [X] I added new tests to check the change I am making or feature I am
adding, or Hixie said the PR is test-exempt. See [testing the engine]
for instructions on writing and running engine tests.
- [X] I updated/added relevant documentation (doc comments with `///`).
- [X] I signed the [CLA].
- [X] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat

Co-authored-by: Zachary Anderson <zanderso@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
2 participants