This is an automated email from the ASF dual-hosted git repository. Yicong-Huang pushed a commit to branch backport/9000-take-the-iris-example-dataset-from-sciki-v1.3 in repository https://gitbox.apache.org/repos/asf/texera.git
commit 3d9b56e9d4756186b27cbcc867ff63c6d73eb6f6 Author: Meng Wang <[email protected]> AuthorDate: Thu Oct 15 23:16:17 2026 +0000 fix(licensing): take the Iris example dataset from scikit-learn instead of UCI (#9000) ### What changes were proposed in this PR? The single-node examples ship `Iris.csv` in both the source release and the docker-compose bundle, and `LICENSE` records it as CC BY 4.0 from the UCI repository (#8803). ASF policy allows CC BY works only in binary form ("only include them in binary form", https://www.apache.org/legal/resolved.html), so the file can't be in a source release under that licence. This takes the dataset from the copy scikit-learn distributes under the BSD 3-Clause License instead. The CSV keeps its columns, row order and species names, so the example workflow is unaffected. Only rows 35 and 38 change: they are the two known transcription errors in the UCI copy, which scikit-learn's copy corrects to Fisher's published values. The `LICENSE` entries (root and `bin/single-node/`) move to BSD 3-Clause, the compose bundle ships the BSD 3-Clause text instead of CC BY 4.0, the now-unused `licenses/LICENSE-CC-BY-4.0.txt` is removed, and the dataset description names the new source. This conflicts with #8997 in `LICENSE`, since both add the BSD 3-Clause section; whichever lands second merges the two entries. ### Any related issues, documentation, discussions? Follows up #8803. ### How was this PR tested? Checked that every row of the new `Iris.csv` matches scikit-learn 1.7.2's `iris.csv`. Ran the bundle's `git archive` export step against this commit to confirm it picks up the BSD 3-Clause text, and checked that the new description still makes valid JSON in `load-examples.sh`, which inserts it unescaped. ### Was this PR authored or co-authored using generative AI tooling? (backported from commit 707849a00fe581c02f3cc8c2c038e8f4e773403b) Generated-by: Claude Code (claude-opus-5-5) --- .github/workflows/create-release-candidate.yml | 4 +- LICENSE | 23 +- bin/single-node/LICENSE | 8 +- .../examples/datasets/iris-species/Iris.csv | 4 +- .../examples/datasets/iris-species/description.txt | 2 +- licenses/LICENSE-CC-BY-4.0.txt | 396 --------------------- 6 files changed, 30 insertions(+), 407 deletions(-) diff --git a/.github/workflows/create-release-candidate.yml b/.github/workflows/create-release-candidate.yml index 2087bd718b..1e12d22808 100644 --- a/.github/workflows/create-release-candidate.yml +++ b/.github/workflows/create-release-candidate.yml @@ -174,7 +174,7 @@ jobs: # Export the single-node directory from the tagged source mkdir -p "$TEMP_DIR/_raw" - git archive --format=tar "$TAG_NAME" -- bin/single-node/ sql/ NOTICE licenses/LICENSE-CC-BY-4.0.txt | tar -x -C "$TEMP_DIR/_raw" + git archive --format=tar "$TAG_NAME" -- bin/single-node/ sql/ NOTICE licenses/LICENSE-BSD-3-Clause.txt | tar -x -C "$TEMP_DIR/_raw" # Copy deployment files cp "$TEMP_DIR/_raw/bin/single-node/docker-compose.yml" "$BUNDLE_DIR/" @@ -184,7 +184,7 @@ jobs: cp "$TEMP_DIR/_raw/NOTICE" "$BUNDLE_DIR/" cp "$TEMP_DIR/_raw/bin/single-node/DISCLAIMER" "$BUNDLE_DIR/" mkdir -p "$BUNDLE_DIR/licenses" - cp "$TEMP_DIR/_raw/licenses/LICENSE-CC-BY-4.0.txt" "$BUNDLE_DIR/licenses/" + cp "$TEMP_DIR/_raw/licenses/LICENSE-BSD-3-Clause.txt" "$BUNDLE_DIR/licenses/" cp -r "$TEMP_DIR/_raw/sql" "$BUNDLE_DIR/" # Patch the SQL mount path for the self-contained bundle layout diff --git a/LICENSE b/LICENSE index 2e370d909d..d87df65cb2 100644 --- a/LICENSE +++ b/LICENSE @@ -266,12 +266,31 @@ build: Source: https://github.com/yarnpkg/berry License: BSD 2-Clause License (licenses-3rd-party-code/yarn.txt) -Creative Commons Attribution 4.0 International (CC BY 4.0) +BSD 3-Clause License -------------------------------------- -This product bundles the Iris example dataset: +This product bundles the Iris example dataset, as distributed with scikit-learn: - bin/single-node/examples/datasets/iris-species/Iris.csv Creator: R. A. Fisher (1936) +<<<<<<< HEAD Source: UCI Machine Learning Repository, https://archive.ics.uci.edu/dataset/53/iris DOI: 10.24432/C56C76 License: CC BY 4.0 (licenses/LICENSE-CC-BY-4.0.txt) +======= + Copyright (c) 2007-2024 The scikit-learn developers + Source: https://github.com/scikit-learn/scikit-learn/blob/1.7.2/sklearn/datasets/data/iris.csv + License: BSD 3-Clause License (licenses/LICENSE-BSD-3-Clause.txt) + +Trademarks +-------------------------------------- + +This product includes the Apple logo, a trademark of Apple Inc.: + - frontend/src/assets/logos/apple-logo-white.svg + Apple and the Apple logo are trademarks of Apple Inc., registered in the U.S. + and other countries. The mark is included solely to render the "Continue with + Apple" button, which Apple's guidelines require to carry their own artwork. + Source: https://developer.apple.com/design/human-interface-guidelines/sign-in-with-apple + Use governed by Apple's Sign in with Apple usage guidelines, not by an + open-source license: + https://developer.apple.com/sign-in-with-apple/usage-guidelines-for-websites-and-other-platforms/ +>>>>>>> 707849a00 (fix(licensing): take the Iris example dataset from scikit-learn instead of UCI (#9000)) diff --git a/bin/single-node/LICENSE b/bin/single-node/LICENSE index dd4d781ed2..97526077cd 100644 --- a/bin/single-node/LICENSE +++ b/bin/single-node/LICENSE @@ -204,9 +204,9 @@ THIRD-PARTY DEPENDENCIES -------------------------------------------------------------------------------- -This bundle includes the Iris example dataset: +This bundle includes the Iris example dataset, as distributed with scikit-learn: - examples/datasets/iris-species/Iris.csv Creator: R. A. Fisher (1936) - Source: UCI Machine Learning Repository, https://archive.ics.uci.edu/dataset/53/iris - DOI: 10.24432/C56C76 - License: CC BY 4.0 (licenses/LICENSE-CC-BY-4.0.txt) + Copyright (c) 2007-2024 The scikit-learn developers + Source: https://github.com/scikit-learn/scikit-learn/blob/1.7.2/sklearn/datasets/data/iris.csv + License: BSD 3-Clause License (licenses/LICENSE-BSD-3-Clause.txt) diff --git a/bin/single-node/examples/datasets/iris-species/Iris.csv b/bin/single-node/examples/datasets/iris-species/Iris.csv index 1bf42f2549..9dcf4a0ec2 100644 --- a/bin/single-node/examples/datasets/iris-species/Iris.csv +++ b/bin/single-node/examples/datasets/iris-species/Iris.csv @@ -33,10 +33,10 @@ Id,SepalLengthCm,SepalWidthCm,PetalLengthCm,PetalWidthCm,Species 32,5.4,3.4,1.5,0.4,Iris-setosa 33,5.2,4.1,1.5,0.1,Iris-setosa 34,5.5,4.2,1.4,0.2,Iris-setosa -35,4.9,3.1,1.5,0.1,Iris-setosa +35,4.9,3.1,1.5,0.2,Iris-setosa 36,5.0,3.2,1.2,0.2,Iris-setosa 37,5.5,3.5,1.3,0.2,Iris-setosa -38,4.9,3.1,1.5,0.1,Iris-setosa +38,4.9,3.6,1.4,0.1,Iris-setosa 39,4.4,3.0,1.3,0.2,Iris-setosa 40,5.1,3.4,1.5,0.2,Iris-setosa 41,5.0,3.5,1.3,0.3,Iris-setosa diff --git a/bin/single-node/examples/datasets/iris-species/description.txt b/bin/single-node/examples/datasets/iris-species/description.txt index bc4272475d..e35c9d7ccc 100644 --- a/bin/single-node/examples/datasets/iris-species/description.txt +++ b/bin/single-node/examples/datasets/iris-species/description.txt @@ -1 +1 @@ -This dataset is from Kaggle at https://www.kaggle.com/datasets/uciml/iris \ No newline at end of file +Iris flower measurements from R. A. Fisher (1936), as distributed with scikit-learn 1.7.2 under the BSD 3-Clause License: https://github.com/scikit-learn/scikit-learn/blob/1.7.2/sklearn/datasets/data/iris.csv \ No newline at end of file diff --git a/licenses/LICENSE-CC-BY-4.0.txt b/licenses/LICENSE-CC-BY-4.0.txt deleted file mode 100644 index da6ab6cc8f..0000000000 --- a/licenses/LICENSE-CC-BY-4.0.txt +++ /dev/null @@ -1,396 +0,0 @@ -Attribution 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution 4.0 International Public License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution 4.0 International Public License ("Public License"). To the -extent this Public License may be interpreted as a contract, You are -granted the Licensed Rights in consideration of Your acceptance of -these terms and conditions, and the Licensor grants You such rights in -consideration of benefits the Licensor receives from making the -Licensed Material available under these terms and conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - d. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - e. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - f. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - g. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - h. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - i. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - j. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - k. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - 4. If You Share Adapted Material You produce, the Adapter's - License You apply must not prevent recipients of the Adapted - Material from complying with this Public License. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material; and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. -
