From 4afb63bbb4442732b2aca5e7944488eb8f4e1a1a Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Sat, 3 Oct 2020 16:26:28 +0200
Subject: [PATCH] Warning fixes in setup.py
---
pystencils_tests/test_timeloop.py | 2 +-
setup.py | 113 +++++++++++++++---------------
2 files changed, 57 insertions(+), 58 deletions(-)
diff --git a/pystencils_tests/test_timeloop.py b/pystencils_tests/test_timeloop.py
index a4e0d92a..f61d4cc5 100644
--- a/pystencils_tests/test_timeloop.py
+++ b/pystencils_tests/test_timeloop.py
@@ -59,4 +59,4 @@ def test_timeloop():
timeloop.run_time_span(seconds=seconds)
end = time.perf_counter()
- np.testing.assert_almost_equal(seconds, end - start, decimal=3)
+ np.testing.assert_almost_equal(seconds, end - start, decimal=2)
diff --git a/setup.py b/setup.py
index fcd12176..3231da4d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+import setuptools
import distutils
import io
import os
@@ -5,8 +6,6 @@ import sys
from contextlib import redirect_stdout
from importlib import import_module
-from setuptools import find_packages, setup
-
if '--use-cython' in sys.argv:
USE_CYTHON = True
sys.argv.remove('--use-cython')
@@ -77,58 +76,58 @@ try:
except ImportError:
version = open('RELEASE-VERSION', 'r').read()
-setup(name='pystencils',
- description='Speeding up stencil computations on CPUs and GPUs',
- version=version,
- long_description=readme(),
- long_description_content_type="text/markdown",
- author='Martin Bauer',
- license='AGPLv3',
- author_email='martin.bauer@fau.de',
- url='https://i10git.cs.fau.de/pycodegen/pystencils/',
- packages=['pystencils'] + ['pystencils.' + s for s in find_packages('pystencils')],
- install_requires=['sympy>=1.1', 'numpy', 'appdirs', 'joblib'],
- package_data={'pystencils': ['include/*.h',
- 'backends/cuda_known_functions.txt',
- 'backends/opencl1.1_known_functions.txt']},
-
- ext_modules=cython_extensions("pystencils.boundaries.createindexlistcython"),
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Framework :: Jupyter',
- 'Topic :: Software Development :: Code Generators',
- 'Topic :: Scientific/Engineering :: Physics',
- 'Intended Audience :: Developers',
- 'Intended Audience :: Science/Research',
- 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
- ],
- project_urls={
- "Bug Tracker": "https://i10git.cs.fau.de/pycodegen/pystencils/issues",
- "Documentation": "http://pycodegen.pages.walberla.net/pystencils/",
- "Source Code": "https://i10git.cs.fau.de/pycodegen/pystencils",
- },
- extras_require={
- 'gpu': ['pycuda'],
- 'opencl': ['pyopencl'],
- 'alltrafos': ['islpy', 'py-cpuinfo'],
- 'bench_db': ['blitzdb', 'pymongo', 'pandas'],
- 'interactive': ['matplotlib', 'ipy_table', 'imageio', 'jupyter', 'pyevtk', 'rich', 'graphviz'],
- 'autodiff': ['pystencils-autodiff'],
- 'doc': ['sphinx', 'sphinx_rtd_theme', 'nbsphinx',
- 'sphinxcontrib-bibtex', 'sphinx_autodoc_typehints', 'pandoc'],
- },
- tests_require=['pytest',
- 'pytest-cov',
- 'pytest-html',
- 'ansi2html',
- 'pytest-xdist',
- 'flake8',
- 'nbformat',
- 'nbconvert',
- 'ipython'],
-
- python_requires=">=3.6",
- cmdclass={
- 'quicktest': SimpleTestRunner
- },
- )
+setuptools.setup(name='pystencils',
+ description='Speeding up stencil computations on CPUs and GPUs',
+ version=version,
+ long_description=readme(),
+ long_description_content_type="text/markdown",
+ author='Martin Bauer',
+ license='AGPLv3',
+ author_email='martin.bauer@fau.de',
+ url='https://i10git.cs.fau.de/pycodegen/pystencils/',
+ packages=['pystencils'] + ['pystencils.' + s for s in setuptools.find_packages('pystencils')],
+ install_requires=['sympy>=1.1', 'numpy', 'appdirs', 'joblib'],
+ package_data={'pystencils': ['include/*.h',
+ 'backends/cuda_known_functions.txt',
+ 'backends/opencl1.1_known_functions.txt']},
+
+ ext_modules=cython_extensions("pystencils.boundaries.createindexlistcython"),
+ classifiers=[
+ 'Development Status :: 4 - Beta',
+ 'Framework :: Jupyter',
+ 'Topic :: Software Development :: Code Generators',
+ 'Topic :: Scientific/Engineering :: Physics',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Science/Research',
+ 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+ ],
+ project_urls={
+ "Bug Tracker": "https://i10git.cs.fau.de/pycodegen/pystencils/issues",
+ "Documentation": "http://pycodegen.pages.walberla.net/pystencils/",
+ "Source Code": "https://i10git.cs.fau.de/pycodegen/pystencils",
+ },
+ extras_require={
+ 'gpu': ['pycuda'],
+ 'opencl': ['pyopencl'],
+ 'alltrafos': ['islpy', 'py-cpuinfo'],
+ 'bench_db': ['blitzdb', 'pymongo', 'pandas'],
+ 'interactive': ['matplotlib', 'ipy_table', 'imageio', 'jupyter', 'pyevtk', 'rich', 'graphviz'],
+ 'autodiff': ['pystencils-autodiff'],
+ 'doc': ['sphinx', 'sphinx_rtd_theme', 'nbsphinx',
+ 'sphinxcontrib-bibtex', 'sphinx_autodoc_typehints', 'pandoc'],
+ },
+ tests_require=['pytest',
+ 'pytest-cov',
+ 'pytest-html',
+ 'ansi2html',
+ 'pytest-xdist',
+ 'flake8',
+ 'nbformat',
+ 'nbconvert',
+ 'ipython'],
+
+ python_requires=">=3.6",
+ cmdclass={
+ 'quicktest': SimpleTestRunner
+ },
+ )
--
GitLab