Moved some metadata into setup.cfg

Author: KOLANICH

.gitignore

@@ -1,3 +1,5 @@
+arpeggio/version.py
+
 *.py[cod]
 
 # C extensions
@@ -55,4 +57,4 @@ docs/_build
 site
 .cache
 venv
-.ropeproject
+.ropeproject

arpeggio/__init__.py

@@ -18,8 +18,7 @@
 import bisect
 from arpeggio.utils import isstr
 import types
-
-__version__ = "1.9.2"
+from .version import __version__
 
 if sys.version < '3':
     text = unicode

pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = ["setuptools>=41", "wheel", "setuptools_scm[toml]>=3.4.3"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+write_to_template = "__version__ = \"{version}\"\n"
+write_to = "arpeggio/version.py"

setup.cfg

@@ -1,13 +1,47 @@
 [metadata]
-description-file = README.rst
+name = Arpeggio
+author = Igor R. Dejanovic
+author_email = igor.dejanovic@gmail.com
+maintainer = Igor R. Dejanovic
+maintainer_email = igor.dejanovic@gmail.com
+license = MIT
 license_file = LICENSE
+description = Packrat parser interpreter
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+keywords = parser, packrat, peg
+url = https://github.com/textX/Arpeggio
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    Intended Audience :: Science/Research
+    Topic :: Software Development :: Interpreters
+    Topic :: Software Development :: Compilers
+    Topic :: Software Development :: Libraries :: Python Modules
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+
+[options]
+packages = find:
+test_suite = "arpeggio.tests"
+setup_requires = setuptools>=41; wheel; setuptools_scm[toml]>=3.4.3
+tests_require = pytest-runner; pytest
 
 [bdist_wheel]
-universal=1
+universal = 1
 
 [aliases]
-test=pytest
+test = pytest
 
 [tool:pytest]
 addopts = --verbose
-python_files = arpeggio/tests/*.py 
+python_files = arpeggio/tests/*.py

setup.py

@@ -12,84 +12,26 @@
 # Parsers are defined using python language construction or PEG language.
 ###############################################################################
 
-import codecs
 import os
 import sys
 from setuptools import setup, find_packages
 
-VERSIONFILE = "arpeggio/__init__.py"
-VERSION = None
-for line in codecs.open(VERSIONFILE, "r", encoding='utf-8').readlines():
-    if line.startswith('__version__'):
-        VERSION = line.split('"')[1]
-
-if not VERSION:
-    raise RuntimeError('No version defined in arpeggio/__init__.py')
-
-README = codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'),
-                     'r', encoding='utf-8').read()
-
-NAME = 'Arpeggio'
-DESC = 'Packrat parser interpreter'
-AUTHOR = 'Igor R. Dejanovic'
-AUTHOR_EMAIL = 'igor.dejanovic@gmail.com'
-LICENSE = 'MIT'
-URL = 'https://github.com/textX/Arpeggio'
-DOWNLOAD_URL = 'https://github.com/textX/Arpeggio/archive/v{}.tar.gz'\
-    .format(VERSION)
-
-if sys.argv[-1].startswith('publish'):
-    if os.system("pip list | grep wheel"):
-        print("wheel not installed.\nUse `pip install wheel`.\nExiting.")
-        sys.exit()
-    if os.system("pip list | grep twine"):
-        print("twine not installed.\nUse `pip install twine`.\nExiting.")
+if __name__ == "__main__":
+    if sys.argv[-1].startswith('publish'):
+        if os.system("pip3 list | grep wheel"):
+            print("wheel not installed.\nUse `pip install wheel`.\nExiting.")
+            sys.exit()
+        if os.system("pip3 list | grep twine"):
+            print("twine not installed.\nUse `pip install twine`.\nExiting.")
+            sys.exit()
+        os.system("python3 -m pep517.build -bs -o ./dist")
+        if sys.argv[-1] == 'publishtest':
+            os.system("twine upload -r test dist/*")
+        else:
+            os.system("twine upload dist/*")
+            print("You probably want to also tag the version now:")
+            print("  git tag -a {0} -m 'version {0}'".format(VERSION))
+            print("  git push --tags")
         sys.exit()
-    os.system("python setup.py sdist bdist_wheel")
-    if sys.argv[-1] == 'publishtest':
-        os.system("twine upload -r test dist/*")
-    else:
-        os.system("twine upload dist/*")
-        print("You probably want to also tag the version now:")
-        print("  git tag -a {0} -m 'version {0}'".format(VERSION))
-        print("  git push --tags")
-    sys.exit()
-
-setup(
-    name=NAME,
-    version=VERSION,
-    description=DESC,
-    long_description=README,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    maintainer=AUTHOR,
-    maintainer_email=AUTHOR_EMAIL,
-    license=LICENSE,
-    url=URL,
-    download_url=DOWNLOAD_URL,
-    packages=find_packages(),
-    setup_requires=['pytest-runner'],
-    tests_require=['pytest'],
-    test_suite="arpeggio.tests",
-    keywords="parser packrat peg",
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Information Technology',
-        'Intended Audience :: Science/Research',
-        'Topic :: Software Development :: Interpreters',
-        'Topic :: Software Development :: Compilers',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8'
-        ]
 
-)
+    setup()