File tree 3 files changed +14
-5
lines changed
3 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -37,19 +37,19 @@ jobs:
37
37
sendCoverage : " true"
38
38
mac_python_2_7 :
39
39
python.version : " 2.7"
40
- imageName : macos -10.13
40
+ imageName : macOS -10.15
41
41
sendCoverage : " false"
42
42
mac_python_3_5 :
43
43
python.version : " 3.5"
44
- imageName : macos -10.13
44
+ imageName : macOS -10.15
45
45
sendCoverage : " false"
46
46
mac_python_3_6 :
47
47
python.version : " 3.6"
48
- imageName : macos -10.13
48
+ imageName : macOS -10.15
49
49
sendCoverage : " false"
50
50
mac_python_3_7 :
51
51
python.version : " 3.7"
52
- imageName : macos -10.13
52
+ imageName : macOS -10.15
53
53
sendCoverage : " false"
54
54
windows_python_2_7 :
55
55
python.version : " 2.7"
Original file line number Diff line number Diff line change 14
14
# limitations under the License.
15
15
16
16
import os
17
+ import sys
17
18
from distutils .core import setup
18
19
from setuptools import find_packages
19
20
@@ -38,6 +39,13 @@ def read(fname):
38
39
with open (os .path .join (repository_dir , 'requirements.txt' )) as fh :
39
40
requirements = fh .readlines ()
40
41
42
+ # soupsieve is not a direct requirement of this package, but left to it's own
43
+ # devices a version >= 2.0 is installed for Python 2 which is not compatible.
44
+ # Therefore perform the installation of a compatible package before any other
45
+ # packages are installed.
46
+ if sys .version_info .major == 2 :
47
+ requirements .insert (0 , "soupsieve<2.0" )
48
+
41
49
with open (os .path .join (repository_dir , 'test_requirements.txt' )) as fh :
42
50
test_requirements = fh .readlines ()
43
51
Original file line number Diff line number Diff line change @@ -43,7 +43,8 @@ def _plist_from_popen(popen):
43
43
return []
44
44
try :
45
45
try :
46
- # Try simple and fast first if this fails fall back to the slower but better process
46
+ # Try simple and fast first if this fails fall back to the slower but
47
+ # more robust process.
47
48
return loads (out )
48
49
except ExpatError :
49
50
# Beautiful soup ensures the XML is properly formed after it is parsed
You can’t perform that action at this time.
0 commit comments