Merge branch 'candidate-0.1.1' into fixed-0.1.1

This commit is contained in:
Peter Eckersley
2015-12-25 13:40:23 -08:00
6 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages
version = '0.1.1'
version = '0.2.0.dev0'
install_requires = [
# load_pem_private/public_key (>=0.6)
+1 -1
View File
@@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages
version = '0.1.1'
version = '0.2.0.dev0'
install_requires = [
'acme=={0}'.format(version),
+1 -1
View File
@@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages
version = '0.1.1'
version = '0.2.0.dev0'
install_requires = [
'acme=={0}'.format(version),
+1 -1
View File
@@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages
version = '0.1.1'
version = '0.2.0.dev0'
install_requires = [
'setuptools', # pkg_resources
+3
View File
@@ -6,6 +6,9 @@
#include <openssl/rsa.h>
#include <openssl/pem.h>
// This program can be used to perform RSA public key signatures given only
// the hash of the file to be signed as input.
// Sign with SHA1
#define HASH_SIZE 20
+1 -1
View File
@@ -172,7 +172,7 @@ echo "In order to upload packages run the following command:"
echo twine upload "$root/dist.$version/*/*"
if [ "$RELEASE_BRANCH" = candidate-"$version" ] ; then
SetVersion "$nextversion"
SetVersion "$nextversion".dev0
git diff
git commit -m "Bump version to $nextversion"
fi