From 38bac2c54c0674e6bf322e8e8759f4508586ccf3 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 29 Nov 2018 18:54:31 +0000 Subject: [PATCH 1/3] Populated setup.cfg with the metadata --- setup.cfg | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/setup.cfg b/setup.cfg index 3c6e79c..3819ee5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,39 @@ +[metadata] +name = ezodf +author = Manfred Moitzi +author_email = mozman@gmx.at +maintainer = Anton Shvein +maintainer_email = t0hashvein@gmail.com +license = MIT License +description = A Python package to create/manipulate OpenDocumentFormat files. +keywords = + ODF + OpenDocumentFormat + OpenOffice + LibreOffice +url = https://github.com/T0ha/ezodf +download_url = https://github.com/T0ha/ezodf/releases +classifiers = + Development Status :: 3 - Alpha + License :: OSI Approved :: MIT License + Operating System :: OS Independent + Programming Language :: Python :: 2.6 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.2 + Programming Language :: Python :: 3.3 + Programming Language :: Python :: 3.4 + Intended Audience :: Developers + Topic :: Software Development :: Libraries :: Python Modules + Topic :: Office/Business :: Office Suites +platforms = OS, Independent +provides = ezodf +install_requires = + weakrefset + lxml + +[options] +packages = ezodf + [bdist_wheel] universal=1 From 66a76b72a0124e7055191f141b5d9790001a1c29 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 29 Nov 2018 18:59:42 +0000 Subject: [PATCH 2/3] Removed the metadata from setup.py It is possible to eliminate manual reading of `README.rst` using `file: ` in `setup.cfg`, but I have preserved the existing semantics. --- setup.py | 44 +++++--------------------------------------- 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/setup.py b/setup.py index 2ddc49d..d7adb06 100644 --- a/setup.py +++ b/setup.py @@ -9,51 +9,17 @@ # import os -from distutils.core import setup +from setuptools import setup from version import VERSION -AUTHOR_NAME = 'Manfred Moitzi' -AUTHOR_EMAIL = 'mozman@gmx.at' - -MAINTAINER_NAME = 'Anton Shvein' -MAINTAINER_EMAIL = 't0hashvein@gmail.com' - - def read(fname): try: return open(os.path.join(os.path.dirname(__file__), fname)).read() except IOError: return "File '%s' not found.\n" % fname -setup(name='ezodf', - version=VERSION, - description='A Python package to create/manipulate OpenDocumentFormat files.', - author=AUTHOR_NAME, - url='https://github.com/T0ha/ezodf', - download_url='https://github.com/T0ha/ezodf/releases', - author_email=AUTHOR_EMAIL, - maintainer=MAINTAINER_NAME, - maintainer_email=MAINTAINER_EMAIL, - packages=['ezodf'], - provides=['ezodf'], - requires=['weakrefset', 'lxml'], - keywords=['ODF', 'OpenDocumentFormat', 'OpenOffice', 'LibreOffice'], - long_description=read('README.rst')+read('NEWS.rst'), - platforms="OS Independent", - license="MIT License", - classifiers=[ - "Development Status :: 3 - Alpha", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Programming Language :: Python :: 2.6", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4", - "Intended Audience :: Developers", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Office/Business :: Office Suites", - ] - ) +setup( + version=VERSION, + long_description=read('README.rst')+read('NEWS.rst') +) From 3ac0828b69d81d51ec4a4fff1f144e892fd04f18 Mon Sep 17 00:00:00 2001 From: KOLANICH Date: Thu, 29 Nov 2018 19:07:28 +0000 Subject: [PATCH 3/3] weakrefset package is unneeded for 2.7+ and python 3.1+ Since python 3.0* is unsupported and ancient we don't care about its users. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3819ee5..063bf4e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ classifiers = platforms = OS, Independent provides = ezodf install_requires = - weakrefset + weakrefset; python_version < "2.7" lxml [options]