From f7c0c657679467cb5d28c0ea3271047d22b26dfc Mon Sep 17 00:00:00 2001 From: "matthias@arch" Date: Mon, 15 May 2023 23:57:59 +0200 Subject: [PATCH] Changed build process to setuptools with toml --- MANIFEST.in | 2 ++ pyproject.toml | 35 +++++++++++++++++++++++++++++++++++ setup.py | 34 ---------------------------------- 3 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 MANIFEST.in create mode 100644 pyproject.toml delete mode 100755 setup.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..4b5a330 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include regina/package-data/* +include regina/sql/*.sql diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..72f0255 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,35 @@ +[build-system] +requires = ["setuptools"] + +[project] +name = "regina" +version = "2.0.0" +description = "Get website analytics from nginx logs and visualize them" +requires-python = ">=3.10" +readme = "README.md" +license = {file = "LICENSE"} +authors = [ + { name = "Matthias Quintern", email = "matthias@quintern.xyz" } +] +classifiers = [ + "Operating System :: POSIX :: Linux", + "Environment :: Console", + "Programming Language :: Python :: 3", + "Topic :: Internet :: Log Analysis", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", +] +dependencies = [ + "matplotlib>=3.6" +] + +[project.urls] +repository = "https://git.quintern.xyz/MatthiasQuintern/regina" +documentation = "https://quintern.xyz/en/software/regina.html" + + +[tool.setuptools.packages.find] +where = ["regina"] + +[project.scripts] + regina = "regina.main:main" + regina-generate-config = "regina.utility.globals:write_config" diff --git a/setup.py b/setup.py deleted file mode 100755 index 14acb72..0000000 --- a/setup.py +++ /dev/null @@ -1,34 +0,0 @@ -from matplotlib.pyplot import matplotlib -from setuptools import setup, find_packages - -setup( - name="regina", - version="1.0", - description="Get analytics from nginx logs and visualize them", - - author="Matthias Quintern", - author_email="matthias@quintern.xyz", - - url="https://git.quintern.xyz/MatthiasQuintern/regina.git", - - license="GPLv3", - - packages=["regina"], - install_requires=["matplotlib"], - python_requires='>=3.10', - - classifiers=[ - "Operating System :: POSIX :: Linux", - "Environment :: Console", - "Programming Language :: Python :: 3", - "Topic :: Server", - "Topic :: Utilities", - ], - - # data_files=[("ip2nation", ["ip2nation.sql", "ip2nation.db"])], - - # scripts=["bin/nicole"], - entry_points={ - "console_scripts": [ "regina=regina.main:main" ], - }, -)