Skip to content

Commit 41eb342

Browse files
committed
Fix platform check error
1 parent 80736d8 commit 41eb342

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

setup.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -240,22 +240,25 @@ def run(self):
240240
extras_require = {
241241
'test:python_version == "2.7"': ['mock'],
242242
'test:platform_system == "Windows"': ['pywin32'],
243-
'test': ['pytest<5.0',
244-
'pytest-qt',
245-
'pytest-mock',
246-
'pytest-cov',
247-
'pytest-xvfb;platform_system=="Linux"',
248-
'pytest-ordering',
249-
'pytest-lazy-fixture',
250-
'pytest-faulthandler',
251-
'mock',
252-
'flaky',
253-
'pandas',
254-
'scipy',
255-
'sympy',
256-
'pillow',
257-
'matplotlib',
258-
'cython'],
243+
'test': [
244+
'cython',
245+
'flaky',
246+
'matplotlib',
247+
'mock',
248+
'pandas',
249+
'pillow',
250+
'pytest<5.0',
251+
'pytest-cov',
252+
'pytest-faulthandler',
253+
'pytest-lazy-fixture',
254+
'pytest-mock',
255+
'pytest-ordering',
256+
'pytest-qt',
257+
'pytest-xvfb;platform_system=="Linux"',
258+
'pyyaml',
259+
'scipy',
260+
'sympy',
261+
],
259262
}
260263

261264
if 'setuptools' in sys.modules:

spyder/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
'package_name': "paramiko",
127127
'features': _("Connect to remote kernels through SSH"),
128128
'required_version': PARAMIKO_REQVER,
129-
'display': sys.platform == 'nt'},
129+
'display': os.name == 'nt'},
130130
{'modname': "parso",
131131
'package_name': "parso",
132132
'features': _("Python parser that supports error recovery and "

spyder/tests/test_dependencies_in_sync.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ def parse_setup(fpath):
122122
for dep in dep_list:
123123
dep = dep.split(';')[0]
124124
name, ver = None, None
125-
# Use regex?
126-
for sep in ['>=', '==', '<=', '<']:
125+
126+
for sep in ['>=', '==', '<=', '<', '>']:
127127
if sep in dep:
128128
idx = dep.index(sep)
129129
name = dep[:idx]
@@ -133,7 +133,7 @@ def parse_setup(fpath):
133133
if name is not None:
134134
name = name.split('[')[0]
135135
else:
136-
name = dep
136+
name = dep.split('[')[0]
137137

138138
# Transform pypi to conda name
139139
if name == 'pyqt5':

0 commit comments

Comments
 (0)