From 48d0379da7b2668cee155dbf2a19eded32e3ae65 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 13 Jan 2022 15:09:33 +0300 Subject: [PATCH] Added `__main__.py` to make the package working without installation. Moved the metadata into `setup.cfg`. Version is now automatically retrieved from tags with `setuptools_scm`. Added `pyproject.toml`. Corrected the license in metadata (it must not be a file name, but an SPDX id of the license). --- .gitignore | 1 + editorconfig_tools/__init__.py | 2 +- editorconfig_tools/__main__.py | 5 +++++ editorconfig_tools/check_editorconfig.py | 3 --- pyproject.toml | 7 +++++++ setup.cfg | 15 +++++++++++++++ setup.py | 21 --------------------- 7 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 editorconfig_tools/__main__.py create mode 100644 pyproject.toml create mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 98d5848..cc4f8cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/editorconfig_tools/version.py *.pyc EditorConfig_Tools.egg-info/* build/* diff --git a/editorconfig_tools/__init__.py b/editorconfig_tools/__init__.py index b794fd4..58f3ace 100644 --- a/editorconfig_tools/__init__.py +++ b/editorconfig_tools/__init__.py @@ -1 +1 @@ -__version__ = '0.1.0' +from .version import __version__ diff --git a/editorconfig_tools/__main__.py b/editorconfig_tools/__main__.py new file mode 100644 index 0000000..55d2392 --- /dev/null +++ b/editorconfig_tools/__main__.py @@ -0,0 +1,5 @@ +from .check_editorconfig import main + + +if __name__ == '__main__': + main() diff --git a/editorconfig_tools/check_editorconfig.py b/editorconfig_tools/check_editorconfig.py index 0695c7b..e58aa62 100755 --- a/editorconfig_tools/check_editorconfig.py +++ b/editorconfig_tools/check_editorconfig.py @@ -51,6 +51,3 @@ def main(): for error in checker.check(filename, props): print("%s: %s" % (filename, error)) - -if __name__ == '__main__': - main() diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..999d5dd --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] +requires = ["setuptools>=44", "wheel", "setuptools_scm[toml]>=3.4.3"] +build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "editorconfig_tools/version.py" +write_to_template = "__version__ = '{version}'\n" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..ee55780 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,15 @@ +[metadata] +name = EditorConfig Tools +author = EditorConfig Team +license = BSD-2-Clause AND BSD-3-Clause +description = Tools for correcting files based on EditorConfig files +long_description = file: README.rst + +[options] +packages = editorconfig_tools +install_requires = editorconfig; clint +test_suite = test_tools + +[options.entry_points] +console_scripts = + check_editorconfig = editorconfig_tools.check_editorconfig:main diff --git a/setup.py b/setup.py deleted file mode 100644 index c1a4d37..0000000 --- a/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -from setuptools import setup -import editorconfig_tools - -required = ['editorconfig', 'clint'] - -setup( - name='EditorConfig Tools', - version=editorconfig_tools.__version__, - author='EditorConfig Team', - packages=['editorconfig_tools'], - install_requires=required, - license='LICENSE', - description='Tools for correcting files based on EditorConfig files', - long_description=open('README.rst').read(), - entry_points={ - 'console_scripts': [ - 'check_editorconfig = editorconfig_tools.check_editorconfig:main', - ] - }, - test_suite='test_tools', -)