Skip to content

Vendor bleach and html5lib in pip package #1142

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 26, 2018
Merged

Vendor bleach and html5lib in pip package #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tensorboard/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ py_library(
],
)

py_binary(
py_library(
name = "version",
srcs = ["version.py"],
srcs_version = "PY2AND3",
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/d3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
d3
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/dagre.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
Dagre
Expand Down
27 changes: 17 additions & 10 deletions tensorboard/components/tf_imports/graphlib.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.
Graphlib
Copyright (c) 2012-2014 Chris Pettitt

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

http://www.apache.org/licenses/LICENSE-2.0
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->

<link rel="import" href="lodash.html">
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/lodash.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<script jscomp-minify src="../lodash/lodash.js"></script>
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/numericjs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
Numeric Javascript
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/plottable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
Plottable.js
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/threejs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
three.js
Expand Down
17 changes: 0 additions & 17 deletions tensorboard/components/tf_imports/weblas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
@license
Copyright 2016 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<!--
@license
weblas
Expand Down
53 changes: 53 additions & 0 deletions tensorboard/pip_package/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ package(default_visibility = ["//visibility:private"])

licenses(["notice"]) # Apache 2.0

# rm -rf /tmp/tensorboard
# bazel run //tensorboard/pip_package:build_pip_package
# pip install -U /tmp/tensorboard/*py2*.pip
sh_binary(
name = "build_pip_package",
srcs = ["build_pip_package.sh"],
Expand All @@ -20,4 +23,54 @@ sh_binary(
"//tensorboard/plugins/beholder", # User-facing beholder API
"//tensorboard/plugins/projector", # User-facing projector API
],
tags = [
"local",
"manual",
],
)

genrule(
name = "license",
Copy link
Contributor

Choose a reason for hiding this comment

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

Would there be a way to keep the license list closer to the actual repo definitions? I'm concerned that we won't always remember to update this list given that it's kept in a different part of the codebase and nothing would break if we added a new dependency and didn't update this license list.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please get my approval when adding new dependencies. That way I can make sure we do things like this. There's also other burdens, such as ensuring /** @license ... */ comments appear in HTTP responses for works with notice licenses, which is oftentimes difficult since tooling might remove those comments, or the copyright holders might not have included them in the sources. It's a tough problem.

srcs = [
"LICENSE.tensorflow",
"@org_polymer//:LICENSE.txt",
"@com_palantir_plottable//:package/LICENSE",
"@org_d3js//:LICENSE",
"@org_chromium_catapult_vulcanized_trace_viewer//:LICENSE",
"@io_github_cpettitt_dagre//:LICENSE",
"@io_github_cpettitt_graphlib//:LICENSE",
"@io_github_waylonflinn_weblas//:LICENSE",
"@com_numericjs//:license.txt",
"@org_threejs//:LICENSE",
"@com_lodash//:LICENSE",
"@com_google_fonts_roboto//:LICENSE",
"@org_mozilla_bleach//:LICENSE",
"@org_html5lib//:LICENSE",
],
outs = ["LICENSE"],
cmd = "\n".join([
"(",
" echo '#' TensorBoard License",
" echo",
" echo TensorBoard is licensed Apache 2.0 and distributed with",
" echo vendored content licensed Apache 2.0, MIT, and BSD-3.",
" echo",
" echo '##' Table of Contents",
" echo",
" for src in $(SRCS); do",
" echo '-' $$src",
" done",
" echo",
" echo '##' Licenses",
" for src in $(SRCS); do",
" echo",
" echo",
" echo",
" echo '###' $$src",
" echo",
" cat $$src",
" done",
"",
") >$@",
]),
)
0 tensorboard/pip_package/LICENSE → tensorboard/pip_package/LICENSE.tensorflow
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion tensorboard/pip_package/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
recursive-include tensorboard *
include LICENSE
include README.rst
graft tensorboard
Loading