bazel-contrib · pstradomski · Sep 19, 2017 · Sep 21, 2017 · Sep 20, 2017 · Oct 4, 2017
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -0,0 +1,17 @@
+---
+platforms:
+  ubuntu1404:
+    build_targets:
+    - "..."
+    test_targets:
+    - "..."
+  ubuntu1604:
+    build_targets:
+    - "..."
+    test_targets:
+    - "..."
+  macos:
+    build_targets:
+    - "..."
+    test_targets:
+    - "..."
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
-# Bazel Python Rules
+# Experimental Bazel Python Rules
 
-[![Build Status](http://ci.bazel.io/buildStatus/icon?job=rules_python)](http://ci.bazel.io/job/rules_python)
+Status: This is **ALPHA** software.
+
+[![Build status](https://badge.buildkite.com/0bcfe58b6f5741aacb09b12485969ba7a1205955a45b53e854.svg)](https://buildkite.com/bazel/python-rules-python-postsubmit)
 
 ## Rules
 
@@ -21,14 +23,17 @@ dependencies typically managed via `pip`.
 Add the following to your `WORKSPACE` file to add the external repositories:
 
 ```python
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
 git_repository(
     name = "io_bazel_rules_python",
     remote = "https://github.com/bazelbuild/rules_python.git",
+    # NOT VALID!  Replace this with a Git commit SHA.
     commit = "{HEAD}",
 )
 
 # Only needed for PIP support:
-load("//python:pip.bzl", "pip_repositories")
+load("@io_bazel_rules_python//python:pip.bzl", "pip_repositories")
 
 pip_repositories()
 ```
@@ -105,6 +110,10 @@ for dependencies, however, it is recommended that folks stick with the
 `requirement` pattern in case the need arises for us to make changes to this
 format in the future.
 
+["Extras"](
+https://packaging.python.org/tutorials/installing-packages/#installing-setuptools-extras)
+will have a target of the extra name (in place of `pkg` above).
+
 ## Updating `docs/`
 
 All of the content (except `BUILD`) under `docs/` is generated.  To update the

diff --git a/WORKSPACE b/WORKSPACE
@@ -11,30 +11,59 @@
 # 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.
+
 workspace(name = "io_bazel_rules_python")
 
-# Skydoc stuff
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+
+################################
+# Skydoc and its dependencies. #
+################################
+
+# Skydoc's sass dependency is not covered by skydoc_repositories(), so we have
+# to redeclare it here. Watch that the version matches when updating Skydoc's
+# version.
+
 git_repository(
     name = "io_bazel_rules_sass",
+    # Same commit as Skydoc uses in its own WORKSPACE.
+    commit = "8ccf4f1c351928b55d5dddf3672e3667f6978d60",  # 2018-11-23
     remote = "https://github.com/bazelbuild/rules_sass.git",
-    tag = "0.0.2",
 )
 
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+load("@io_bazel_rules_sass//:package.bzl", "rules_sass_dependencies")
+
+rules_sass_dependencies()
+
+# Node is used by sass. This weird (anti-?)pattern of initializing a repo we
+# didn't directly import is taken from Skydoc's WORKSPACE.
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+
+node_repositories()
+
+load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
 
 sass_repositories()
 
+# We implicitly depend on Skydoc importing Skylib under `@bazel_skylib`.
+# We don't redeclare it here in order to avoid repeating a definition that
+# could get out of sync with Skydoc.
+
 git_repository(
     name = "io_bazel_skydoc",
+    commit = "1cdb612e31448c2f6eb25b8aa67d406152275482",  # 2018-11-27
     remote = "https://github.com/bazelbuild/skydoc.git",
-    tag = "0.1.3",
 )
 
 load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
 
 skydoc_repositories()
 
-# Requirements for building our piptool.
+##########################################
+# Requirements for building our piptool. #
+##########################################
+
 load("//python:pip.bzl", "pip_import")
 
 pip_import(
@@ -51,39 +80,69 @@ _piptool_install()
 
 git_repository(
     name = "subpar",
+    # HEAD as of 2018-12-18
+    commit = "81d33bafbad4edcb2c9e98548888fc9815c004c4",
     remote = "https://github.com/google/subpar",
-    tag = "1.0.0",
 )
 
-# Test data for WHL tool testing.
+###################################
+# Test data for WHL tool testing. #
+###################################
+
 http_file(
     name = "grpc_whl",
+    downloaded_file_path = "grpcio-1.6.0-cp27-cp27m-manylinux1_i686.whl",
     sha256 = "c232d6d168cb582e5eba8e1c0da8d64b54b041dd5ea194895a2fe76050916561",
     # From https://pypi.python.org/pypi/grpcio/1.6.0
-    url = ("https://pypi.python.org/packages/c6/28/" +
-           "67651b4eabe616b27472c5518f9b2aa3f63beab8f62100b26f05ac428639/" +
-           "grpcio-1.6.0-cp27-cp27m-manylinux1_i686.whl"),
+    urls = [("https://pypi.python.org/packages/c6/28/" +
+             "67651b4eabe616b27472c5518f9b2aa3f63beab8f62100b26f05ac428639/" +
+             "grpcio-1.6.0-cp27-cp27m-manylinux1_i686.whl")],
 )
 
 http_file(
-    name = "futures_whl",
+    name = "futures_3_1_1_whl",
+    downloaded_file_path = "futures-3.1.1-py2-none-any.whl",
     sha256 = "c4884a65654a7c45435063e14ae85280eb1f111d94e542396717ba9828c4337f",
     # From https://pypi.python.org/pypi/futures
-    url = ("https://pypi.python.org/packages/a6/1c/" +
-           "72a18c8c7502ee1b38a604a5c5243aa8c2a64f4bba4e6631b1b8972235dd/" +
-           "futures-3.1.1-py2-none-any.whl"),
+    urls = [("https://pypi.python.org/packages/a6/1c/" +
+             "72a18c8c7502ee1b38a604a5c5243aa8c2a64f4bba4e6631b1b8972235dd/" +
+             "futures-3.1.1-py2-none-any.whl")],
+)
+
+http_file(
+    name = "futures_2_2_0_whl",
+    downloaded_file_path = "futures-2.2.0-py2.py3-none-any.whl",
+    sha256 = "9fd22b354a4c4755ad8c7d161d93f5026aca4cfe999bd2e53168f14765c02cd6",
+    # From https://pypi.python.org/pypi/futures/2.2.0
+    urls = [("https://pypi.python.org/packages/d7/1d/" +
+             "68874943aa37cf1c483fc61def813188473596043158faa6511c04a038b4/" +
+             "futures-2.2.0-py2.py3-none-any.whl")],
 )
 
 http_file(
     name = "mock_whl",
+    downloaded_file_path = "mock-2.0.0-py2.py3-none-any.whl",
     sha256 = "5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1",
     # From https://pypi.python.org/pypi/mock
-    url = ("https://pypi.python.org/packages/e6/35/" +
-           "f187bdf23be87092bd0f1200d43d23076cee4d0dec109f195173fd3ebc79/" +
-           "mock-2.0.0-py2.py3-none-any.whl"),
+    urls = [("https://pypi.python.org/packages/e6/35/" +
+             "f187bdf23be87092bd0f1200d43d23076cee4d0dec109f195173fd3ebc79/" +
+             "mock-2.0.0-py2.py3-none-any.whl")],
+)
+
+http_file(
+    name = "google_cloud_language_whl",
+    downloaded_file_path = "google_cloud_language-0.29.0-py2.py3-none-any.whl",
+    sha256 = "a2dd34f0a0ebf5705dcbe34bd41199b1d0a55c4597d38ed045bd183361a561e9",
+    # From https://pypi.python.org/pypi/google-cloud-language
+    urls = [("https://pypi.python.org/packages/6e/86/" +
+             "cae57e4802e72d9e626ee5828ed5a646cf4016b473a4a022f1038dba3460/" +
+             "google_cloud_language-0.29.0-py2.py3-none-any.whl")],
 )
 
-# Imports for examples
+#########################
+# Imports for examples. #
+#########################
+
 pip_import(
     name = "examples_helloworld",
     requirements = "//examples/helloworld:requirements.txt",
@@ -107,3 +166,27 @@ load(
 )
 
 _version_install()
+
+pip_import(
+    name = "examples_boto",
+    requirements = "//examples/boto:requirements.txt",
+)
+
+load(
+    "@examples_boto//:requirements.bzl",
+    _boto_install = "pip_install",
+)
+
+_boto_install()
+
+pip_import(
+    name = "examples_extras",
+    requirements = "//examples/extras:requirements.txt",
+)
+
+load(
+    "@examples_extras//:requirements.bzl",
+    _extras_install = "pip_install",
+)
+
+_extras_install()
diff --git a/docs/BUILD b/docs/BUILD
@@ -18,7 +18,8 @@ licenses(["notice"])  # Apache 2.0
 # To regenerate html docs, run:
 #   ./update_docs.sh
 
-load("@io_bazel_skydoc//skylark:skylark.bzl", "skylark_doc", "skylark_library")
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+load("@io_bazel_skydoc//skylark:skylark.bzl", "skylark_doc")
 
 skylark_library(
     name = "whl",

diff --git a/docs/python/python.md b/docs/python/python.md
@@ -13,6 +13,7 @@ Documentation generated by Skydoc
     <li><a href="#py_test">py_test</a></li>
   </ul>
 </nav>
+
 <a name="py_library"></a>
 ## py_library
 

diff --git a/examples/boto/BUILD b/examples/boto/BUILD
@@ -0,0 +1,30 @@
+# Copyright 2017 The Bazel 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.
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+load("@examples_boto//:requirements.bzl", "requirement")
+load("//python:python.bzl", "py_test")
+
+py_test(
+    name = "boto_test",
+    srcs = ["boto_test.py"],
+    deps = [
+        requirement("boto3"),
+        # six is a transitive dependency via python-dateutil. Explicitly depend
+        # on it to work around issue #70; see issue #98.
+        requirement("six"),
+    ],
+)
diff --git a/examples/boto/boto_test.py b/examples/boto/boto_test.py
@@ -0,0 +1,26 @@
+# Copyright 2017 The Bazel 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.
+
+import boto3
+import unittest
+
+
+class BotoTest(unittest.TestCase):
+
+  def test_version(self):
+    self.assertEqual(boto3.__version__, '1.4.7')
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/examples/boto/requirements.txt b/examples/boto/requirements.txt
@@ -0,0 +1 @@
+boto3==1.4.7
diff --git a/examples/extras/BUILD b/examples/extras/BUILD
@@ -0,0 +1,29 @@
+# Copyright 2017 The Bazel 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.
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+load("@examples_extras//:requirements.bzl", "requirement")
+load("//python:python.bzl", "py_test")
+
+py_test(
+    name = "extras_test",
+    srcs = ["extras_test.py"],
+    deps = [
+        requirement("google-cloud-language"),
+        # Make sure that we can resolve the "extra" dependency
+        requirement("googleapis-common-protos[grpc]"),
+    ],
+)
diff --git a/examples/extras/extras_test.py b/examples/extras/extras_test.py
@@ -0,0 +1,25 @@
+# Copyright 2017 The Bazel 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.
+
+import unittest
+
+
+# The test is the build itself, which should not work if extras are missing.
+class ExtrasTest(unittest.TestCase):
+  def test_nothing(self):
+    pass
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/examples/extras/requirements.txt b/examples/extras/requirements.txt
@@ -0,0 +1 @@
+google-cloud-language==0.27.0
diff --git a/examples/extras/version_test.py b/examples/extras/version_test.py
@@ -0,0 +1,26 @@
+# Copyright 2017 The Bazel 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.
+
+import pip
+import unittest
+
+
+class VersionTest(unittest.TestCase):
+
+  def test_version(self):
+    self.assertEqual(pip.__version__, '9.0.3')
+
+
+if __name__ == '__main__':
+  unittest.main()
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ Documentation generated by Skydoc @@
         <li><a href="#py_test">py_test</a></li>
       </ul>
     </nav>
     <a name="py_library"></a>
     ## py_library
@@ Expand Down @@