From e1aacebffaf9a68a45b2e5a9ff9c73202db0c1f2 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 22 Jun 2020 23:36:13 -0500 Subject: [PATCH 1/4] Require Py3.6 --- setup.py | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/setup.py b/setup.py index c464a42..e69de29 100644 --- a/setup.py +++ b/setup.py @@ -1,53 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - - -def main(): - from setuptools import setup, find_packages - - version_dict = {} - init_filename = "leap/version.py" - exec(compile(open(init_filename, "r").read(), init_filename, "exec"), - version_dict) - - setup(name="leap", - version=version_dict["VERSION_TEXT"], - description="Time integration by code generation", - long_description=open("README.rst", "rt").read(), - author="Andreas Kloeckner", - author_email="inform@tiker.net", - license="MIT", - url="http://wiki.tiker.net/Leap", - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'Intended Audience :: Other Audience', - 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: MIT License', - 'Natural Language :: English', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Topic :: Scientific/Engineering', - 'Topic :: Scientific/Engineering :: Information Analysis', - 'Topic :: Scientific/Engineering :: Mathematics', - 'Topic :: Scientific/Engineering :: Visualization', - 'Topic :: Software Development :: Libraries', - 'Topic :: Utilities', - ], - - packages=find_packages(), - - install_requires=[ - "numpy>=1.5", - "pytools>=2014.1", - "pymbolic>=2014.1", - "pytest>=2.3", - "dagrt>=2019.4", - "mako", - "six", - ], - ) - - -if __name__ == '__main__': - main() -- GitLab From 404827bfebd36bdb154594bfb91e632ca1529f08 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 22 Jun 2020 23:36:13 -0500 Subject: [PATCH 2/4] Add .editorconfig --- .editorconfig | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..beccf10 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,32 @@ +# https://editorconfig.org/ +# https://github.com/editorconfig/editorconfig-vim +# https://github.com/editorconfig/editorconfig-emacs + +root = true + +[*] +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.py] +indent_size = 4 + +[*.rst] +indent_size = 4 + +[*.cpp] +indent_size = 2 + +[*.hpp] +indent_size = 2 + +# There may be one in doc/ +[Makefile] +indent_style = tab + +# https://github.com/microsoft/vscode/issues/1679 +[*.md] +trim_trailing_whitespace = false \ No newline at end of file -- GitLab From d4cd4ae5a60514856afc962e7b824270922d0832 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 22 Jun 2020 23:37:47 -0500 Subject: [PATCH 3/4] Revert "Require Py3.6" This reverts commit e1aacebffaf9a68a45b2e5a9ff9c73202db0c1f2. --- setup.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/setup.py b/setup.py index e69de29..c464a42 100644 --- a/setup.py +++ b/setup.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + + +def main(): + from setuptools import setup, find_packages + + version_dict = {} + init_filename = "leap/version.py" + exec(compile(open(init_filename, "r").read(), init_filename, "exec"), + version_dict) + + setup(name="leap", + version=version_dict["VERSION_TEXT"], + description="Time integration by code generation", + long_description=open("README.rst", "rt").read(), + author="Andreas Kloeckner", + author_email="inform@tiker.net", + license="MIT", + url="http://wiki.tiker.net/Leap", + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'Intended Audience :: Other Audience', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: MIT License', + 'Natural Language :: English', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Topic :: Scientific/Engineering', + 'Topic :: Scientific/Engineering :: Information Analysis', + 'Topic :: Scientific/Engineering :: Mathematics', + 'Topic :: Scientific/Engineering :: Visualization', + 'Topic :: Software Development :: Libraries', + 'Topic :: Utilities', + ], + + packages=find_packages(), + + install_requires=[ + "numpy>=1.5", + "pytools>=2014.1", + "pymbolic>=2014.1", + "pytest>=2.3", + "dagrt>=2019.4", + "mako", + "six", + ], + ) + + +if __name__ == '__main__': + main() -- GitLab From 56ca215d57c5b7fd4f8b3f4a957b32a1055d5162 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Mon, 22 Jun 2020 23:38:34 -0500 Subject: [PATCH 4/4] Actually require python 3.6 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c464a42..d6f1a27 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ def main(): packages=find_packages(), + python_requires="~=3.6", install_requires=[ "numpy>=1.5", "pytools>=2014.1", -- GitLab