You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2014/10/11 20:26:56 UTC
git commit: [SPARK-3867][PySpark] ./python/run-tests failed when it
run with Python 2.6 and unittest2 is not installed
Repository: spark
Updated Branches:
refs/heads/master 0e8203f4f -> 81015a2ba
[SPARK-3867][PySpark] ./python/run-tests failed when it run with Python 2.6 and unittest2 is not installed
./python/run-tests search a Python 2.6 executable on PATH and use it if available.
When using Python 2.6, it is going to import unittest2 module which is not a standard library in Python 2.6, so it fails with ImportError.
Author: cocoatomo <co...@gmail.com>
Closes #2759 from cocoatomo/issues/3867-unittest2-import-error and squashes the following commits:
f068eb5 [cocoatomo] [SPARK-3867] ./python/run-tests failed when it run with Python 2.6 and unittest2 is not installed
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/81015a2b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/81015a2b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/81015a2b
Branch: refs/heads/master
Commit: 81015a2ba49583d730ce65b2262f50f1f2451a79
Parents: 0e8203f
Author: cocoatomo <co...@gmail.com>
Authored: Sat Oct 11 11:26:17 2014 -0700
Committer: Josh Rosen <jo...@apache.org>
Committed: Sat Oct 11 11:26:17 2014 -0700
----------------------------------------------------------------------
python/pyspark/mllib/tests.py | 6 +++++-
python/pyspark/tests.py | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/81015a2b/python/pyspark/mllib/tests.py
----------------------------------------------------------------------
diff --git a/python/pyspark/mllib/tests.py b/python/pyspark/mllib/tests.py
index 5c20e10..463faf7 100644
--- a/python/pyspark/mllib/tests.py
+++ b/python/pyspark/mllib/tests.py
@@ -25,7 +25,11 @@ import array as pyarray
from numpy import array, array_equal
if sys.version_info[:2] <= (2, 6):
- import unittest2 as unittest
+ try:
+ import unittest2 as unittest
+ except ImportError:
+ sys.stderr.write('Please install unittest2 to test with Python 2.6 or earlier')
+ sys.exit(1)
else:
import unittest
http://git-wip-us.apache.org/repos/asf/spark/blob/81015a2b/python/pyspark/tests.py
----------------------------------------------------------------------
diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
index 7f05d48..ceab574 100644
--- a/python/pyspark/tests.py
+++ b/python/pyspark/tests.py
@@ -34,7 +34,11 @@ import random
from platform import python_implementation
if sys.version_info[:2] <= (2, 6):
- import unittest2 as unittest
+ try:
+ import unittest2 as unittest
+ except ImportError:
+ sys.stderr.write('Please install unittest2 to test with Python 2.6 or earlier')
+ sys.exit(1)
else:
import unittest
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org