From e59ca3968c97cf178f4c20108f05ef7682bfcebb Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Fri, 26 Jan 2018 19:35:18 -0600 Subject: [PATCH] updated gnupg version and removed CI check for gnupg --- onionr/core.py | 5 +---- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/onionr/core.py b/onionr/core.py index 905762ad..4709f051 100644 --- a/onionr/core.py +++ b/onionr/core.py @@ -49,10 +49,7 @@ class Core: ''' Generate the main PGP key for our client. Should not be done often. Uses own PGP home folder in the data/ directory. ''' # Generate main pgp key - if os.getenv('TRAVIS') == 'true': - gpg = gnupg.GPG(homedir='./data/pgp/') - else: - gpg = gnupg.GPG(gnupghome='./data/pgp/') + gpg = gnupg.GPG(gnupghome='./data/pgp/') input_data = gpg.gen_key_input(key_type="RSA", key_length=2048, name_real=myID, name_email='anon@onionr') #input_data = gpg.gen_key_input(key_type="RSA", key_length=1024) key = gpg.gen_key(input_data) diff --git a/requirements.txt b/requirements.txt index ed2f5b23..d09d9c70 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ requests==2.18.4 PyNaCl==1.2.1 Flask==0.12.2 pycrypto==2.6.1 -gnupg==2.3.1 +gnupg==0.4.1 sha3==0.2.1