rip out toml

This commit is contained in:
skullY
2019-07-15 11:08:14 -07:00
parent f23614d245
commit fb372d11ec
4 changed files with 32 additions and 48 deletions
-1
View File
@@ -1,5 +1,4 @@
include *.md
include *.toml
include *.txt
include LICENSE
include qmk
-40
View File
@@ -1,40 +0,0 @@
#[build-system]
# Use setuptools for now until this PR is merged and available in homebrew:
#
# https://github.com/pypa/pip/pull/6606
#
# We still pull our build metadata from this file so we can easily go back to flit.
#
#requires = ["flit"]
#build-backend = "flit.buildapi"
[tool.flit.metadata]
dist-name = "qmk"
module = "qmk_cli"
author = "skullydazed"
author-email = "skullydazed@gmail.com"
description-file = "README.md"
home-page = "https://github.com/qmk/qmk_cli"
classifiers = [
'Development Status :: 3 - Alpha',
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Scientific/Engineering',
'Topic :: Software Development',
'Topic :: Utilities',
]
requires-python = ">=3.5"
requires = [
#"milc", #FIXME(skullydazed): Included in the repo for now.
"argcomplete",
"colorama",
#"halo"
]
[tool.flit.scripts]
qmk = "qmk_cli.script_qmk:main"
+10
View File
@@ -16,7 +16,17 @@ universal = 1
ignore = E501,E226
[metadata]
author = skullydazed
author-email = skullydazed@gmail.com
description-file = README.md
dist-name = qmk
license_file = LICENSE
module = qmk_cli
home-page = https://github.com/qmk/qmk_cli
requires-python = >=3.5
[entry_points]
qmk = qmk_cli.script_qmk:main
[yapf]
align_closing_bracket_with_visual_indent = True
+22 -7
View File
@@ -1,19 +1,16 @@
from configparser import ConfigParser
from setuptools import setup, find_packages
import toml
setup_cfg = ConfigParser()
setup_cfg.read('setup.cfg')
pyproject = toml.load('pyproject.toml')
metadata = pyproject['tool']['flit']['metadata']
metadata = setup_cfg['metadata']
if __name__ == "__main__":
setup(
name=metadata['dist-name'],
description=open(metadata['description-file']).read(),
entry_points={
'console_scripts': ['%s = %s' % l for l in pyproject['tool']['flit']['scripts'].items()]
'console_scripts': ['%s = %s' % l for l in setup_cfg['entry_points'].items()]
},
license='MIT License',
url=metadata['home-page'],
@@ -25,6 +22,24 @@ if __name__ == "__main__":
long_description=open('README.md').read(),
long_description_content_type="text/markdown",
packages=find_packages(),
classifiers=metadata['classifiers'],
install_requires=metadata['requires'],
classifiers=[
'Development Status :: 3 - Alpha',
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Scientific/Engineering',
'Topic :: Software Development',
'Topic :: Utilities',
],
requires_python=metadata['requires-python'],
install_requires=[
#"milc", #FIXME(skullydazed): Included in the repo for now.
"argcomplete",
"colorama",
#"halo"
],
)