Commit 9f78da7e authored by anarcat's avatar anarcat

Merge tag '2.2.3' into 2.x

monkeysign Debian release 2.2.3
parents e31d72d5 f73ab379
......@@ -374,6 +374,15 @@ A workaround is to hardcode the version with::
Release process
===============
To build a Monkeysign release, you will need to have a few tools
already installed, namely the Python packages ``wheel``,
``setuptools`` and ``setuptools-scm``. We also assume you use the
following Debian packages, although you may be able to work around
those: ``devscripts``, ``git``, ``git-buildpackage``, ``pip`` and
``twine``. In Debian, this should get you started::
sudo apt install python-wheel python-setuptools python-setuptools-scm devscripts git git-buildpackage python-pip twine
1. make sure tests pass::
./scripts/monkeysign --test
......
monkeysign (2.2.3) unstable; urgency=medium
[ Simon Fondrie-Teitler ]
* Don't escape percent signs that are actually required in default mua command
[ Antoine Beaupré ]
* some small improvements to the bug issue template
* create 2.2.x branch officially
* silence errors in test suite with GnuPG 2
-- Antoine Beaupré <anarcat@debian.org> Tue, 24 Jan 2017 15:40:35 -0500
monkeysign (2.2.2) unstable; urgency=medium
[ Antoine Beaupré ]
......
......@@ -616,7 +616,7 @@ class TempKeyring(Keyring):
Keyring.__init__(self, tempfile.mkdtemp(prefix="pygpg-"))
def __del__(self):
shutil.rmtree(self.homedir)
shutil.rmtree(self.homedir, ignore_errors=True)
class OpenPGPkey():
"""An OpenPGP key.
......
......@@ -179,11 +179,10 @@ class MonkeysignArgumentParser(argparse.ArgumentParser):
'"To:" header (default: %(default)s)'))
default_mua = "xdg-email --utf8 --to '%(to)s' --subject '%(subject)s' --body '%(body)s' --attach '%(attach)s'"
self.add_argument('--mua', nargs='?', default=None, const=default_mua,
help=_('Mail User Agent to use to send mail. all '
'parameters are passed on the commandline,'
'overrides --mta. '
'(default: %s when specified)')
% default_mua)
help=_('Mail User Agent to use to send mail. all '
'parameters are passed on the commandline,'
'overrides --mta. '
'(default: %(const)s when specified)'))
self.add_argument('--nomail', '--no-mail', action='store_true',
help=_('do not send email at all'))
self.add_argument('-t', '--to',
......
......@@ -34,7 +34,7 @@ setup(name='monkeysign',
'write_to': 'monkeysign/_version.py',
},
setup_requires=['sphinx', 'setuptools_scm'],
install_requieres=['pysocks'],
install_requires=['pysocks'],
author='Antoine Beaupré',
author_email='anarcat@debian.org',
url=monkeysign.__website__,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment