Skip to content

[PySpark] Fix tests with Python 2.6 in 1.0 branch #3668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davies wants to merge 4 commits into from
Closed

[PySpark] Fix tests with Python 2.6 in 1.0 branch #3668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c55cff
[SPARK-2951] [PySpark] support unpickle array.array for Python 2.6
davies Sep 16, 2014
14ad3d9
[PySpark] [SPARK-2954] [SPARK-2948] [SPARK-2910] [SPARK-2101] Python …
JoshRosen Aug 11, 2014
bda1c72
[SPARK-3867][PySpark] ./python/run-tests failed when it run with Pyth…
cocoatomo Oct 11, 2014
b32583d
rollback _common.py
Dec 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[SPARK-3867][PySpark] ./python/run-tests failed when it run with Pyth… 
…on 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 <[email protected]>

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
  • Loading branch information
@cocoatomo
cocoatomo authored and Davies Liu committed Dec 10, 2014
commit bda1c721e1e691b77a0ba1fd4291278b6be42d6f
6 changes: 5 additions & 1 deletion python/pyspark/mllib/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
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

Expand Down
6 changes: 5 additions & 1 deletion python/pyspark/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
import zipfile

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

Expand Down