Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions LICENCE.cloudpickle
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Copyright (c) 2012-now, CloudPickle developers and contributors.
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure how we've done this in the past, but I think it probably makes sense to colocate the license with the source. That will also ensure it actually gets packed into the Python container.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, I think we need to just add it to https://github.com/apache/beam/blob/master/LICENSE directly

Copy link
Contributor

@tvalentyn tvalentyn Mar 26, 2025

Choose a reason for hiding this comment

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

I checked what is included in containers images by searching find . -name *LICENSE*:

Seeing:

  • ./opt/apache/beam/third_party_licenses/cloudpickle/LICENSE -- this would probably disappear if cloudpickle is not a dependency, unless we modify sdks/python/container/license_scripts/manual_licenses to copy it, which may not be necessary if we add the license in one of the two below places:

  • ./opt/apache/beam/LICENSE

  • ./opt/apache/beam/LICENSE.python -- we could add LICENSE.cloudpickle as proposed in this PR

I don't have preference which file to add it to, we can see what is simpler and easier to import internally.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Licenses are not imported from this repo internally, they are manually created, so from an import point of view I don't think it matters where we put it.

Does LICENSE.cloudpickle work for building containers? Or should I put it in LICENSE.python instead?

Copy link
Contributor

@tvalentyn tvalentyn Mar 27, 2025

Choose a reason for hiding this comment

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

Does LICENSE.cloudpickle work for building containers?

yes, it works, we can check that it is included in the container build. for example, by running smth like

gradlew :sdks:python:container:py310:docker
docker run --rm -it --entrypoint=/bin/bash apache/beam_python3.10_sdk:2.65.0.dev

and inspecting the image content.

Copy link
Contributor

Choose a reason for hiding this comment

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

feel free to follow up in another PR if this needs another change.

Copyright (c) 2012, Regents of the University of California.
Copyright (c) 2009 `PiCloud, Inc. <https://web.archive.org/web/20140626004012/http://www.picloud.com/>`_.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the University of California, Berkeley nor the
names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4 changes: 4 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ tasks.rat {
// Ignore CPython LICENSE file
"LICENSE.python",

// Ignore vendored cloudpickle files
"sdks/python/apache_beam/internal/cloudpickle/**",
"LICENCE.cloudpickle",

// Json doesn't support comments.
"**/*.json",

Expand Down
18 changes: 18 additions & 0 deletions sdks/python/apache_beam/internal/cloudpickle/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from . import cloudpickle
from .cloudpickle import * # noqa

__doc__ = cloudpickle.__doc__

__version__ = "3.1.1"

__all__ = [ # noqa
"__version__",
"Pickler",
"CloudPickler",
"dumps",
"loads",
"dump",
"load",
"register_pickle_by_value",
"unregister_pickle_by_value",
]
Loading
Loading