Merge branch 'release/0.3.0'

.coveragerc

@@ -0,0 +1,21 @@
+[run]
+branch = False
+
+[report]
+exclude_lines =
+    # keep the standard pragma
+    pragma: no cover
+
+    # skip abstract methods
+    @(abc\.)?abstract
+
+    # Python 2.x compatibility stuff
+    if six.PY2:
+    if six.PY3:
+    def __nonzero__
+
+    # debug-only code
+    def __repr__
+
+    # defensive code
+    raise NotImplementedError

.gitignore

@@ -53,3 +53,4 @@ coverage.xml
 docs/_build/
 
 .idea
+random_seed

.travis.yml

@@ -4,12 +4,8 @@ python:
   - "3.3"
   - "3.2"
   - "2.7"
-env:
-  matrix:
-    # test all versions against OpenSSL 0.9.8
-    - OPENSSL=0.9.8
-    # test all versions against OpenSSL 1.0.0
-    - OPENSSL=1.0.1
+  - "pypy"
+  - "pypy3"
 matrix:
   include:
     # add a pep8 test
@@ -23,19 +19,20 @@ matrix:
       env: TOXENV=setup27
   allow_failures:
     - env: TOXENV=pep8
+    - python: "pypy"
+    - python: "pypy3"
 # install requirements
 install:
-  # add the lucid repo for if we need OpenSSL 0.9.8
-  - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main"
   # make sure gnupg, pgpdump, and the requested version of OpenSSL are installed
   - sudo apt-get update
   - sudo apt-get install -y gnupg pgpdump
-  - if [[ "${OPENSSL}" == "0.9.8" ]]; then sudo apt-get install -y --force-yes libssl-dev/lucid; fi
   # install coveralls
   - pip install tox python-coveralls
 # set TOXENV if it isn't yet
 before_script:
   - if [[ -z "$TOXENV" ]]; then export TOXENV=py${TRAVIS_PYTHON_VERSION//.}; fi
+  - if [[ "$TRAVIS_PYTHON_VERSION" == 'pypy' ]]; then export TOXENV=pypy; fi
+  - if [[ "$TRAVIS_PYTHON_VERSION" == 'pypy3' ]]; then export TOXENV=pypy3; fi
 # use setup.py to invoke testing via coveralls
 script:
  - tox

MANIFEST.in

@@ -2,5 +2,4 @@ include LICENSE
 include README.rst
 include requirements.txt
 include requirements-test.txt
-include requirements-dev.txt
 recursive-exclude * *.pyc

README.rst

@@ -6,16 +6,16 @@ PGPy: Pretty Good Privacy for Python
     :alt: Latest stable version
 
 .. image:: https://travis-ci.org/Commod0re/PGPy.svg?branch=master
-    :target: https://travis-ci.org/Commod0re/PGPy?branch=develop
+    :target: https://travis-ci.org/Commod0re/PGPy?branch=master
     :alt: Travis-CI
 
 .. image:: https://coveralls.io/repos/Commod0re/PGPy/badge.png?branch=master
-    :target: https://coveralls.io/r/Commod0re/PGPy?branch=develop
+    :target: https://coveralls.io/r/Commod0re/PGPy?branch=master
     :alt: Coveralls
 
 Homepage: None yet.
 
-`PGPy` is a Python (2 and 3) library for implementing Pretty Good Privacy into Python programs.
+`PGPy` is a Python (2 and 3) library for implementing Pretty Good Privacy into Python programs, conforming to the OpenPGP specification per RFC 4880.
 
 Features
 --------
@@ -45,12 +45,14 @@ Requirements
 
   Tested with: 3.4, 3.3, 3.2, 2.7
 
-- `Requests <https://pypi.python.org/pypi/requests>`_
-
 - `Cryptography <https://pypi.python.org/pypi/cryptography>`_
 
 - `enum34 <https://pypi.python.org/pypi/enum34>`_
 
+- `singledispatch <https://pypi.python.org/pypi/singledispatch>`_
+
+- `six <https://pypi.python.org/pypi/six>`_
+
 License
 -------
 

arch/PKGBUILD

@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Michael Greene <mgreene@securityinnovation.com>
+# Contributor: Michael Greene <mgreene@securityinnovation.com>
+
+pkgbase=python-pgpy
+pkgname=('python-pgpy' 'python2-pgpy')
+pkgver=0.3.0
+pkgrel=1
+pkgdesc="Pretty Good Privacy for Python - a pure Python OpenPGP implementation."
+arch=('any')
+license=('BSD')
+url="https://github.com/Commod0re/PGPy"
+makedepends=('python-setuptools' 'python-cryptography' 'python-singledispatch' 'python-six'
+             'python2-setuptools' 'python2-cryptography' 'python2-enum34' 'python2-singledispatch' 'python2-six')
+source=("https://pypi.python.org/packages/source/P/PGPy/PGPy-${pkgver}.tar.gz")
+##TODO: sum this shit
+sha256sums=()
+sha384sums=()
+sha512sums=()
+
+prepare() {
+    cp -a PGPy-${pkgver}{,-python2}
+}
+
+build() {
+    # Build Python 3 module
+    cd ${srcdir}/PGPy-${pkgver}
+    python3 setup.py build
+
+    # Build python2 module
+    cd ${srcdir}/PGPy-${pkgver}-python2
+    python2 setup.py build
+}
+
+package_python-pgpy() {
+    depends=('python-cryptography>=0.5.2' 'python-cryptography<=0.6' 'python-singledispatch' 'python-six>=1.7.2')
+
+    cd PGPy-${pkgver}
+    python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -D -m 644 LICENSE ${pkgdir}/usr/share/licenses/python-pgpy/LICENSE
+}
+
+package_python2-pgpy() {
+    depends=('python2-cryptography>=0.5.2' 'python2-cryptography<=0.6' 
+             'python2-six>=1.7.2' 'python2-enum34' 'python-singledispatch')
+
+    cd PGPy-${pkgver}-python2
+    python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -D -m 644 LICENSE ${pkgdir}/usr/share/licenses/python2-pgpy/LICENSE
+}

debian/changelog

@@ -0,0 +1,5 @@
+pgpy (0.3.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #62)
+
+ -- Michael <mgreene@securityinnovation.com>  Tue, 07 Oct 2014 16:37:53 -0700

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -0,0 +1,33 @@
+Source: pgpy
+Section: python
+Priority: optional
+Maintainer: Michael Greene <mgreene@securityinnovation.com>
+Build-Depends: debhelper (>= 8.0.0), cdbs, python-all-dev (>= 2.7), python3-all-dev (>= 3.2), python-setuptools, python3-setuptools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
+Vcs-Git: https://github.com/Commod0re/PGPy.git
+Vcs-Browser: https://github.com/Commod0re/PGPy
+
+Package: python-pgpy
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: python-pgpy-doc
+Description: Pretty Good Privacy for Python.
+ A Pure-Python implementation of OpenPGP.
+
+Package: python3-pgpy
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, python3-six
+Recommends: python-pgpy-doc
+Description: Pretty Good Privacy for Python.
+ A Pure-Python implementation of OpenPGP.
+
+Package: python-pgpy-doc
+Section: doc
+Architecture: all
+Recommends: python3-pgpy-doc, python-pgpy-doc
+Description: Pretty Good Privacy for Python (documentation).
+ A Pure-Python implementation of OpenPGP.
+ .
+ This package contains the HTML documentation.

debian/copyright

@@ -0,0 +1,33 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: PGPy
+Source: https://github.com/Commod0re/PGPy
+
+Files: *
+Copyright: 2014 Michael Greene
+License: BSD 3-Clause
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name of the {organization} nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian/docs

@@ -0,0 +1 @@
+README.rst

debian/python-pgpy-doc.docs

@@ -0,0 +1,3 @@
+./docs/source/api
+./docs/source/examples
+./docs/source/*.rst

debian/python-pgpy.install

@@ -0,0 +1 @@
+usr/lib/python2*

debian/python-pgpy.pydist

@@ -0,0 +1,4 @@
+enum34 python-enum34
+singledispatch python-singledispatch
+six python-six (>= 1.7.2)
+cryptography python-cryptography (>= 0.5.2), python-cryptography (<= 0.6.0)

debian/python3-pgpy.install

@@ -0,0 +1 @@
+usr/lib/python3*

debian/python3-pgpy.pydist

@@ -0,0 +1,4 @@
+enum34 -3.4 python3-enum34
+singledispatch python3-singledispatch
+six python3-six (>= 1.7.2)
+cryptography python3-cryptography (>= 0.5.2), python3-cryptography (<= 0.6.0)

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+SHELL=/bin/bash
+
+DEB_PYTHON_PACKAGES_EXCLUDE = python-pgpy-doc
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

docs/source/_ext/__init__.py

@@ -0,0 +1,3 @@
+"""
+Just a placeholder so _ext.js_progress can be used as the extension name in conf.py
+"""