Move six.BUILD to third_party and update paths

pull/6530/head
Adam Liddell 5 years ago committed by Adam Cozzette
parent 23e520e7fc
commit 8199a01ff4
  1. 2
      Makefile.am
  2. 2
      WORKSPACE
  3. 2
      protobuf_deps.bzl
  4. 0
      third_party/six.BUILD

@ -1236,7 +1236,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
python/release/wheel/Dockerfile \ python/release/wheel/Dockerfile \
python/release/wheel/protobuf_optimized_pip.sh \ python/release/wheel/protobuf_optimized_pip.sh \
python/release/wheel/README.md \ python/release/wheel/README.md \
six.BUILD \ third_party/six.BUILD \
third_party/zlib.BUILD \ third_party/zlib.BUILD \
util/python/BUILD util/python/BUILD

@ -18,7 +18,7 @@ protobuf_deps()
http_archive( http_archive(
name = "six", name = "six",
build_file = "@//:six.BUILD", build_file = "@//:third_party/six.BUILD",
sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
urls = ["https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz"], urls = ["https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz"],
) )

@ -25,7 +25,7 @@ def protobuf_deps():
if not native.existing_rule("six"): if not native.existing_rule("six"):
http_archive( http_archive(
name = "six", name = "six",
build_file = "@//:six.BUILD", build_file = "@com_google_protobuf//:third_party/six.BUILD",
sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
urls = ["https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz"], urls = ["https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz"],
) )

Loading…
Cancel
Save