From 2fbc07b2439c2518a4985972c9e78d07b44603c2 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Thu, 26 Aug 2021 11:29:49 -0700 Subject: [PATCH] Stopping build wheel for python 2.7 --- kokoro/release/python/linux/build_artifacts.sh | 1 - kokoro/release/python/macos/build_artifacts.sh | 1 - python/protobuf_distutils/setup.py | 2 -- python/setup.py | 5 ----- python/tox.ini | 6 +----- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/kokoro/release/python/linux/build_artifacts.sh b/kokoro/release/python/linux/build_artifacts.sh index fc9e740330..79b5620634 100755 --- a/kokoro/release/python/linux/build_artifacts.sh +++ b/kokoro/release/python/linux/build_artifacts.sh @@ -59,7 +59,6 @@ build_crosscompiled_aarch64_artifact_version() { build_artifact_version $@ } -build_artifact_version 2.7 build_artifact_version 3.5 build_artifact_version 3.6 build_artifact_version 3.7 diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh index 7801b0125f..0ffd0f1193 100755 --- a/kokoro/release/python/macos/build_artifacts.sh +++ b/kokoro/release/python/macos/build_artifacts.sh @@ -51,7 +51,6 @@ build_artifact_version() { } export MB_PYTHON_OSX_VER=10.9 -build_artifact_version 2.7 build_artifact_version 3.6 build_artifact_version 3.7 build_artifact_version 3.8 diff --git a/python/protobuf_distutils/setup.py b/python/protobuf_distutils/setup.py index 96259a91e0..1092930fa5 100644 --- a/python/protobuf_distutils/setup.py +++ b/python/protobuf_distutils/setup.py @@ -52,8 +52,6 @@ setup( "Operating System :: OS Independent", # These Python versions should match the protobuf package: "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", diff --git a/python/setup.py b/python/setup.py index aab240a0e5..77a6c4a1bd 100755 --- a/python/setup.py +++ b/python/setup.py @@ -255,9 +255,6 @@ if __name__ == '__main__': # Keep this list of dependencies in sync with tox.ini. install_requires = ['six>=1.9'] - if sys.version_info <= (2,7): - install_requires.append('ordereddict') - install_requires.append('unittest2') setup( name='protobuf', @@ -271,8 +268,6 @@ if __name__ == '__main__': license='3-Clause BSD License', classifiers=[ "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", diff --git a/python/tox.ini b/python/tox.ini index f9eee920fd..eab095c0d0 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,33,34,35,36,37,38,39}-{cpp,python} + py{33,34,35,36,37,38,39}-{cpp,python} [testenv] usedevelop=true @@ -14,8 +14,6 @@ setenv = commands = python setup.py -q build_py python: python setup.py -q build - # --warnings_as_errors disabled for Python 2.7 because _POSIX_C_SOURCE and _XOPEN_SOURCE are redefined - py27-cpp: python setup.py -q build --cpp_implementation --compile_static_extension py{33,34,35,36,37,38,39}-cpp: python setup.py -q build --cpp_implementation --warnings_as_errors --compile_static_extension python: python setup.py -q test -q cpp: python setup.py -q test -q --cpp_implementation @@ -24,5 +22,3 @@ commands = deps = # Keep this list of dependencies in sync with setup.py. six>=1.9 - py26: ordereddict - py26: unittest2