Skip to content

bpo-44479: Simplified LICENSE.txt regeneration in Windows build#27056

Merged
zooba merged 1 commit into
python:mainfrom
zooba:bpo-44479
Jul 7, 2021
Merged

bpo-44479: Simplified LICENSE.txt regeneration in Windows build#27056
zooba merged 1 commit into
python:mainfrom
zooba:bpo-44479

Conversation

@zooba

@zooba zooba commented Jul 7, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

@zooba zooba added type-bug An unexpected behavior, bug, or error skip news needs backport to 3.10 only security fixes labels Jul 7, 2021
@zooba zooba requested a review from a team as a code owner July 7, 2021 16:45
@Fidget-Spinner

Fidget-Spinner commented Jul 7, 2021

Copy link
Copy Markdown
Member

Unfortunately, that specific failing CI only runs post-commit. Even the test-with-buildbots label doesn't trigger it. So I'm not sure how to test if this works. Especially when I can't reproduce it :(. Sorry.

@zooba

zooba commented Jul 7, 2021

Copy link
Copy Markdown
Member Author

You can manually check whether the generated file (probably PCbuild\amd64\LICENSE.txt, but the path will be in the output now) includes the Tcl/Tk license text. Delete the file and do a regular build should be enough.

Fidget-Spinner
Fidget-Spinner approved these changes Jul 7, 2021
View reviewed changes

@Fidget-Spinner Fidget-Spinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Wow thanks for the advice. On main, when I delete the file and rebuild, the LICENSE.txt file is created but empty. With this PR it's populated :).

@zooba

zooba commented Jul 7, 2021

Copy link
Copy Markdown
Member Author

Thanks for the review :)

@zooba zooba merged commit 3d3027c into python:main Jul 7, 2021
@miss-islington

miss-islington commented Jul 7, 2021

Copy link
Copy Markdown
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@zooba zooba deleted the bpo-44479 branch July 7, 2021 17:21
@miss-islington

miss-islington commented Jul 7, 2021

Copy link
Copy Markdown
Contributor

Sorry @zooba, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 3d3027c5fcc683c14ee55ad231d79971ba12b24d 3.10

@zooba zooba added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jul 7, 2021
@miss-islington

miss-islington commented Jul 7, 2021

Copy link
Copy Markdown
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jul 7, 2021

Copy link
Copy Markdown
Contributor

Sorry, @zooba, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3d3027c5fcc683c14ee55ad231d79971ba12b24d 3.10

zooba added a commit to zooba/cpython that referenced this pull request Jul 7, 2021
@zooba
bpo-44479: Simplified LICENSE.txt regeneration in Windows build (pyth…
45bf759 
…onGH-27056)
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 7, 2021
@bedevere-bot

bedevere-bot commented Jul 7, 2021

Copy link
Copy Markdown

GH-27058 is a backport of this pull request to the 3.10 branch.

zooba added a commit that referenced this pull request Jul 7, 2021
@zooba
bpo-44479: Simplified LICENSE.txt regeneration in Windows build (GH-2…
f2491c6 
…7056)
@pablogsal pablogsal mentioned this pull request Jul 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Fidget-Spinner Fidget-Spinner Fidget-Spinner approved these changes

Assignees

@zooba zooba

Labels

skip news type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@zooba @Fidget-Spinner @miss-islington @bedevere-bot @the-knights-who-say-ni