Skip to content

Commit f4f5b00

Browse files
author
Dave Marin
committed
skip pyspark tests in Python 3.8
1 parent 87cea1c commit f4f5b00

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install:
1616
- "pip install -e .[google]"
1717
- "pip install simplejson ujson warcio"
1818
- "pip install python-rapidjson || true"
19-
- "pip install pyspark || true"
19+
- "python -V | grep -q 'Python 3.8' || pip install pyspark || true"
2020
- "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64"
2121
- "export PATH=$JAVA_HOME/bin:$PATH"
2222
- "java -version"

setup.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@
6060
# rapidjson is not available on Python 2
6161
if sys.version_info[0] == 2:
6262
del setuptools_kwargs['extras_require']['rapidjson']
63-
64-
setuptools_kwargs['tests_require'] = [
65-
tr for tr in setuptools_kwargs['tests_require']
66-
if 'rapidjson' not in tr
67-
]
63+
setuptools_kwargs['tests_require'].remove('python-rapidjson')
6864

6965
# limited support for Python 3.4, which has reached end-of-life
7066
# (We continue supporting 3.4 to make old AMIs work, see #2090)
@@ -74,10 +70,15 @@
7470

7571
# PyYAML dropped 3.4 support in version 5.3
7672
setuptools_kwargs['install_requires'] = [
77-
'PyYAML>=3.10,<5.3' if ir.startswith('PyYAML') else ir
73+
ir + ',<5.2' if ir.startswith('PyYAML') else ir
7874
for ir in setuptools_kwargs['install_requires']
7975
]
8076

77+
# 2020-03-23: for now, disable pyspark on Python 3.8 (it installs
78+
# but doesn't work)
79+
if sys.version_info[:2] >= (3, 4):
80+
setuptools_kwargs['tests_require'].remove('pyspark')
81+
8182
except ImportError:
8283
from distutils.core import setup
8384
setuptools_kwargs = {}

0 commit comments

Comments
 (0)