From 9e0e0a0d4e8b81ec43ccbd9e8d1daf2cd86713c7 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Mon, 8 Apr 2013 16:44:18 +0000 Subject: [PATCH 1/4] Add Makefile command for creating a virtualenv with virtualenvwrapper. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ab43041..5792a18 100644 --- a/Makefile +++ b/Makefile @@ -26,3 +26,6 @@ docs: cd docs make clean make html + +venv: + -source /usr/shared/python/ns/virtualenvwrapper.sh && mkvirtualenv -a "$PWD" --unzip-setuptools --distribute python-gnupg From f385b3938ffae751403b9277e4e83aca8dd792c8 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Tue, 9 Apr 2013 08:37:14 +0000 Subject: [PATCH 2/4] Fix distutils, PyPI, and pip packaging configuration files. * Remove/replace old classifiers in PyPI configuration PKG-INFO. * Add pip requirements.txt file for documentation builds on readthedocs.org. * Fix package build variables in distutils setup.py. --- PKG-INFO | 43 ++++++++++++++++++++++--------------------- requirements.txt | 1 + setup.py | 27 ++++++++++++++------------- 3 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 requirements.txt diff --git a/PKG-INFO b/PKG-INFO index 7acb3ca..206db4c 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -5,24 +5,25 @@ Summary: A wrapper for the Gnu Privacy Guard (GPG or GnuPG) Home-page: https://www.github.com/isislovecruft/python-gnupg Author: Isis Lovecruft Author-email: isis@leap.se -License: Copyright (C) 2013 by Isis Lovecruft. All Rights Reserved. See LICENSE for license. See COPYLEFT for "copyright". -Download-URL: https://github.com/isislovecruft/python-gnupg.git -Description: This module allows easy access to GnuPG's key management, encryption and signature functionality from Python programs. It is intended for use with Python 2.4 or greater. -Platform: No particular restrictions -Classifier: Development Status :: 3 - Alpha -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+) -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 2.4 -Classifier: Programming Language :: Python :: 2.5 -Classifier: Programming Language :: Python :: 2.6 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.0 -Classifier: Programming Language :: Python :: 3.1 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Operating System :: OS Independent -Classifier: Topic :: Security :: Cryptography -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: Utilities +Download-URL: https://github.com/isislovecruft/python-gnupg/archives/develop.zip +Description:: This module allows easy access to GnuPG's key management, encryption and signature functionality from Python programs. It is intended for use with Python 2.6 or greater. +Classifier:: Development Status :: 3 - Alpha +License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+) +Operating System :: MacOS :: MacOS X +Operating System :: Microsoft :: Windows :: Windows 7 +Operating System :: Microsoft :: Windows :: Windows XP +Operating System :: POSIX :: BSD +Operating System :: POSIX :: Linux +Classifier:: Intended Audience :: Developers +Classifier:: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+) +Classifier:: Programming Language :: Python +Classifier:: Programming Language :: Python :: 2 +Classifier:: Programming Language :: Python :: 3 +Classifier:: Programming Language :: Python :: 2.6 +Classifier:: Programming Language :: Python :: 2.7 +Classifier:: Programming Language :: Python :: 3.0 +Classifier:: Programming Language :: Python :: 3.1 +Classifier:: Programming Language :: Python :: 3.2 +Classifier:: Topic :: Security :: Cryptography +Classifier:: Topic :: Software Development :: Libraries :: Python Modules +Classifier:: Topic :: Utilities diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..50feaef --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +Sphinx>=1.1 diff --git a/setup.py b/setup.py index 6a158f8..7b115ca 100644 --- a/setup.py +++ b/setup.py @@ -9,29 +9,30 @@ management, encryption and signature functionality from Python programs. \ It is intended for use with Python 2.4 or greater.", license="""Copyright (C) 2008-2012 by Vinay Sajip. All Rights Reserved. See LICENSE for license.""", version=version, - author="Vinay Sajip", - author_email="vinay_sajip@red-dove.com", - maintainer="Vinay Sajip", - maintainer_email="vinay_sajip@red-dove.com", - url="http://packages.python.org/python-gnupg/index.html", + author="Isis Agora Lovecruft", + author_email="isis@leap.se", + maintainer="Isis Agora Lovecruft", + maintainer_email="isis@leap.se", + url="https://github.com/isislovecruft/python-gnupg", py_modules=["gnupg"], - platforms="No particular restrictions", - download_url="http://python-gnupg.googlecode.com/files/python-gnupg-%s.tar.gz" % version, + platforms="Linux, BSD, OSX, Windows", + download_url="https://github.com/isislovecruft/python-gnupg/archive/develop.zip", classifiers=[ - 'Development Status :: 5 - Production/Stable', + 'Development Status :: 4 - Alpha', "Intended Audience :: Developers", - 'License :: OSI Approved :: BSD License', + 'Classifier:: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 2.4", - "Programming Language :: Python :: 2.5", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.0", "Programming Language :: Python :: 3.1", "Programming Language :: Python :: 3.2", - "Operating System :: OS Independent", - "Topic :: Software Development :: Libraries :: Python Modules" + "Topic :: Software Development :: Libraries :: Python Modules", + 'Classifier:: Topic :: Security :: Cryptography', + 'Classifier:: Topic :: Software Development :: Libraries :: Python Modules', + 'Classifier:: Topic :: Utilities', + ] ) From dbdcc848a5b63141e047613620ace8b1c1a07902 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Tue, 9 Apr 2013 13:18:57 +0000 Subject: [PATCH 3/4] Update .gitignore. --- .gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index f6a314e..5abff24 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,14 @@ keys/* # Ignore distutils record of installed files: installed-files.txt + +# Ignore PyCharm files: +.idea/* + +# and git-tickets and tickets: +.tickets/* +tickets/* + +# Ignore virtualenv folders, if they are here: +include/* +local/* \ No newline at end of file From a54fa33ff561dad433a74671f42293fc0659ff8f Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Tue, 9 Apr 2013 13:19:27 +0000 Subject: [PATCH 4/4] Bump because minor version because we've rewritten large chunks of the codebase. --- gnupg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnupg.py b/gnupg.py index aeb6814..c707c14 100644 --- a/gnupg.py +++ b/gnupg.py @@ -42,7 +42,9 @@ Steve Traugott's documentation: Steve Traugott, stevegt@terraluna.org Thu Jun 23 21:27:20 PDT 2005 + Vinay Sajip's documentation: + This version of the module has been modified from Steve Traugott's version (see http://trac.t7a.org/isconf/browser/trunk/lib/python/isconf/GPG.py) by Vinay Sajip to make use of the subprocess module (Steve's version uses @@ -56,7 +58,7 @@ Vinay Sajip's documentation: """ __module__ = 'gnupg' -__version__ = "0.3.1" +__version__ = "0.4.0" __author__ = "Isis Agora Lovecruft" __date__ = "12 Febuary 2013"