From 321f50b54202c2ce703e6d54e5da59d8ff1bcd2f Mon Sep 17 00:00:00 2001 From: Mathew Guest Date: Fri, 15 Nov 2024 20:10:05 -0700 Subject: [PATCH] doc: updating url to project page # Conflicts: # pyproject.toml # setup.py --- pyproject.toml | 78 ++++++++++++++++++++++------------------------ pyproject.toml.old | 48 ++++++++++++++++++++++++++++ setup.py | 66 --------------------------------------- 3 files changed, 85 insertions(+), 107 deletions(-) create mode 100644 pyproject.toml.old delete mode 100755 setup.py diff --git a/pyproject.toml b/pyproject.toml index 56d01b0..2667616 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,48 +1,44 @@ -[tool.poetry] +[build-system] +requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] +build-backend = "setuptools.build_meta" + +[project] name = "app_skellington" -version = "0.1.0" -description = "app_skellington CLI framework" -authors = [ - "Mathew Guest ", -] -license = "MIT" +dynamic = ["version"] +license = {file = "LICENSE.txt"} readme = "README.md" -homepage = "https://zavage-software.com" +description = "app_skellington CLI framework" +requires-python = ">=3.8" +dependencies = [ + "appdirs", + "configobj", + "colorlog" +] +authors = [ + {name = "Mathew Guest", email = "mat@zavage.net"} +] +keywords = ["cli", "logging", "application"] +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent" +] + + +[project.urls] +homepage = "https://zavage-software.com/portfolio/app_skellington" repository = "https://git-repos.zavage.net/Zavage-Software/app_skellington" documentation = "https://git-repos.zavage.net/Zavage-Software/app_skellington" -keywords = [""] -packages = [{ include = "app_skellington" }] -include = [ - "README.md", + +[project.optional-dependencies] +dev = [ + "black", + "pre-commit", + "isort", + "flake8" ] -# [tool.poetry.scripts] - - -[tool.poetry.dependencies] -python = "^3.8" - -[tool.poetry.group.dev.dependencies] -black = "*" -pre-commit = "*" -isort = "*" -flake8 = "*" -#pytest = "^7.2" -#Sphinx = "^5.3.0" -#sphinx-rtd-theme = "^1.3.0" - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.black] -line-length = 120 -target-version = ['py38'] - -[tool.isort] -multi_line_output = 3 -combine_as_imports = true -include_trailing_comma = true -force_grid_wrap = 3 -ensure_newline_before_comments = true +[tool.setuptools_scm] +version_scheme = "guess-next-dev" +local_scheme = "node-and-date" \ No newline at end of file diff --git a/pyproject.toml.old b/pyproject.toml.old new file mode 100644 index 0000000..56d01b0 --- /dev/null +++ b/pyproject.toml.old @@ -0,0 +1,48 @@ +[tool.poetry] +name = "app_skellington" +version = "0.1.0" +description = "app_skellington CLI framework" +authors = [ + "Mathew Guest ", +] +license = "MIT" +readme = "README.md" +homepage = "https://zavage-software.com" +repository = "https://git-repos.zavage.net/Zavage-Software/app_skellington" +documentation = "https://git-repos.zavage.net/Zavage-Software/app_skellington" +keywords = [""] + +packages = [{ include = "app_skellington" }] +include = [ + "README.md", +] + +# [tool.poetry.scripts] + + +[tool.poetry.dependencies] +python = "^3.8" + +[tool.poetry.group.dev.dependencies] +black = "*" +pre-commit = "*" +isort = "*" +flake8 = "*" +#pytest = "^7.2" +#Sphinx = "^5.3.0" +#sphinx-rtd-theme = "^1.3.0" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.black] +line-length = 120 +target-version = ['py38'] + +[tool.isort] +multi_line_output = 3 +combine_as_imports = true +include_trailing_comma = true +force_grid_wrap = 3 +ensure_newline_before_comments = true diff --git a/setup.py b/setup.py deleted file mode 100755 index 1b7b5dc..0000000 --- a/setup.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env python -# -# Usage: -# -# First, enable the python environment you want to install to, or if installing -# system-wide then ensure you're logged in with sufficient permissions -# (admin or root to install to system directories) -# -# installation: -# -# $ ./setup.py install -# -# de-installation: -# -# $ pip uninstall app_skellington - - -import os - -from setuptools import setup - -__project__ = "app_skellington" -__version__ = "0.1.1" -__description__ = "A high-powered command line menu framework." - -long_description = __description__ -readme_filepath = os.path.join(os.path.abspath(os.path.dirname(__file__)), "README.md") -with open(readme_filepath, encoding="utf-8") as fp: - long_description = fp.read() - -setup( - name=__project__, - version=__version__, - description="A high-powered command line menu framework.", - long_description=long_description, - author="Mathew Guest", - author_email="mat@zavage.net", - url="https://git-repos.zavage.net/Mirror/app_skellington", - license="MIT", - python_requires=">=3", - classifiers=[ - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Framework :: Pytest", - "Intended Audience :: Developers", - "Intended Audience :: System Administrators", - "License :: OSI Approved :: MIT License", - "Natural Language :: English", - "Operating System :: MacOS", - "Operating System :: Microsoft", - "Operating System :: Microsoft :: Windows", - "Operating System :: OS Independent", - "Operating System :: POSIX", - "Operating System :: POSIX :: Linux", - "Topic :: Software Development :: Libraries", - "Topic :: Utilities", - ], - # Third-party dependencies; will be automatically installed - install_requires=( - "appdirs", - "configobj", - "colorlog", - ), - # Local packages to be installed (our packages) - packages=("app_skellington",), -)