From 5c54ae17820cb7fc0e1101c868a9332d0e72241c Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Mon, 22 May 2017 14:05:32 +0300 Subject: [PATCH] Move setup metadata to setup.cfg --- setup.cfg | 44 +++++++++++++++++++++++++++++++++++++------ setup.py | 56 ++----------------------------------------------------- tox.ini | 4 ++++ 3 files changed, 44 insertions(+), 60 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4a06916..7b3fdbc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,39 @@ -[wheel] -# create "py2.py3-none-any.whl" package -universal = 1 +[metadata] +name = django-polymorphic +version = 1.3 +description = Seamless polymorphic inheritance for Django models +author = Bert Constantin +author_email = bert.constantin@gmx.de +maintainer = Christopher Glass +maintainer_email = tribaal@gmail.com +url = https://github.com/django-polymorphic/django-polymorphic +download_url = https://github.com/django-polymorphic/django-polymorphic/tarball/master +keywords = django, polymorphic +classifiers = + Development Status :: 5 - Production/Stable + Environment :: Web Environment + Framework :: Django + Framework :: Django :: 1.10 + Framework :: Django :: 1.11 + Intended Audience :: Developers + License :: OSI Approved :: BSD License + Operating System :: OS Independent + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Topic :: Database -[flake8] -# ignore line size -max-line-length = 300 +[options] +packages = find: +include_package_data = True +install_requires = + Django >= 1.10 + +[options.packages.find] +exclude = + polymorphic.tests + +[bdist_wheel] +universal = 1 diff --git a/setup.py b/setup.py index 8c65b5e..dd4e63e 100755 --- a/setup.py +++ b/setup.py @@ -1,58 +1,6 @@ #!/usr/bin/env python -import codecs -import re -from os import path -from setuptools import find_packages, setup +from setuptools import setup -def read(*parts): - file_path = path.join(path.dirname(__file__), *parts) - return codecs.open(file_path, encoding='utf-8').read() - - -def find_version(*parts): - version_file = read(*parts) - version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M) - if version_match: - return str(version_match.group(1)) - raise RuntimeError("Unable to find version string.") - - -setup( - name='django-polymorphic', - version=find_version('polymorphic', '__init__.py'), - license='BSD', - - description='Seamless Polymorphic Inheritance for Django Models', - long_description=read('README.rst'), - url='https://github.com/django-polymorphic/django-polymorphic', - - author='Bert Constantin', - author_email='bert.constantin@gmx.de', - - maintainer='Christopher Glass', - maintainer_email='tribaal@gmail.com', - - packages=find_packages(), - include_package_data=True, - - test_suite='runtests', - - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Framework :: Django', - 'Framework :: Django :: 1.10', - 'Framework :: Django :: 1.11', - 'Topic :: Software Development :: Libraries :: Python Modules', - ] -) +setup() diff --git a/tox.ini b/tox.ini index 9d24cfa..b6fc999 100644 --- a/tox.ini +++ b/tox.ini @@ -25,3 +25,7 @@ deps = django-extra-views changedir = docs commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + +[flake8] +# ignore line size +max-line-length = 300