Skip to content

Commit 8fe8ada

Browse files
committed
Explicitly force python 3.5 for testing, install pypandoc for conda, remove ml.stat
1 parent 16d2773 commit 8fe8ada

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dev/run-pip-tests

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if hash virtualenv 2>/dev/null && [ ! -n "$USE_CONDA" ]; then
5353
fi
5454
elif hash conda 2>/dev/null; then
5555
echo "Using conda virtual enviroments"
56-
PYTHON_EXECS=('3')
56+
PYTHON_EXECS=('3.5')
5757
USE_CONDA=1
5858
else
5959
echo "Missing virtualenv & conda, skipping pip installability tests"
@@ -84,6 +84,7 @@ for python in "${PYTHON_EXECS[@]}"; do
8484
if [ -n "$USE_CONDA" ]; then
8585
conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip setuptools
8686
source activate "$VIRTUALENV_PATH"
87+
conda install -y -c conda-forge pypandoc
8788
else
8889
mkdir -p "$VIRTUALENV_PATH"
8990
virtualenv --python=$python "$VIRTUALENV_PATH"

python/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ def _supports_symlinks():
167167
'pyspark.ml',
168168
'pyspark.ml.linalg',
169169
'pyspark.ml.param',
170-
'pyspark.ml.stat',
171170
'pyspark.sql',
172171
'pyspark.streaming',
173172
'pyspark.bin',

0 commit comments

Comments
 (0)