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.

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

Update Widevine signature_generator to Python 3 #18636

Merged
merged 23 commits into from
Jul 25, 2023
Merged

Update Widevine signature_generator to Python 3 #18636

merged 23 commits into from
Jul 25, 2023

Conversation

mherrmann
Copy link
Collaborator

@mherrmann mherrmann commented May 26, 2023 •
edited
Loading

Resolves brave/brave-browser#30615. Also resolves https://github.com/brave/devops/issues/9615.

Depends on https://github.com/brave/devops/pull/9767 and https://github.com/brave/devops/pull/10145.

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Please test that DRM-protected content can still be streamed at the highest quality on Windows and macOS. See for example brave/brave-browser#29469 (comment) for some good tests.

@github-actions github-actions bot added the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label May 26, 2023
github-actions[bot]
github-actions bot reviewed May 26, 2023
View reviewed changes
script/run.py Outdated Show resolved Hide resolved
@mherrmann mherrmann requested a review from a team as a code owner May 29, 2023 17:54
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from 5cfeaeb to c90ce26 Compare May 30, 2023 05:22
simonhong
simonhong approved these changes May 31, 2023
View reviewed changes
Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

browser/widevine ++

browser/widevine/BUILD.gn Outdated Show resolved Hide resolved
bridiver
bridiver reviewed Jun 5, 2023
View reviewed changes
DEPS Outdated Show resolved Hide resolved
bridiver
bridiver reviewed Jun 13, 2023
View reviewed changes
script/run.py Outdated Show resolved Hide resolved
bridiver
bridiver reviewed Jun 13, 2023
View reviewed changes
browser/widevine/BUILD.gn Outdated Show resolved Hide resolved
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from cc6deb5 to 424a33d Compare July 7, 2023 06:16
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from 90a8ad4 to 2190ce3 Compare July 7, 2023 12:58
bridiver
bridiver approved these changes Jul 11, 2023
View reviewed changes
Copy link
Collaborator

@bridiver bridiver left a comment

Choose a reason for hiding this comment

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

approved after condition is added for macholib dependency

@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from 2190ce3 to 75fcacc Compare July 19, 2023 13:40
@mherrmann
Copy link
Collaborator Author

@fmarier would you please add your review?

fmarier
fmarier requested changes Jul 20, 2023
View reviewed changes
script/brave_license_helper.py Outdated Show resolved Hide resolved
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from 31dd57d to 06ce51a Compare July 21, 2023 13:36
fmarier
fmarier approved these changes Jul 21, 2023
View reviewed changes
Copy link
Member

@fmarier fmarier left a comment

Choose a reason for hiding this comment

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

script/brave_license_helper.py changes look good.

script/brave_license_helper.py Outdated Show resolved Hide resolved
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch 3 times, most recently from b929792 to dc61dfb Compare July 24, 2023 13:59
@mherrmann mherrmann force-pushed the update-signature_generator-to-python-3 branch from f59b7d5 to ecac8d3 Compare July 25, 2023 12:50
@mherrmann mherrmann removed CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Jul 25, 2023
@mherrmann
Copy link
Collaborator Author

mherrmann commented Jul 25, 2023 •
edited
Loading

@mihaiplesa the test failures here are not unique to this PR. (Windows example, Mac example).

Can you please force-merge? As the squashed commit message, I would just use Update Widevine signature_generator to Python 3.

@mihaiplesa mihaiplesa merged commit 2e124e8 into master Jul 25, 2023
@mihaiplesa mihaiplesa deleted the update-signature_generator-to-python-3 branch July 25, 2023 15:56
@github-actions github-actions bot added the CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) label Jul 25, 2023
@github-actions github-actions bot added this to the 1.58.x - Nightly milestone Jul 25, 2023
mihaiplesa added a commit that referenced this pull request Jul 25, 2023
@mihaiplesa
Revert "Update Widevine signature_generator to Python 3 (#18636)"
5b1b8dd 
This reverts commit 2e124e8.
@mihaiplesa mihaiplesa mentioned this pull request Jul 25, 2023
Merged
mihaiplesa added a commit that referenced this pull request Jul 25, 2023
@mihaiplesa
Revert "Update Widevine signature_generator to Python 3" (#19419)
66c4fac 
Revert "Update Widevine signature_generator to Python 3 (#18636)"

This reverts commit 2e124e8.
@mherrmann mherrmann mentioned this pull request Jul 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@simonhong simonhong simonhong approved these changes

@fmarier fmarier fmarier approved these changes

@bridiver bridiver bridiver approved these changes

Assignees

@mherrmann mherrmann

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.58.x - Release
Development

Successfully merging this pull request may close these issues.

Update Widevine signature generation script to Python 3
6 participants
@mherrmann @bridiver @fmarier @simonhong @thypon @mihaiplesa