Merge pull request protocolbuffers#8919 from TeBoring/3.18.x-cherry

Cherry pick changes to fix python release
avm99963 · Aug 27, 2021 · d6b6fdd · d6b6fdd
2 parents 0b0e404 + b0e1f28
commit d6b6fdd
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 39 deletions.
diff --git a/kokoro/release/python/linux/build_artifacts.sh b/kokoro/release/python/linux/build_artifacts.sh
@@ -51,16 +51,14 @@ build_artifact_version() {
 
 build_crosscompiled_aarch64_artifact_version() {
   # crosscompilation is only supported with the dockcross manylinux2014 image
-  DOCKER_IMAGE=dockcross/manylinux2014-aarch64
+  DOCKER_IMAGE=dockcross/manylinux2014-aarch64:20210706-65bf2dd
   PLAT=aarch64
 
   # TODO(jtatermusch): currently when crosscompiling, "auditwheel repair" will be disabled
   # since auditwheel doesn't work for crosscomiled wheels.
   build_artifact_version $@
 }
 
-build_artifact_version 2.7
-build_artifact_version 3.5
 build_artifact_version 3.6
 build_artifact_version 3.7
 build_artifact_version 3.8

diff --git a/kokoro/release/python/linux/config.sh b/kokoro/release/python/linux/config.sh
@@ -9,8 +9,6 @@ function pre_build {
     if [ "$PLAT" == "aarch64" ]
     then
       local configure_host_flag="--host=aarch64"
-    else
-      yum install -y devtoolset-2-libatomic-devel
     fi
 
     # Build protoc and libprotobuf

diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh
@@ -51,13 +51,7 @@ 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
 build_artifact_version 3.9
-
-# python OSX10.9 does not have python 3.5
-export MB_PYTHON_OSX_VER=10.6
-build_artifact_version 3.5
-
diff --git a/kokoro/release/python/windows/build_artifacts.bat b/kokoro/release/python/windows/build_artifacts.bat
@@ -32,16 +32,6 @@ mkdir %ARTIFACT_DIR%
 
 REM Build wheel
 
-SET PYTHON=C:\python35_32bit
-SET PYTHON_VERSION=3.5
-SET PYTHON_ARCH=32
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python35
-SET PYTHON_VERSION=3.5
-SET PYTHON_ARCH=64
-CALL build_single_artifact.bat || goto :error
-
 SET PYTHON=C:\python36_32bit
 SET PYTHON_VERSION=3.6
 SET PYTHON_ARCH=32

diff --git a/kokoro/release/python/windows/build_single_artifact.bat b/kokoro/release/python/windows/build_single_artifact.bat
@@ -1,11 +1,5 @@
 setlocal
 
-if %PYTHON%==C:\python35_32bit set generator=Visual Studio 14
-if %PYTHON%==C:\python35_32bit set vcplatform=Win32
-
-if %PYTHON%==C:\python35 set generator=Visual Studio 14 Win64
-if %PYTHON%==C:\python35 set vcplatform=x64
-
 if %PYTHON%==C:\python36_32bit set generator=Visual Studio 14
 if %PYTHON%==C:\python36_32bit set vcplatform=Win32
 

diff --git a/python/protobuf_distutils/setup.py b/python/protobuf_distutils/setup.py
@@ -52,8 +52,6 @@
         "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
@@ -255,9 +255,6 @@ def get_option_from_sys_argv(option_str):
 
   # 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 @@ def get_option_from_sys_argv(option_str):
       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
@@ -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