From fc69dfda1cd8288ca9b821139a05b2d5b501babd Mon Sep 17 00:00:00 2001 From: Branch Vincent Date: Sun, 29 Jun 2025 08:19:16 -0700 Subject: [PATCH 1/2] chore: migrate to pyproject.toml --- MANIFEST.in | 2 -- pyproject.toml | 44 ++++++++++++++++++++++++++++++++++++++++++ setup.cfg | 3 --- setup.py | 52 -------------------------------------------------- tox.ini | 3 +-- 5 files changed, 45 insertions(+), 59 deletions(-) delete mode 100644 MANIFEST.in create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index cb162633..00000000 --- a/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -include gdtoolkit/parser/gdscript.lark -include gdtoolkit/parser/comments.lark diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..d615de05 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,44 @@ +[project] +name = "gdtoolkit" +version = "4.3.4" +description = "Independent set of tools for working with GDScript - parser, linter and formatter" +keywords = ["GODOT", "GDSCRIPT", "PARSER", "LINTER", "FORMATTER"] +readme = "README.md" +authors = [{ name = "Pawel Lampe", email = "pawel.lampe@gmail.com" }] +license = { text = "MIT" } +requires-python = ">=3.7" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Software Development :: Libraries :: Python Modules", +] +dependencies = [ + "lark[regex]==1.2.2", + "docopt-ng==0.9.0", + "pyyaml>=5.1", + "radon==6.0.1", + "setuptools", +] + +[project.scripts] +gdparse = "gdtoolkit.parser.__main__:main" +gdlint = "gdtoolkit.linter.__main__:main" +gdformat = "gdtoolkit.formatter.__main__:main" +gd2py = "gdtoolkit.gd2py.__main__:main" +gdradon = "gdtoolkit.gdradon.__main__:main" + +[project.urls] +Homepage = "https://github.com/Scony/godot-gdscript-toolkit" + +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ed1700c6..00000000 --- a/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[metadata] -long_description = file: README.md -long_description_content_type = text/markdown diff --git a/setup.py b/setup.py deleted file mode 100644 index 2937385e..00000000 --- a/setup.py +++ /dev/null @@ -1,52 +0,0 @@ -from setuptools import setup - - -setup( - name="gdtoolkit", - version="4.3.4", - description="Independent set of tools for working with GDScript - parser, linter and formatter", - keywords=["GODOT", "GDSCRIPT", "PARSER", "LINTER", "FORMATTER"], - url="https://github.com/Scony/godot-gdscript-toolkit", - author="Pawel Lampe", - author_email="pawel.lampe@gmail.com", - license="MIT", - packages=[ - "gdtoolkit", - "gdtoolkit.linter", - "gdtoolkit.formatter", - "gdtoolkit.parser", - "gdtoolkit.common", - "gdtoolkit.gd2py", - "gdtoolkit.gdradon", - ], - package_data={"gdtoolkit.parser": ["gdscript.lark", "comments.lark"]}, - entry_points={ - "console_scripts": [ - "gdparse = gdtoolkit.parser.__main__:main", - "gdlint = gdtoolkit.linter.__main__:main", - "gdformat = gdtoolkit.formatter.__main__:main", - "gd2py = gdtoolkit.gd2py.__main__:main", - "gdradon = gdtoolkit.gdradon.__main__:main", - ] - }, - include_package_data=True, - install_requires=[ - "lark[regex]==1.2.2", - "docopt-ng==0.9.0", - "pyyaml>=5.1", - "radon==6.0.1", - "setuptools", - ], - python_requires=">=3.7", - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Topic :: Software Development :: Libraries :: Python Modules", - ], -) diff --git a/tox.ini b/tox.ini index ce6f1501..6aac974d 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ deps = flake8-comprehensions flake8-bugbear commands = - pylint -rn -j0 setup.py gdtoolkit/ tests/ --rcfile=pylintrc + pylint -rn -j0 gdtoolkit/ tests/ --rcfile=pylintrc flake8 gdtoolkit/ --max-complexity 20 --config=tox.ini [testenv:format] @@ -27,7 +27,6 @@ deps = black == 22.3.0 commands = black --check \ - setup.py \ gdtoolkit/ \ tests/common.py \ tests/conftest.py \ From 174aad2c3b22f0f7736ff372b51413f240bedd3c Mon Sep 17 00:00:00 2001 From: Branch Vincent Date: Sun, 29 Jun 2025 08:20:10 -0700 Subject: [PATCH 2/2] build: drop setuptools --- pyproject.toml | 1 - tox.ini | 1 - 2 files changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d615de05..992bc7be 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,6 @@ dependencies = [ "docopt-ng==0.9.0", "pyyaml>=5.1", "radon==6.0.1", - "setuptools", ] [project.scripts] diff --git a/tox.ini b/tox.ini index 6aac974d..81ba67d6 100644 --- a/tox.ini +++ b/tox.ini @@ -40,7 +40,6 @@ setenv = MYPYPATH = stubs deps = mypy == 0.971 - types-pkg_resources == 0.1.3 types-PyYAML == 6.0.12.12 types-docopt commands =