diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-31 19:28:57 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-31 19:28:57 -0700 |
| commit | abe8bc966ceff90dbb26affcf54348e4809864d5 (patch) | |
| tree | 6817054c41ecc8793ad8d6884460989b245af3b1 | |
| parent | ec60e31c37a04f773e65d98e83ba9d5b05d4950f (diff) | |
| download | cryptography-abe8bc966ceff90dbb26affcf54348e4809864d5.tar.gz cryptography-abe8bc966ceff90dbb26affcf54348e4809864d5.tar.bz2 cryptography-abe8bc966ceff90dbb26affcf54348e4809864d5.zip | |
Update the license in setup.py
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 77320b95..3d39d18b 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -27,5 +27,5 @@ __version__ = "0.7.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" -__license__ = "Apache License, Version 2.0" +__license__ = "BSD or Apache License, Version 2.0" __copyright__ = "Copyright 2013-2014 {0}".format(__author__) @@ -304,6 +304,7 @@ setup( classifiers=[ "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", + "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: MacOS :: MacOS X", "Operating System :: POSIX", diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index fb89b01c..3824d784 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -27,5 +27,5 @@ __version__ = "0.7.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" -__license__ = "Apache License, Version 2.0" +__license__ = "BSD and Apache License, Version 2.0" __copyright__ = "Copyright 2013-2014 %s" % __author__ |