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

[3.12] gh-46968: Fix invalid reference to Sound eXchange (SoX) 12.17.7 license #115094

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

ambv
Copy link
Contributor

@ambv ambv commented Feb 6, 2024

The previously referenced license used wording that was incompatible with the overarching Python license:

"No money shall be charged for its distribution beyond reasonable shipping, handling and duplication costs, nor shall proprietary changes be made to this document so that it cannot be distributed freely."

However, the previously used license text was used in error due to difficulties in finding the referred source files so long after they were incorporated into Python.

This change uses the Sun Microsystems, Inc. license from the version of SoX parts of which are used in Python. This license is fully compatible with the PSF License.


📚 Documentation preview 📚: https://cpython-previews--115094.org.readthedocs.build/

@ambv ambv changed the title [3.12] gh-: Fix invalid reference to Sound eXchange (SoX) 12.17.7 license [3.12] gh-46968: Fix invalid reference to Sound eXchange (SoX) 12.17.7 license Feb 6, 2024
@ambv ambv added skip news needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Feb 6, 2024
@ambv
Copy link
Contributor Author

ambv commented Feb 6, 2024

The generated files failure is a SPDX failure due to #114971. I'll fix this separately.

@ambv ambv merged commit b391199 into python:3.12 Feb 6, 2024
29 of 31 checks passed
@miss-islington-app
Copy link

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

@ambv ambv deleted the sox-license-fix-3.12 branch February 6, 2024 17:59
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 6, 2024
…12.17.7 license (pythonGH-115094)

Fix invalid reference to Sound eXchange (SoX) 12.17.7 license
(cherry picked from commit b391199)

Co-authored-by: Łukasz Langa <[email protected]>
@miss-islington-app
Copy link

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

cherry_picker b39119916c0daaf5e5fdfec63e18ad97f29e2e72 3.10

@bedevere-app
Copy link

bedevere-app bot commented Feb 6, 2024

GH-115095 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Feb 6, 2024
ambv added a commit to ambv/cpython that referenced this pull request Feb 6, 2024
ambv added a commit to ambv/cpython that referenced this pull request Feb 6, 2024
… (SoX) 12.17.7 license (pythonGH-115094)

Fix invalid reference to Sound eXchange (SoX) 12.17.7 license
(cherry picked from commit b391199)

Co-authored-by: Łukasz Langa <[email protected]>
@ambv
Copy link
Contributor Author

ambv commented Feb 6, 2024

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

@bedevere-app
Copy link

bedevere-app bot commented Feb 6, 2024

GH-115095 is a backport of this pull request to the 3.11 branch.

@bedevere-app
Copy link

bedevere-app bot commented Feb 6, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.10 only security fixes label Feb 6, 2024
@ambv
Copy link
Contributor Author

ambv commented Feb 6, 2024

That's what I said!

ambv added a commit that referenced this pull request Feb 6, 2024
…7 license (GH-115094) (GH-115095)

(cherry picked from commit b391199)

Co-authored-by: Łukasz Langa <[email protected]>
ambv added a commit that referenced this pull request Feb 6, 2024
…7 license (GH-115094) (GH-115096)

(cherry picked from commit b391199)

Co-authored-by: Łukasz Langa <[email protected]>
@rffontenelle
Copy link
Contributor

@ambv I'm curious: why not making it a literal text as was done for other legal / license texts in this page?

After merging this contribution, the SOX license text is now basically indented text.

Since it is not literal text, it is extracted for translation. As such, might be translation when IMHO it should not.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants