From 0a1ae3daef9f46a26075b95039f330b4b297c4a2 Mon Sep 17 00:00:00 2001 From: Jonah Lawrence Date: Wed, 14 Dec 2022 15:47:47 -0700 Subject: [PATCH 1/2] chore: Resolve pyproject and setup.py conflicts (#80) --- pyproject.toml | 36 +++++++++++++++++++++++++++++++++++- setup.py | 32 -------------------------------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ae84208..49c617f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,41 @@ build-backend = "setuptools.build_meta" [project] name = "table2ascii" authors = [{name = "Jonah Lawrence", email = "jonah@freshidea.com"}] -dynamic = ["version", "description"] +dynamic = ["version", "description", "readme", "dependencies", "optional-dependencies"] +requires-python = ">=3.7" +license = {file = "LICENSE"} +keywords = ["table", "ascii", "unicode", "formatter"] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Environment :: Web Environment", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: End Users/Desktop", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "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", + "Topic :: Multimedia :: Graphics :: Presentation", + "Topic :: Utilities", + "Topic :: Text Processing :: General", + "Topic :: Printing", + "Topic :: Software Development :: Libraries :: Python Modules", + "Typing :: Typed", +] + + +[project.urls] +documentation = "https://table2ascii.rtfd.io" +issue-tracker = "https://github.com/DenverCoder1/table2ascii/issues" +repository = "https://github.com/DenverCoder1/table2ascii" [tool.black] diff --git a/setup.py b/setup.py index b3e69bc..0b3faa6 100644 --- a/setup.py +++ b/setup.py @@ -60,39 +60,7 @@ def requirements(): long_description=long_description(), long_description_content_type="text/markdown", url="https://github.com/DenverCoder1/table2ascii", - project_urls={ - "Documentation": "https://table2ascii.rtfd.io", - "Issue tracker": "https://github.com/DenverCoder1/table2ascii/issues", - }, - license="MIT", packages=["table2ascii"], - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Environment :: Console", - "Environment :: Web Environment", - "Intended Audience :: Developers", - "Intended Audience :: Education", - "Intended Audience :: End Users/Desktop", - "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3 :: Only", - "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", - "Topic :: Multimedia :: Graphics :: Presentation", - "Topic :: Utilities", - "Topic :: Text Processing :: General", - "Topic :: Printing", - "Topic :: Software Development :: Libraries :: Python Modules", - "Typing :: Typed", - ], - keywords="table ascii unicode formatter", - python_requires=">=3.6", install_requires=requirements(), extras_require=extras_require, setup_requires=[], From 6e3fdb6aefb0aaa3759b588c8ecd67151901c540 Mon Sep 17 00:00:00 2001 From: Jonah Lawrence Date: Wed, 14 Dec 2022 15:54:25 -0700 Subject: [PATCH 2/2] chore: Bump version to 1.0.1 --- table2ascii/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/table2ascii/__init__.py b/table2ascii/__init__.py index aade353..c70aad5 100644 --- a/table2ascii/__init__.py +++ b/table2ascii/__init__.py @@ -8,7 +8,7 @@ from .table_style import TableStyle from .table_to_ascii import table2ascii -__version__ = "1.0.0" +__version__ = "1.0.1" __all__ = [ "Alignment",