From abe8bc966ceff90dbb26affcf54348e4809864d5 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 31 Oct 2014 19:28:57 -0700 Subject: Update the license in setup.py --- cryptography/__about__.py | 2 +- setup.py | 1 + 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__) diff --git a/setup.py b/setup.py index ca729275..bf4e864b 100644 --- a/setup.py +++ b/setup.py @@ -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__ -- cgit v1.2.3