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
1 change: 0 additions & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,6 @@ py_proto_library(
protoc = ":protoc",
py_libs = [
":python_srcs",
"@six//:six",
],
srcs_version = "PY2AND3",
visibility = ["//visibility:public"],
Expand Down
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,6 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
examples/pubspec.yaml \
protobuf.bzl \
protobuf_deps.bzl \
third_party/six.BUILD \
third_party/zlib.BUILD \
util/python/BUILD \
internal.bzl
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/aarch64/python_run_tests_with_qemu_aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cd $(dirname $0)/../../..
cd python

PYTHON="/opt/python/cp38-cp38/bin/python"
${PYTHON} -m pip install --user six pytest auditwheel
${PYTHON} -m pip install --user pytest auditwheel

# check that we are really using aarch64 python
(${PYTHON} -c 'import sysconfig; print(sysconfig.get_platform())' | grep -q "linux-aarch64") || (echo "Wrong python platform, needs to be aarch64 python."; exit 1)
Expand Down
1 change: 0 additions & 1 deletion kokoro/release/python/windows/build_artifacts.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ set PACKAGE_NAME=protobuf
set REPO_DIR=protobuf
set BUILD_DLL=OFF
set UNICODE=ON
set PB_TEST_DEP="six==1.9"
set OTHER_TEST_DEP="setuptools==38.5.1"
set OLD_PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%

Expand Down
8 changes: 0 additions & 8 deletions protobuf_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ def protobuf_deps():
urls = ["https://github.com/madler/zlib/archive/v1.2.11.tar.gz"],
)

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

if not native.existing_rule("rules_cc"):
http_archive(
name = "rules_cc",
Expand Down
2 changes: 1 addition & 1 deletion third_party/BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
exports_files(["six.BUILD", "zlib.BUILD"])
exports_files(["zlib.BUILD"])
19 changes: 0 additions & 19 deletions third_party/six.BUILD

This file was deleted.