Skip to content
Snippets Groups Projects
Commit eb191dc1 authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

Merge branch 'SmallFixes' into 'master'

Fix setup dependency

Closes #22

See merge request pycodegen/lbmpy!96
parents 2bfdfe0f 8b0e1efe
1 merge request!96Fix setup dependency
Pipeline #34504 failed with stages
in 33 minutes and 11 seconds
import os import os
import sys
import io import io
from setuptools import setup, find_packages from setuptools import setup, find_packages
import distutils import distutils
...@@ -10,6 +9,7 @@ import versioneer ...@@ -10,6 +9,7 @@ import versioneer
try: try:
import cython # noqa import cython # noqa
USE_CYTHON = True USE_CYTHON = True
except ImportError: except ImportError:
USE_CYTHON = False USE_CYTHON = False
...@@ -19,6 +19,7 @@ quick_tests = [ ...@@ -19,6 +19,7 @@ quick_tests = [
'test_serial_scenarios.test_channel_srt', 'test_serial_scenarios.test_channel_srt',
] ]
class SimpleTestRunner(distutils.cmd.Command): class SimpleTestRunner(distutils.cmd.Command):
"""A custom command to run selected tests""" """A custom command to run selected tests"""
...@@ -69,8 +70,9 @@ def cython_extensions(*extensions): ...@@ -69,8 +70,9 @@ def cython_extensions(*extensions):
else: else:
return None return None
def get_cmdclass(): def get_cmdclass():
cmdclass={"quicktest": SimpleTestRunner} cmdclass = {"quicktest": SimpleTestRunner}
cmdclass.update(versioneer.get_cmdclass()) cmdclass.update(versioneer.get_cmdclass())
return cmdclass return cmdclass
...@@ -85,7 +87,7 @@ setup(name='lbmpy', ...@@ -85,7 +87,7 @@ setup(name='lbmpy',
author_email='cs10-codegen@fau.de', author_email='cs10-codegen@fau.de',
url='https://i10git.cs.fau.de/pycodegen/lbmpy/', url='https://i10git.cs.fau.de/pycodegen/lbmpy/',
packages=['lbmpy'] + ['lbmpy.' + s for s in find_packages('lbmpy')], packages=['lbmpy'] + ['lbmpy.' + s for s in find_packages('lbmpy')],
install_requires=['pystencils', 'sympy>=1.2', 'numpy>=1.11.0'], install_requires=['pystencils>=0.4.0', 'sympy>=1.2', 'numpy>=1.11.0'],
package_data={'lbmpy': ['phasefield/simplex_projection.pyx', package_data={'lbmpy': ['phasefield/simplex_projection.pyx',
'phasefield/simplex_projection.c']}, 'phasefield/simplex_projection.c']},
ext_modules=cython_extensions("lbmpy.phasefield.simplex_projection"), ext_modules=cython_extensions("lbmpy.phasefield.simplex_projection"),
......
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