Merge pull request #346 from ligangty/main

cherry-pick from 1.3.x

Author: ligangty

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
+

pyproject.toml

@@ -10,12 +10,11 @@ authors = [
 ]
 readme = "README.md"
 keywords = ["charon", "mrrc", "maven", "npm", "build", "java"]
-license-files = ["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"

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"
+    # ],
 )