Skip to content
Snippets Groups Projects
Commit 585aa4f8 authored by simply-nicky's avatar simply-nicky
Browse files

Merge branch 'dev0'

parents 31caa061 636e5489
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ copyright = '2020, Nikolay Ivanov' ...@@ -22,7 +22,7 @@ copyright = '2020, Nikolay Ivanov'
author = 'Nikolay Ivanov' author = 'Nikolay Ivanov'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.1.11' release = '0.1.12'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
...@@ -3,7 +3,6 @@ import numpy as np ...@@ -3,7 +3,6 @@ import numpy as np
from libc.math cimport sqrt, exp, pi, floor, ceil from libc.math cimport sqrt, exp, pi, floor, ceil
from cython.parallel import prange from cython.parallel import prange
cimport openmp cimport openmp
from posix.time cimport clock_gettime, timespec, CLOCK_REALTIME
ctypedef fused float_t: ctypedef fused float_t:
np.float64_t np.float64_t
......
...@@ -39,7 +39,7 @@ with open('README.md', 'r') as readme: ...@@ -39,7 +39,7 @@ with open('README.md', 'r') as readme:
long_description = readme.read() long_description = readme.read()
setup(name='pyrost', setup(name='pyrost',
version='0.1.11', version='0.1.12',
author='Nikolay Ivanov', author='Nikolay Ivanov',
author_email="nikolay.ivanov@desy.de", author_email="nikolay.ivanov@desy.de",
long_description=long_description, long_description=long_description,
...@@ -49,7 +49,7 @@ setup(name='pyrost', ...@@ -49,7 +49,7 @@ setup(name='pyrost',
include_package_data=True, include_package_data=True,
package_data={'pyrost.bin': ['*.pyx', '*.c'], package_data={'pyrost.bin': ['*.pyx', '*.c'],
'pyrost': ['config/*.ini']}, 'pyrost': ['config/*.ini']},
install_requires=['Cython', 'h5py', 'numpy', 'scipy'], install_requires=['h5py', 'numpy', 'scipy'],
extras_require={'interactive': ['matplotlib', 'jupyter', 'pyximport']}, extras_require={'interactive': ['matplotlib', 'jupyter', 'pyximport']},
ext_modules=extensions, ext_modules=extensions,
classifiers=[ classifiers=[
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment