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

[BEAM-12399] Move CPython license to own file. #15201

Merged
merged 4 commits into from
Jul 23, 2021

Conversation

lostluck
Copy link
Contributor

@lostluck lostluck commented Jul 21, 2021

In order to resolve BEAM-12399 (Beam Go SDK docs can't be displayed on the standard GoDoc site pkg.go.dev) we need to separate out the CPython license stack from the other licenses which apply more broadly.

  • Moves that license text from LICENSE to LICENSE.python
  • Ensures the LICENSE.python file is also copied to the Python SDK distribution images.

Per golang/go#45095, and #46291 the issue is that the license not particularly compatible, so adding it as a recognized license is apparently not the way forward. However, as the license only needs to be posted with distributions of cpython, it largely only needs to go into the Python SDK container(s).

Since pkg.go.dev must be conservative about what it checks for LICENSE we can't pare down or filter what the site picks up (eg. a LICENSE.golang or a LICENSE in the sdks/go subdirectory file would only be added to whats in the root LICENSE, not supercede it). However, pkg.go.dev doesn't look at other LICENSE files for particular languages, hence the new file.

The way we're referring to the LICENSE.python sidecar file is also acceptable to Apache Legal https://issues.apache.org/jira/browse/LEGAL-582


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

ValidatesRunner compliance status (on master branch)

Lang ULR Dataflow Flink Samza Spark Twister2
Go --- Build Status Build Status Build Status Build Status ---
Java Build Status Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Python --- Build Status
Build Status
Build Status
Build Status
Build Status
Build Status Build Status ---
XLang Build Status Build Status Build Status Build Status Build Status ---

Examples testing status on various runners

Lang ULR Dataflow Flink Samza Spark Twister2
Go --- --- --- --- --- --- ---
Java --- Build Status
Build Status
Build Status
--- --- --- --- ---
Python --- --- --- --- --- --- ---
XLang --- --- --- --- --- --- ---

Post-Commit SDK/Transform Integration Tests Status (on master branch)

Go Java Python
Build Status Build Status Build Status
Build Status
Build Status

Pre-Commit Tests Status (on master branch)

--- Java Python Go Website Whitespace Typescript
Non-portable Build Status
Build Status
Build Status
Build Status
Build Status
Build Status Build Status Build Status Build Status
Portable --- Build Status Build Status --- --- ---

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests

See CI.md for more information about GitHub Actions CI.

LICENSE Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jul 21, 2021

Codecov Report

Merging #15201 (618a2ab) into master (46842eb) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15201      +/-   ##
==========================================
- Coverage   83.82%   83.81%   -0.02%     
==========================================
  Files         441      441              
  Lines       59706    59706              
==========================================
- Hits        50051    50044       -7     
- Misses       9655     9662       +7     
Impacted Files Coverage Δ
.../python/apache_beam/testing/test_stream_service.py 88.37% <0.00%> (-4.66%) ⬇️
sdks/python/apache_beam/utils/interactive_utils.py 87.80% <0.00%> (-2.44%) ⬇️
...hon/apache_beam/runners/direct/test_stream_impl.py 91.79% <0.00%> (-2.24%) ⬇️
...che_beam/runners/interactive/interactive_runner.py 90.65% <0.00%> (-1.87%) ⬇️
.../python/apache_beam/transforms/periodicsequence.py 96.72% <0.00%> (-1.64%) ⬇️
...hon/apache_beam/runners/worker/bundle_processor.py 93.51% <0.00%> (-0.13%) ⬇️
sdks/python/apache_beam/io/source_test_utils.py 89.86% <0.00%> (+1.38%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46842eb...618a2ab. Read the comment docs.

@lostluck
Copy link
Contributor Author

R: @aaltay

@lostluck
Copy link
Contributor Author

Run Java PreCommit

@lostluck
Copy link
Contributor Author

Run Java_Examples_Dataflow PreCommit

@lostluck lostluck merged commit 10e6025 into apache:master Jul 23, 2021
angoenka pushed a commit to angoenka/beam that referenced this pull request Jul 23, 2021
* [BEAM-12399] Move CPython license to own file.
* [BEAM-12399] Add LICENSE.python to python MANIFEST
* [BEAM-12399] Filter LICENSE.python from RAT check.
* [BEAM-12399] Refer to file by proximity rather than URL.
angoenka added a commit that referenced this pull request Jul 28, 2021
* [BEAM-12399] Move CPython license to own file.
* [BEAM-12399] Add LICENSE.python to python MANIFEST
* [BEAM-12399] Filter LICENSE.python from RAT check.
* [BEAM-12399] Refer to file by proximity rather than URL.

Co-authored-by: Robert Burke <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants