From 3254bc66e05f532dd0e34f422b8983a2daa58904 Mon Sep 17 00:00:00 2001 From: Istvan Ruzman Date: Mon, 3 Aug 2020 15:10:40 +0200 Subject: [PATCH] Cleanup package installation --- MANIFEST.in | 3 --- pyproject.toml | 43 ++++++++++++++++++++++++------------------- setup.cfg | 42 ------------------------------------------ 3 files changed, 24 insertions(+), 64 deletions(-) delete mode 100644 MANIFEST.in delete mode 100644 setup.cfg diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index ce75542..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include LICENSE.txt -recursive-include example * -prune example/.svn diff --git a/pyproject.toml b/pyproject.toml index 249098c..72c9eb7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,42 +1,47 @@ -[project] +[build-system] +requires = ["poetry_core"] +build-backend = "poetry.core.masonry.api" + + +[tool.poetry] name = "pyrad3" version = "0.1.0" -requires-python = ">=3.6" -description = "RADIUS tools" - -readme = "README.md" - -authors = [ - {name = "Istvan Ruzman", email = "istvan@ruzman.eu"} -] - license = "MIT OR Apache-2.0" - -keywords = ["authentication", "accounting", "radius"] - +requires-python = ">=3.7" +readme = "README.md" +description = "RADIUS tools" +keywords = ["AAA", "authentication", "authorization", "accounting", "RADIUS"] +authors = ["Istvan Ruzman "] classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: System :: Systems Administration :: Authentication/Directory" ] +packages = [ + { include = "pyrad3"}, +] +include = [ + "CHANGELOG.md", + "LICENSE-APACHE", + "LICENSE-MIT", + "README.md", +] -[project.urls] + +[tool.poetry.urls] repository = "https://github.com/pyradius/pyrad3" -[project.dev-dependencies] + +[tool.poetry.dev-dependencies] pytest = "^5.4" pytest-cov = "^2.5" -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" [tool.black] line-length = 100 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 35f2bf9..0000000 --- a/setup.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[metadata] -name = "pyrad3" -version = "0.1.0" -author = Istvan Ruzman -author-email = "istvan@ruzman.eu" -description = "RADIUS tools" -platform = any -long-description = file: README.md -long_description_content_type = text/markdown -license = MIT OR APACHE 2.0 -keywords = "authentication accounting radius" -classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: System :: Systems Administration :: Authentication/Directory" - ] - -[options] -zip_safe = true -include_package_data = true -python_requires = >= 3.6 -packages = pyrad3 -setup_requires = setuptools -tests_require = - pytest - pytest-cov - -[bdist_wheel] -universal = true - -[sdist] -formats = zip, gztar - -[flake8] -max-line-length = 100 -doctests = True