File tree 2 files changed +8
-7
lines changed
2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ install:
16
16
- " pip install -e .[google]"
17
17
- " pip install simplejson ujson warcio"
18
18
- " pip install python-rapidjson || true"
19
- - " pip install pyspark || true"
19
+ - " python -V | grep -q 'Python 3.8' || pip install pyspark || true"
20
20
- " export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64"
21
21
- " export PATH=$JAVA_HOME/bin:$PATH"
22
22
- " java -version"
Original file line number Diff line number Diff line change 60
60
# rapidjson is not available on Python 2
61
61
if sys .version_info [0 ] == 2 :
62
62
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' )
68
64
69
65
# limited support for Python 3.4, which has reached end-of-life
70
66
# (We continue supporting 3.4 to make old AMIs work, see #2090)
74
70
75
71
# PyYAML dropped 3.4 support in version 5.3
76
72
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
78
74
for ir in setuptools_kwargs ['install_requires' ]
79
75
]
80
76
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
+
81
82
except ImportError :
82
83
from distutils .core import setup
83
84
setuptools_kwargs = {}
You can’t perform that action at this time.
0 commit comments