From 8baba15cb8beceac5052c387e0e8a4aced01075b Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sat, 11 Jan 2020 11:56:44 +0900 Subject: [PATCH] Move setup config to setup.cfg Signed-off-by: Hiroshi Miura --- CHANGELOG.rst | 3 ++- setup.cfg | 46 ++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 39 +-------------------------------------- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d655ef93..2af9c86c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -354,7 +354,8 @@ Fixed .. _requests: https://pypi.org/project/requests .. _argparse: https://pypi.org/project/argparse/ -.. _Unreleased: https://github.com/miurahr/aqtinstall/compare/v0.7a2...HEAD +.. _Unreleased: https://github.com/miurahr/aqtinstall/compare/v0.7b1...HEAD +.. _v0.7b1: https://github.com/miurahr/aqtinstall/compare/v0.7a2...v0.7b1 .. _v0.7a2: https://github.com/miurahr/aqtinstall/compare/v0.7a1...v0.7a2 .. _v0.7a1: https://github.com/miurahr/aqtinstall/compare/v0.6b1...v0.7a1 .. _v0.6b1: https://github.com/miurahr/aqtinstall/compare/v0.6a2...v0.6b1 diff --git a/setup.cfg b/setup.cfg index 4d3606b5..e5b98d93 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,3 +4,49 @@ exclude = .git,__pycache__,docs/conf.py,build,dist,tmp,venv [bdist_wheel] universal=1 + +[metadata] +name = aqtinstall +description = Another unofficial Qt installer +long_description = file: README.rst, CHANGELOG.rst +long_description_content_type = text/x-rst +license = MIT +author = Hiroshi Miura +author_email = miurahr@linux.com +url = http://github.com/miurahr/aqtinstall +classifiers = + Development Status :: 4 - Beta + Environment :: Console + Environment :: X11 Applications :: Qt + Intended Audience :: Developers + License :: OSI Approved :: MIT License + Operating System :: MacOS :: MacOS X + Operating System :: Microsoft :: Windows + Operating System :: POSIX + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: C++ + Topic :: Software Development + Topic :: Software Development :: Libraries + +[options] +install_requires = + requests + wheel + py7zr>=0.5b5 + packaging +setup_requires = + setuptools-scm[toml]>=3.3.3 + setuptools>=42.0 +packages = aqt +scripts = bin/aqt + +[options.package_data] +aqt = *.yml, *.json, *.ini + +[options.extras_require] +dev = + pytest + pytest-pep8 + pytest-cov + flake8 diff --git a/setup.py b/setup.py index c3443288..e0bdec07 100644 --- a/setup.py +++ b/setup.py @@ -1,42 +1,5 @@ #!/usr/bin/env python -import io -import os - from setuptools import setup - -def readme(): - with io.open(os.path.join(os.path.dirname(__file__), 'README.rst'), mode="r", encoding="UTF-8") as readmef: - return readmef.read() - - -setup(name='aqtinstall', - use_scm_version=True, - description='Another unofficial Qt installer', - url='http://github.com/miurahr/aqtinstall', - license='MIT', - long_description=readme(), - author='Hioshi Miura', - author_email='miurahr@linux.com', - packages=["aqt"], - package_data={'aqt': ['*.yml', "*.json", "*.ini"]}, - install_requires=['requests', 'six', 'py7zr', 'packaging'], - setup_requires=['setuptools-scm>=3.3.3', 'setuptools>=42.0'], - extras_require={'dev': ['pytest', 'pytest-pep8', 'pytest-cov', 'flake8']}, - scripts=["bin/aqt"], - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Environment :: Console', - 'Environment :: X11 Applications :: Qt', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Operating System :: MacOS :: MacOS X', - 'Operating System :: Microsoft :: Windows', - 'Operating System :: POSIX', - 'Programming Language :: Python', - 'Programming Language :: C++', - 'Topic :: Software Development', - 'Topic :: Software Development :: Libraries', - ], - ) +setup(use_scm_version=True, setup_requires=['setuptools-scm>=3.3.3', 'setuptools>=42.0'])