setup.py/pyproject.toml: Update, correct and tweaks

Author: jenisys

pyproject.toml

@@ -1,6 +1,7 @@
 # =============================================================================
 # PACKAGING: parse_type
 # =============================================================================
+# SPDX-License-Identifier: MIT
 # SEE ALSO:
 #   * https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
 #   * https://setuptools-scm.readthedocs.io/en/latest/usage/
@@ -22,13 +23,13 @@ dynamic = ["version"]
 readme = "README.rst"
 requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 keywords = ["parse", "parsing"]
-license = {text = "MIT"}
+license = "MIT"
+license-files = ["LICENSE"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3.2",
@@ -57,8 +58,8 @@ dependencies = [
 [project.urls]
 Homepage = "https://github.com/jenisys/parse_type"
 Download = "https://pypi.org/project/parse_type/"
-"Source Code" = "https://github.com/jenisys/parse_type"
-"Issue Tracker" = "https://github.com/jenisys/parse_type/issues/"
+Repository = "https://github.com/jenisys/parse_type"
+Issues = "https://github.com/jenisys/parse_type/issues/"
 
 
 [project.optional-dependencies]
@@ -94,7 +95,7 @@ testing = [
     "pytest-html >= 1.19.0",
 ]
 
-
+# -- KEEP-UNTIL: Python 2.7 support is removed.
 [tool.distutils.bdist_wheel]
 universal = true
 

setup.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier: MIT
 """
 Setup script for "parse_type" package.
 
@@ -31,8 +32,8 @@
 # PREPARE SETUP:
 # -----------------------------------------------------------------------------
 HERE = os.path.dirname(__file__)
-README = os.path.join(HERE, "README.rst")
-long_description = ''.join(open(README).readlines()[4:])
+# DISABLED: README = os.path.join(HERE, "README.rst")
+# DISABLED: long_description = "".join(open(README).readlines()[4:])
 
 
 # -----------------------------------------------------------------------------
@@ -71,12 +72,19 @@ def get_this_package_version(version):
     url = "https://github.com/jenisys/parse_type",
     download_url= "http://pypi.python.org/pypi/parse_type",
     description = "Simplifies to build parse types based on the parse module",
-    long_description = long_description,
+    long_description = "file: README.rst",
+    long_description_content_type = "text/x-rst",
     keywords= "parse, parsing",
     license = "MIT",
+    license_files = ["LICENSE"],
     packages = find_packages_by_root_package("parse_type"),
     include_package_data = True,
-
+    project_urls = {
+        "Homepage": "https://github.com/jenisys/parse_type",
+        "Download": "https://pypi.org/project/parse_type/",
+        "Repository": "https://github.com/jenisys/parse_type",
+        "Issues": "https://github.com/jenisys/parse_type/issues/",
+    },
     # -- REQUIREMENTS:
     python_requires=">=2.7, !=3.0.*, !=3.1.*",
     setup_requires=[
@@ -130,7 +138,6 @@ def get_this_package_version(version):
         "Environment :: Console",
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.2",