From 195291299de7d68104e06cc64dad45ff052e7432 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 19 Sep 2025 10:09:22 +0800 Subject: [PATCH 1/2] Fix a issue of pyproject.toml file --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9061673b..68fc5461 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ authors = [ ] readme = "README.md" keywords = ["charon", "mrrc", "maven", "npm", "build", "java"] -license-files = ["LICENSE"] +license = {file="LICENSE"} requires-python = ">=3.9" classifiers = [ "Development Status :: 1 - Planning", From 8ad7932532ce95497cfb808ab9d484351b0fbb99 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 19 Sep 2025 11:28:06 +0800 Subject: [PATCH 2/2] Some fix for setup tools * Add MANIFEST.in for sdist generation * Fix some warning for sdist build --- MANIFEST.in | 8 ++++++++ pyproject.toml | 7 +++---- setup.py | 31 +++++++++++++------------------ 3 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..6a2a3c77 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,8 @@ + include LICENSE + include README.md + include pyproject.toml + include setup.py + recursive-include charon *.py *.json + recursive-include tests *.py *.txt *.tgz *.zip *.json *.sha1 + exclude .github .gitignore + diff --git a/pyproject.toml b/pyproject.toml index 68fc5461..310bb1f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,12 +10,11 @@ authors = [ ] readme = "README.md" keywords = ["charon", "mrrc", "maven", "npm", "build", "java"] -license = {file="LICENSE"} +license = "Apache-2.0" requires-python = ">=3.9" classifiers = [ "Development Status :: 1 - Planning", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", "Topic :: Software Development :: Build Tools", "Topic :: Utilities", "Programming Language :: Python :: 3 :: Only", @@ -63,8 +62,8 @@ test = [ [project.scripts] charon = "charon.cmd:cli" -[tool.setuptools] -packages = ["charon"] +[tool.setuptools.packages.find] +include = ["charon*"] [tool.setuptools_scm] fallback_version = "1.3.4+dev.fallback" diff --git a/setup.py b/setup.py index 3935d97b..2de9c2e6 100755 --- a/setup.py +++ b/setup.py @@ -32,33 +32,28 @@ classifiers=[ "Development Status :: 1 - Planning", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3", "Topic :: Software Development :: Build Tools", "Topic :: Utilities", ], keywords="charon mrrc maven npm build java", author="RedHat EXD SPMM", - license="APLv2", packages=find_packages(exclude=["ez_setup", "examples", "tests"]), package_data={'charon': ['schemas/*.json']}, - test_suite="tests", entry_points={ "console_scripts": ["charon = charon.cmd:cli"], }, - install_requires=[ - "Jinja2>=3.1.3", - "boto3>=1.18.35", - "botocore>=1.21.35", - "click>=8.1.3", - "requests>=2.25.0", - "PyYAML>=5.4.1", - "defusedxml>=0.7.1", - "subresource-integrity>=0.2", - "jsonschema>=4.9.1", - "urllib3>=1.25.10", - "semantic-version>=2.10.0", - "oras<=0.2.31", - "python-qpid-proton>=0.39.0" - ], + # install_requires=[ + # "Jinja2>=3.1.3", + # "boto3>=1.18.35", + # "botocore>=1.21.35", + # "click>=8.1.3", + # "requests>=2.25.0", + # "PyYAML>=5.4.1", + # "defusedxml>=0.7.1", + # "subresource-integrity>=0.2", + # "jsonschema>=4.9.1", + # "urllib3>=1.25.10", + # "semantic-version>=2.10.0" + # ], )