From dcc446d71f7cf9afd622999ad4691cd29267cf4e Mon Sep 17 00:00:00 2001 From: Dor Eliyahu Date: Sun, 10 Aug 2025 11:01:15 +0300 Subject: [PATCH 1/2] Update build process using new standard --- MANIFEST.in | 3 ++- pyproject.toml | 51 +++++++++++++++++++++++++++++++++++++++++++++++- setup.py | 53 +++++--------------------------------------------- 3 files changed, 57 insertions(+), 50 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 5ded86d..ffaccdd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ -include examples/* \ No newline at end of file +include examples/* +recursive-include pytimbr/jars *.jar \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 8fe2f47..2961194 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,52 @@ [build-system] -requires = ["setuptools>=42", "wheel"] +requires = ["setuptools>=61", "wheel"] build-backend = "setuptools.build_meta" + +[project] +name = "pytimbr" +version = "2.0.0" +description = "Timbr Python connector" +readme = "README.md" +license = "MIT" +authors = [ + {name = "timbr", email = "contact@timbr.ai"} +] +keywords = [ + "timbr", + "timbr-python", + "timbr-connector", + "python-connector", + "PyTimbr", + "pytimbr", + "py-timbr", + "Py-Timbr" +] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Topic :: Software Development :: Build Tools", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12" +] +requires-python = ">=3.9" +dependencies = [ + "JPype1==1.5.1", + "pandas==1.3.5", + "numpy==1.26.4" +] + +[project.urls] +Homepage = "https://github.com/WPSemantix/timbr_python_connector" +Download = "https://github.com/WPSemantix/timbr_python_connector/releases" +"Bug Tracker" = "https://github.com/WPSemantix/timbr_python_connector/issues" +Repository = "https://github.com/WPSemantix/timbr_python_connector" +Documentation = "https://github.com/WPSemantix/timbr_python_connector#readme" + +[tool.setuptools.packages.find] +include = ["pytimbr*"] + +[tool.setuptools.package-data] +pytimbr = ["jars/*"] diff --git a/setup.py b/setup.py index 5a05269..4a9f8e0 100644 --- a/setup.py +++ b/setup.py @@ -1,49 +1,6 @@ -import setuptools +# This file is kept for backward compatibility +# All configuration has been moved to pyproject.toml +from setuptools import setup -with open("README.md", "r", encoding="utf-8") as fh: - long_description = fh.read() - -setuptools.setup( - name='pytimbr', - version='1.0.7', - author='timbr', - author_email='contact@timbr.ai', - description='Timbr Python connector', - long_description=long_description, - long_description_content_type="text/markdown", - url='https://github.com/WPSemantix/timbr_python_connector', - download_url = 'https://github.com/WPSemantix/timbr_python_connector/archive/refs/tags/v1.0.7.tar.gz', - project_urls={ - "Bug Tracker": "https://github.com/WPSemantix/timbr_python_connector/issues" - }, - license='MIT', - packages=['pytimbr'], - install_requires=[ - 'JPype1==1.5.1', - 'pandas==1.3.5', - 'numpy==1.26.4', - ], - package_data={ - 'pytimbr': ['jars/*'], - }, - keywords = [ - 'timbr', - 'timbr-python', - 'timbr-connector', - 'python-connector', - 'PyTimbr', - 'pytimbr', - 'py-timbr', - 'Py-Timbr', - ], - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Topic :: Software Development :: Build Tools', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - ], -) +if __name__ == "__main__": + setup() From 6493eb4338b44a09ba9f70a88c09b202044cac3d Mon Sep 17 00:00:00 2001 From: Dor Eliyahu Date: Sun, 10 Aug 2025 11:06:04 +0300 Subject: [PATCH 2/2] Update licenses declaration --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 2961194..db991c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ version = "2.0.0" description = "Timbr Python connector" readme = "README.md" license = "MIT" +license-files = ["LICENSE", "NOTICE"] authors = [ {name = "timbr", email = "contact@timbr.ai"} ]