Skip to content

Commit

Permalink
Fixes for python3
Browse files Browse the repository at this point in the history
  • Loading branch information
uSpike committed Feb 8, 2018
1 parent 20a02b6 commit bddc534
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
@@ -1,5 +1,8 @@
language: python
python: 2.7
python:
- 2.7
- 3.5
- 3.6
cache: pip

env:
Expand Down
4 changes: 2 additions & 2 deletions pytest_mp/plugin.py
Expand Up @@ -123,7 +123,7 @@ def get_item_batch_name_and_strategy(item):

# In general, multiple mp_group decorations aren't supported.
# This is a best effort, since kwargs will be overwritten.
distilled = list(marker_args) + marker_kwargs.values()
distilled = list(marker_args) + list(marker_kwargs.values())
if len(distilled) > 2 \
or (len(distilled) == 2 and 'strategy' not in marker_kwargs
and not any([x in distilled for x in ('free', 'isolated_free', 'serial', 'isolated_serial')])):
Expand Down Expand Up @@ -170,7 +170,7 @@ def batch_tests(session):
for test in batches[group]['tests']:
total_tests += 1

print 'There should be {} tests run.'.format(total_tests)
print('There should be {} tests run.'.format(total_tests))

return batches

Expand Down
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -42,6 +42,9 @@ def run_tests(self):
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Operating System :: OS Independent',
'License :: OSI Approved :: MIT License'],
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Expand Up @@ -4,7 +4,6 @@ envlist = lint, test

[testenv]
recreate = True
basepython = python2.7
passenv = PYTHONPATH
setenv = PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}:.

Expand Down

0 comments on commit bddc534

Please sign in to comment.