diff options
author | Yilei Yang <yileiyang@google.com> | 2022-05-06 16:22:16 -0700 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2022-05-06 16:22:51 -0700 |
commit | 89159550c75bee435683a690a572381937d9a4e5 (patch) | |
tree | 586a5ac4af982c06b6000e2c2a70a89c575cd123 | |
parent | 14886acdf41f63f44c6bd79cf2ce7ad7eaec7d44 (diff) | |
download | absl-py-89159550c75bee435683a690a572381937d9a4e5.tar.gz |
Remove the dependency on six since it's no longer used.
PiperOrigin-RevId: 447093436
Change-Id: I1538d556cc96a4155b2c43ade70f1966b6b5bd28
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | WORKSPACE | 13 | ||||
-rw-r--r-- | setup.py | 5 | ||||
-rwxr-xr-x | smoke_tests/smoke_test.sh | 4 | ||||
-rw-r--r-- | third_party/BUILD | 2 | ||||
-rw-r--r-- | third_party/six.BUILD | 14 |
6 files changed, 2 insertions, 37 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b41a67..4f9c537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com). * `Flag` instances now raise an error if used in a bool context. This prevents the occasional mistake of testing an instance for truthiness rather than testing `flag.value`. +* `absl-py` no longer depends on `six`. ## 1.0.0 (2021-11-09) @@ -12,16 +12,3 @@ # See the License for the specific language governing permissions and # limitations under the License. workspace(name = "io_abseil_py") - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -http_archive( - name = "six_archive", - build_file = "@//third_party:six.BUILD", - sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a", - strip_prefix = "six-1.10.0", - urls = [ - "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz", - "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz", - ], -) @@ -31,10 +31,6 @@ except ImportError: if sys.version_info < (3, 6): raise RuntimeError('Python version 3.6+ is required.') -INSTALL_REQUIRES = [ - 'six', -] - setuptools_version = tuple( int(x) for x in setuptools.__version__.split('.')[:2]) @@ -62,7 +58,6 @@ setuptools.setup( packages=setuptools.find_packages(exclude=[ '*.tests', '*.tests.*', 'tests.*', 'tests', ]), - install_requires=INSTALL_REQUIRES, include_package_data=True, license='Apache 2.0', classifiers=[ diff --git a/smoke_tests/smoke_test.sh b/smoke_tests/smoke_test.sh index cde5185..99307a4 100755 --- a/smoke_tests/smoke_test.sh +++ b/smoke_tests/smoke_test.sh @@ -54,8 +54,7 @@ set -u trap 'deactivate' EXIT # When running macOS <= 10.12, pip 9.0.3 is required to connect to PyPI. -# So we need to manually use the latest pip to install `six`, -# then install absl-py. See: +# So we need to manually use the latest pip to install absl-py. See: # https://mail.python.org/pipermail/distutils-sig/2018-April/032114.html if [[ "$(python -c "import sys; print(sys.version_info.major, sys.version_info.minor)")" == "3 6" ]]; then # Latest get-pip.py no longer supports Python 3.6. @@ -64,7 +63,6 @@ else curl https://bootstrap.pypa.io/get-pip.py | python fi pip --version -pip install six python --version python setup.py install diff --git a/third_party/BUILD b/third_party/BUILD deleted file mode 100644 index 7b80db4..0000000 --- a/third_party/BUILD +++ /dev/null @@ -1,2 +0,0 @@ -# This BUILD file is empty. It is only needed so that this directory is a bazel -# package and its files can be referenced by `http_archive.build_file`. diff --git a/third_party/six.BUILD b/third_party/six.BUILD deleted file mode 100644 index a1b2f7b..0000000 --- a/third_party/six.BUILD +++ /dev/null @@ -1,14 +0,0 @@ -# Description: -# Six provides simple utilities for wrapping over differences between Python 2 -# and Python 3. - -licenses(["notice"]) # MIT - -exports_files(["LICENSE"]) - -py_library( - name = "six", - srcs = ["six.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], -) |