From 8d972799c21b55c6bcdb0b2e324e254e591e106c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= Date: Tue, 19 Dec 2017 14:49:40 -0300 Subject: [PATCH] docs and makefile small fixes --- Makefile | 2 +- docs/Makefile | 17 +++++++++++++++++ docs/conf.py | 2 +- src/wolfcrypt/__init__.py | 6 +++++- src/wolfcrypt/_build_ffi.py | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6b75528..a6bf275 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ check: test ## run tests quickly with the default Python test-all: ## run tests on every Python version with tox tox -check-all: ## run tests on every Python version with tox +check-all: test-all ## run tests on every Python version with tox coverage: ## check code coverage quickly with the default Python coverage run --source wolfcrypt -m pytest diff --git a/docs/Makefile b/docs/Makefile index c552bc9..8d76b70 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,5 +1,22 @@ # Makefile for Sphinx documentation # +# Copyright (C) 2006-2017 wolfSSL Inc. +# +# This file is part of wolfSSL. (formerly known as CyaSSL) +# +# wolfSSL is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# wolfSSL is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # You can set these variables from the command line. SPHINXOPTS = diff --git a/docs/conf.py b/docs/conf.py index fde01e6..c78b2cb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'wolfcrypt' +project = u'wolfcrypt Python' copyright = u'2017, wolfSSL Inc. All rights reserved' author = u'wolfSSL' diff --git a/src/wolfcrypt/__init__.py b/src/wolfcrypt/__init__.py index d582d12..94a0de4 100644 --- a/src/wolfcrypt/__init__.py +++ b/src/wolfcrypt/__init__.py @@ -40,4 +40,8 @@ __email__ = "info@wolfssl.com" __license__ = "GPLv2 or Commercial License" __copyright__ = "Copyright (C) 2006-2017 wolfSSL Inc" -__all__ = ["ciphers", "hashes", "random"] +__all__ = [ + "__title__", "__summary__", "__uri__", "__version__", + "__author__", "__email__", "__license__", "__copyright__", + "ciphers", "hashes", "random" +] diff --git a/src/wolfcrypt/_build_ffi.py b/src/wolfcrypt/_build_ffi.py index 79ff66a..ee3d443 100644 --- a/src/wolfcrypt/_build_ffi.py +++ b/src/wolfcrypt/_build_ffi.py @@ -18,10 +18,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +from distutils.util import get_platform from cffi import FFI from wolfcrypt import __wolfssl_version__ as version from wolfcrypt._build_wolfssl import local_path -from distutils.util import get_platform ffi = FFI()