Skip to content

Some fix for setup tools #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

Some fix for setup tools #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

7 changes: 3 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -61,8 +60,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"
Expand Down
29 changes: 13 additions & 16 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +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"
],
# 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"
# ],
)