Merge pull request #60 from mkoeppe/setup_py_cleanup

setup.py cleanup

pyproject.toml

@@ -11,9 +11,9 @@ build-backend = "setuptools.build_meta"
 name = "Mathics_Scanner"
 description = "Character Tables and Tokenizer for Mathics and the Wolfram Language."
 dependencies = [
-    "PyYAML",
-    "chardet",
-    "click",
+    "PyYAML",     # Used in mathics-generate-json-table
+    "chardet",    # Used in mathics_scanner.feed
+    "click",      # Using in CLI: mathics-generate-json-table
 ]
 requires-python = ">=3.8"
 readme = "README.rst"
@@ -48,11 +48,26 @@ dev = [
     "pytest",
 ]
 full = [
-    "ujson",
+    "ujson",    # Optional Used in mathics_scanner.characters
 ]
 
 [project.scripts]
 mathics-generate-json-table = "mathics_scanner.generate.build_tables:main"
 
+[tool.setuptools]
+packages = [
+    "mathics_scanner",
+    "mathics_scanner.generate",
+]
+
+[tool.setuptools.package-data]
+"mathics_scanner" = [
+    "data/named-characters.yml",
+    "data/*.csv",
+    "data/characters.json",  # List this explicitly since it is needed
+    "data/*.json",
+    "data/ExampleData/*",
+]
+
 [tool.setuptools.dynamic]
 version = {attr = "mathics_scanner.version.__version__"}

setup.py

@@ -46,24 +46,6 @@ def get_srcdir():
     return osp.realpath(filename)
 
 
-def read(*rnames):
-    return open(osp.join(get_srcdir(), *rnames)).read()
-
-
-is_PyPy = platform.python_implementation() == "PyPy" or hasattr(
-    sys, "pypy_version_info"
-)
-
-
-# General Requirements
-INSTALL_REQUIRES = [
-    "chardet",  # Used in mathics_scanner.feed
-    "PyYAML",  # Used in mathics-generate-json-table
-    # "ujson",  # Optional Used in mathics_scanner.characters
-    "click",  # Using in CLI: mathics-generate-json-table
-]
-
-
 EXTRAS_REQUIRE = {}
 for kind in ("dev", "full"):
     extras_require = []
@@ -75,11 +57,6 @@ def read(*rnames):
     EXTRAS_REQUIRE[kind] = extras_require
 
 
-def subdirs(root: str, file="*.*", depth=10):
-    for k in range(depth):
-        yield root + "*/" * k + file
-
-
 class table_building_egg_info(egg_info):
     # This runs as part of building an sdist
 
@@ -99,18 +76,7 @@ def finalize_options(self):
 
 setup(
     cmdclass={"egg_info": table_building_egg_info},
-    packages=["mathics_scanner", "mathics_scanner.generate"],
-    install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,
-    package_data={
-        "mathics_scanner": [
-            "data/named-characters.yml",
-            "data/*.csv",
-            "data/characters.json",  # List this explicitly since it is needed
-            "data/*.json",
-            "data/ExampleData/*",
-        ]
-    },
     # don't pack Mathics in egg because of media files, etc.
     zip_safe=False,
 )