Merge pull request #220 from hynek/release-15

Release 0.15
pyca · Apr 14, 2015 · 468bd42 · 468bd42
2 parents a28a0fb + 76ecf94
commit 468bd42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/OpenSSL/version.py b/OpenSSL/version.py
@@ -6,4 +6,4 @@
 pyOpenSSL - A simple wrapper around the OpenSSL library
 """
 
-__version__ = '0.14'
+__version__ = '0.15'
diff --git a/doc/conf.py b/doc/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.14'
+version = '0.15'
 # The full version, including alpha/beta/rc tags.
-release = '0.14'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) Jean-Paul Calderone 2008-2014, All rights reserved
+# Copyright (C) Jean-Paul Calderone 2008-2015, All rights reserved
 #
 
 """
@@ -10,8 +10,9 @@
 
 from setuptools import setup
 
+
 # XXX Deduplicate this
-__version__ = '0.14'
+__version__ = '0.15'
 
 setup(name='pyOpenSSL', version=__version__,
       packages = ['OpenSSL'],