Commit b37b13e6 authored by Ashwin Vishnu's avatar Ashwin Vishnu
Browse files

Python 2 compat purepymake.py, update tox

parent 2af0cb5316ea
......@@ -178,7 +178,7 @@ class CommandsRunner(object):
self._processes.append(process)
def _check_processes(self):
for process in self._processes.copy():
for process in copy(self._processes):
if process.poll() is not None:
self._processes.remove(process)
if process.returncode != 0:
......@@ -198,7 +198,7 @@ class FunctionsRunner(CommandsRunner):
self._processes.append(process)
def _check_processes(self):
for process in self._processes.copy():
for process in copy(self._processes):
if process.exitcode is not None:
self._processes.remove(process)
......@@ -468,7 +468,7 @@ def build_extensions(self):
except AttributeError:
pass
num_jobs = os.cpu_count()
num_jobs = multiprocessing.cpu_count()
pool = Pool(num_jobs)
pool.map(self.build_extension, self.extensions)
pool.shutdown()
......
......@@ -14,7 +14,7 @@ on_tox = os.environ.get('TOXENV')
if on_tox:
setup_requires.append('mpi4py')
if 'pythran' in os.getenv('TOXENV'):
setup_requires.extend(['networkx>=1.5, <2.0', 'pythran'])
setup_requires.extend(['pythran'])
Distribution(dict(setup_requires=setup_requires))
......
......@@ -31,8 +31,8 @@ deps =
ipython
cython
mako
pandas
hg+https://bitbucket.org/fluiddyn/fluiddyn
pythran: networkx>1.5,<2.0
pythran: git+https://github.com/serge-sans-paille/pythran#egg=pythran[deps]
commands =
make _tests_coverage
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment