Skip to content
Snippets Groups Projects
Commit a3cec2ce authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch 'master' into 'master'

Fixed wrong type hints. Updated setup.py

See merge request !263
parents 997100b0 7f7c4cf7
Branches
Tags release/0.4.0
No related merge requests found
...@@ -3,7 +3,7 @@ import itertools ...@@ -3,7 +3,7 @@ import itertools
import warnings import warnings
from dataclasses import dataclass, field from dataclasses import dataclass, field
from types import MappingProxyType from types import MappingProxyType
from typing import Callable, Union, List, Dict, Tuple from typing import Callable, Union, List, Dict, Tuple, Any
import sympy as sp import sympy as sp
...@@ -68,10 +68,10 @@ class CreateKernelConfig: ...@@ -68,10 +68,10 @@ class CreateKernelConfig:
use_textures_for_interpolation: bool = True use_textures_for_interpolation: bool = True
cpu_prepend_optimizations: List[Callable] = field(default_factory=list) cpu_prepend_optimizations: List[Callable] = field(default_factory=list)
use_auto_for_assignments: bool = False use_auto_for_assignments: bool = False
opencl_queue: ... = None opencl_queue: Any = None
opencl_ctx: ... = None opencl_ctx: Any = None
index_fields: List[Field] = None index_fields: List[Field] = None
coordinate_names: Tuple[str, ...] = ('x', 'y', 'z') coordinate_names: Tuple[str, Any] = ('x', 'y', 'z')
def __post_init__(self): def __post_init__(self):
# ---- Legacy parameters # ---- Legacy parameters
......
...@@ -74,6 +74,7 @@ def cython_extensions(*extensions): ...@@ -74,6 +74,7 @@ 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())
...@@ -85,9 +86,9 @@ setuptools.setup(name='pystencils', ...@@ -85,9 +86,9 @@ setuptools.setup(name='pystencils',
version=versioneer.get_version(), version=versioneer.get_version(),
long_description=readme(), long_description=readme(),
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
author='Martin Bauer', author='Martin Bauer, Jan Hönig, Markus Holzer',
license='AGPLv3', license='AGPLv3',
author_email='martin.bauer@fau.de', author_email='cs10-codegen@fau.de',
url='https://i10git.cs.fau.de/pycodegen/pystencils/', url='https://i10git.cs.fau.de/pycodegen/pystencils/',
packages=['pystencils'] + ['pystencils.' + s for s in setuptools.find_packages('pystencils')], packages=['pystencils'] + ['pystencils.' + s for s in setuptools.find_packages('pystencils')],
install_requires=['sympy>=1.2', 'numpy>=1.8.0', 'appdirs', 'joblib'], install_requires=['sympy>=1.2', 'numpy>=1.8.0', 'appdirs', 'joblib'],
......
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