Переглянути джерело

Drop python2.6

Jenkins complains for python 2.6
DEPRECATION: Python 2.6 is no longer supported by the Python core team
ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py'
https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
Jie Luo 8 роки тому
батько
коміт
610e433888
2 змінених файлів з 4 додано та 5 видалено
  1. 1 1
      python/tox.ini
  2. 3 4
      tests.sh

+ 1 - 1
python/tox.ini

@@ -1,6 +1,6 @@
 [tox]
 [tox]
 envlist =
 envlist =
-    py{26,27,33,34,35,36}-{cpp,python}
+    py{27,33,34,35,36}-{cpp,python}
 
 
 [testenv]
 [testenv]
 usedevelop=true
 usedevelop=true

+ 3 - 4
tests.sh

@@ -234,7 +234,6 @@ internal_install_python_deps() {
     sudo apt-get install -y python-software-properties # for apt-add-repository
     sudo apt-get install -y python-software-properties # for apt-add-repository
     sudo apt-add-repository -y ppa:fkrull/deadsnakes
     sudo apt-add-repository -y ppa:fkrull/deadsnakes
     sudo apt-get update -qq
     sudo apt-get update -qq
-    sudo apt-get install -y python2.6 python2.6-dev
     sudo apt-get install -y python3.3 python3.3-dev
     sudo apt-get install -y python3.3 python3.3-dev
     sudo apt-get install -y python3.4 python3.4-dev
     sudo apt-get install -y python3.4 python3.4-dev
     sudo apt-get install -y python3.5 python3.5-dev
     sudo apt-get install -y python3.5 python3.5-dev
@@ -280,7 +279,7 @@ build_python() {
   cd python
   cd python
   # Only test Python 2.6/3.x on Linux
   # Only test Python 2.6/3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
   if [ $(uname -s) == "Linux" ]; then
-    envlist=py\{26,27,33,34,35,36\}-python
+    envlist=py\{27,33,34,35,36\}-python
   else
   else
     envlist=py27-python
     envlist=py27-python
   fi
   fi
@@ -294,9 +293,9 @@ build_python_cpp() {
   export LD_LIBRARY_PATH=../src/.libs # for Linux
   export LD_LIBRARY_PATH=../src/.libs # for Linux
   export DYLD_LIBRARY_PATH=../src/.libs # for OS X
   export DYLD_LIBRARY_PATH=../src/.libs # for OS X
   cd python
   cd python
-  # Only test Python 2.6/3.x on Linux
+  # Only test Python 3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
   if [ $(uname -s) == "Linux" ]; then
-    envlist=py\{26,27,33,34,35,36\}-cpp
+    envlist=py\{27,33,34,35,36\}-cpp
   else
   else
     envlist=py27-cpp
     envlist=py27-cpp
   fi
   fi