aboutsummaryrefslogtreecommitdiff
path: root/python/run-tests.py
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-07-08 18:22:53 -0700
committerDavies Liu <davies.liu@gmail.com>2015-07-08 18:22:53 -0700
commit74d8d3d928cc9a7386b68588ac89ae042847d146 (patch)
tree0248cc711322eb4a7a6966e9cfbf3a90ca886733 /python/run-tests.py
parent2a4f88b6c16f2991e63b17c0e103bcd79f04dbbc (diff)
downloadspark-74d8d3d928cc9a7386b68588ac89ae042847d146.tar.gz
spark-74d8d3d928cc9a7386b68588ac89ae042847d146.tar.bz2
spark-74d8d3d928cc9a7386b68588ac89ae042847d146.zip
[SPARK-8450] [SQL] [PYSARK] cleanup type converter for Python DataFrame
This PR fixes the converter for Python DataFrame, especially for DecimalType Closes #7106 Author: Davies Liu <davies@databricks.com> Closes #7131 from davies/decimal_python and squashes the following commits: 4d3c234 [Davies Liu] Merge branch 'master' of github.com:apache/spark into decimal_python 20531d6 [Davies Liu] Merge branch 'master' of github.com:apache/spark into decimal_python 7d73168 [Davies Liu] fix conflit 6cdd86a [Davies Liu] Merge branch 'master' of github.com:apache/spark into decimal_python 7104e97 [Davies Liu] improve type infer 9cd5a21 [Davies Liu] run python tests with SPARK_PREPEND_CLASSES 829a05b [Davies Liu] fix UDT in python c99e8c5 [Davies Liu] fix mima c46814a [Davies Liu] convert decimal for Python DataFrames
Diffstat (limited to 'python/run-tests.py')
-rwxr-xr-xpython/run-tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/run-tests.py b/python/run-tests.py
index 7638854def..cc56077937 100755
--- a/python/run-tests.py
+++ b/python/run-tests.py
@@ -72,7 +72,8 @@ LOGGER = logging.getLogger()
def run_individual_python_test(test_name, pyspark_python):
- env = {'SPARK_TESTING': '1', 'PYSPARK_PYTHON': which(pyspark_python)}
+ env = dict(os.environ)
+ env.update({'SPARK_TESTING': '1', 'PYSPARK_PYTHON': which(pyspark_python)})
LOGGER.debug("Starting test(%s): %s", pyspark_python, test_name)
start_time = time.time()
try: