Merge many outstanding PRs, add a bunch of type signatures, improve code quality

.coveragerc

@@ -9,11 +9,6 @@ exclude_lines =
     # skip abstract methods
     @(abc\.)?abstract
 
-    # Python 2.x compatibility stuff
-    if six.PY2:
-    if six.PY3:
-    def __nonzero__
-
     # debug-only code
     def __repr__
 

README.rst

@@ -35,6 +35,11 @@ To install PGPy, simply:
 
     $ pip install PGPy
 
+Command-Line Interface
+----------------------
+
+This module will install `sopgpy`, an implementation of the `Stateless OpenPGP Command-line Interface <https://datatracker.ietf.org/doc/draft-dkg-openpgp-stateless-cli/>`_.
+
 Documentation
 -------------
 
@@ -56,9 +61,9 @@ Requirements
 
 - `Cryptography <https://pypi.python.org/pypi/cryptography>`_
 
-- `pyasn1 <https://pypi.python.org/pypi/pyasn1/>`_
+To use `sopgpy` you'll also need:
 
-- `six <https://pypi.python.org/pypi/six>`_
+- `sop <https://pypi.org/project/sop/>`_ >= 0.5.1
 
 License
 -------

docs/source/changelog.rst

@@ -4,6 +4,41 @@
 Changelog
 *********
 
+v0.7.0
+======
+
+(not yet released)
+
+Dependency changes
+------------------
+
+pyasn1 is no longer needed
+
+Now depends transitively (via the cryptography module) on OpenSSL
+1.1.1 or later for Brainpool, X25519, Ed25519.
+
+API additions
+-------------
+
+PGPSignatures represents a detached signature, which can contain more
+than a single signature.  It is a simple sequence of individual
+PGPSignature objects.
+
+API changes
+-----------
+
+Armorable.is_ascii() is deprecated.  You probably want
+Armorable.is_utf8() instead, since OpenPGP assumes that all text is
+UTF-8.
+
+EllipticCurveOID.Invalid was removed -- EllipticCurveOID only
+enumerates supported curves now.
+
+HashAlgorithm.hasher now returns a
+cryptography.hazmat.primitives.hashes.Hash object, not a hashlib.HASH
+object.  The main difference between these interfaces is the use of
+finalize() instead of digest().
+
 v0.6.0
 ======
 

gentoo/pgpy-0.4.0.ebuild

@@ -19,7 +19,6 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/singledispatch[${PYTHON_USEDEP}]
          dev-python/pyasn1[${PYTHON_USEDEP}]
-         >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
          >=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
          $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3)"
 DOCS=( README.rst )

pgpy/__init__.py

@@ -5,6 +5,7 @@
 from .pgp import PGPKeyring
 from .pgp import PGPMessage
 from .pgp import PGPSignature
+from .pgp import PGPSignatures
 from .pgp import PGPUID
 
 __all__ = ['constants',
@@ -13,4 +14,5 @@
            'PGPKeyring',
            'PGPMessage',
            'PGPSignature',
+           'PGPSignatures',
            'PGPUID', ]