From 9e9fd24d68edf0db668112599e40280a0bab8e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= Date: Wed, 4 May 2016 21:38:27 -0300 Subject: [PATCH] updates metadata; drops py26 tests --- wrapper/python/LICENSING.rst | 30 ++++++++++++++++++++++++++++++ wrapper/python/MANIFEST.in | 1 + wrapper/python/README.rst | 14 +++----------- wrapper/python/tox.ini | 2 +- 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 wrapper/python/LICENSING.rst create mode 100644 wrapper/python/MANIFEST.in diff --git a/wrapper/python/LICENSING.rst b/wrapper/python/LICENSING.rst new file mode 100644 index 000000000..d04a7880f --- /dev/null +++ b/wrapper/python/LICENSING.rst @@ -0,0 +1,30 @@ +Licensing +========= + +wolfSSL’s software is available under two distinct licensing models: +open source and standard commercial licensing. Please see the relevant +section below for information on each type of license. + +Open Source +----------- + +wolfSSL (formerly CyaSSL), yaSSL, wolfCrypt, yaSSH and TaoCrypt software +are free software downloads and may be modified to the needs of the user +as long as the user adheres to version two of the GPL License. The GPLv2 +license can be found on the gnu.org website: + + http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + +Commercial Licensing +-------------------- + +Businesses and enterprises who wish to incorporate wolfSSL products into +proprietary appliances or other commercial software products for +re-distribution must license commercial versions. Commercial licenses for +wolfSSL, yaSSL, and wolfCrypt are available for $5,000 USD per end product +or SKU. Licenses are generally issued for one product and include unlimited +royalty-free distribution. Custom licensing terms are also available. + + Email: licensing@wolfssl.com + + Phone: +1 425 245-8247 diff --git a/wrapper/python/MANIFEST.in b/wrapper/python/MANIFEST.in new file mode 100644 index 000000000..3c56fcf44 --- /dev/null +++ b/wrapper/python/MANIFEST.in @@ -0,0 +1 @@ +include LICENSING.rst diff --git a/wrapper/python/README.rst b/wrapper/python/README.rst index 23e9d1f78..5b9a16dc6 100644 --- a/wrapper/python/README.rst +++ b/wrapper/python/README.rst @@ -44,16 +44,8 @@ A Python library that encapsulates wolfSSL's wolfCrypt API py35: commands succeeded congratulations :) -Licensing -========= + +.. include:: LICENSING.rst -wolfSSL (formerly known as CyaSSL) and wolfCrypt are either licensed for use -under the GPLv2 or a standard commercial license. For our users who cannot use -wolfSSL under GPLv2, a commercial license to wolfSSL and wolfCrypt is available. -Please contact wolfSSL Inc. directly at: - -Email: licensing@wolfssl.com -Phone: +1 425 245-8247 - -More information can be found on the `wolfSSL website `_. +Copyright 2016 wolfSSL Inc. All rights reserved. diff --git a/wrapper/python/tox.ini b/wrapper/python/tox.ini index 20d93e22f..9cb8be548 100644 --- a/wrapper/python/tox.ini +++ b/wrapper/python/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py26,py27,py35 +envlist=py27,py35 [testenv] deps=-rrequirements-testing.txt