From 412141198e2962708379fa7d6053734a57b60628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= Date: Mon, 9 May 2016 15:18:35 -0300 Subject: [PATCH] drops 'import about' requirement --- wrapper/python/setup.py | 14 ++++--------- wrapper/python/wolfcrypt/__about__.py | 29 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/wrapper/python/setup.py b/wrapper/python/setup.py index 0794a2020..1eeaed17e 100755 --- a/wrapper/python/setup.py +++ b/wrapper/python/setup.py @@ -23,15 +23,9 @@ from __future__ import absolute_import import os import sys -import wolfcrypt +from wolfcrypt.__about__ import metadata from setuptools import setup, find_packages -try: - import about -except ImportError: - error = "about is not installed, refer to <{url}> for instructions." - raise ImportError(error.format(url="https://pypi.io/project/about/")) - os.chdir(os.path.dirname(sys.argv[0]) or ".") long_description = open("README.rst", "rt").read().replace( @@ -40,7 +34,7 @@ long_description = open("README.rst", "rt").read().replace( ) info = dict( - metadata = about.get_metadata(wolfcrypt), + metadata = {k[2:-2]: metadata[k] for k in metadata}, contents = { "long_description": long_description, "package_data": {"": ["*.txt"]}, @@ -48,8 +42,8 @@ info = dict( "cffi_modules": ["./wolfcrypt/build_ffi.py:ffi"], }, requirements = { - "setup_requires": ["cffi>=1.6.0", "about>=5.2"], - "install_requires": ["cffi>=1.6.0", "about>=5.2"], + "setup_requires": ["cffi>=1.6.0"], + "install_requires": ["cffi>=1.6.0"], }, scripts = {}, plugins = {}, diff --git a/wrapper/python/wolfcrypt/__about__.py b/wrapper/python/wolfcrypt/__about__.py index 68590bf28..d94ce1926 100644 --- a/wrapper/python/wolfcrypt/__about__.py +++ b/wrapper/python/wolfcrypt/__about__.py @@ -19,16 +19,25 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA metadata = dict( - __name__ = "wolfcrypt", - __version__ = "0.1.5", - __license__ = """GPLv2 or Commercial License""", - __author__ = "wolfSSL Inc. ", - __url__ = "https://wolfssl.github.io/wolfcrypt-py", - __summary__ = "A Python library that encapsulates wolfSSL's wolfCrypt API.", - __keywords__ = """ - OS independent, Python / 2.7, Python / 3.5, software development, - security, cryptography, Proprietary, GPLv2 - """, + __name__ = "wolfcrypt", + __version__ = "0.1.6", + __license__ = "GPLv2 or Commercial License", + __author__ = "wolfSSL Inc.", + __author_email__ = "info@wolfssl.com", + __url__ = "https://wolfssl.github.io/wolfcrypt-py", + __description__ = \ + u"A Python library that encapsulates wolfSSL's wolfCrypt API.", + __keywords__ = "security, cryptography", + __classifiers__ = [ + u"License :: OSI Approved :: GNU General Public License v2 (GPLv2)", + u"License :: Other/Proprietary License", + u"Operating System :: OS Independent", + u"Programming Language :: Python :: 2.7", + u"Programming Language :: Python :: 3.5", + u"Topic :: Security", + u"Topic :: Security :: Cryptography", + u"Topic :: Software Development" + ] ) globals().update(metadata)