Implement Unthreaded Controller (#256)

* Complete rewrite of aiosmtpd.controller * Implement Unthreaded Controllers * Implement tests of Unthreaded Controllers * Improve other tests * Improve coverage by replacing nocover's with conditional pragmas * Suppress exception ignored during __del__ * Blackification * Update badges * Tidy up table + link to Public PGP on GH * Bump version to 1.5.0a1 and update NEWS.rst
aio-libs · Mar 8, 2021 · 747a7c4 · 747a7c4
1 parent 38bb59d
commit 747a7c4
Show file tree

Hide file tree

Showing 13 changed files with 958 additions and 382 deletions.
diff --git a/DESCRIPTION.rst b/DESCRIPTION.rst
@@ -2,16 +2,22 @@
  aiosmtpd - asyncio based SMTP server
 ######################################
 
-| |github license| |_| |PyPI Version| |PyPI Python|
-| |GA badge| |codecov| |_| |LGTM.com| |readthedocs| |_|
-| |GH Release| |_| |PullRequests| |_| |LastCommit|
+| |github license| |_| |PyPI Version| |_| |PyPI Python|
+| |GA badge| |_| |codecov| |_| |LGTM.com| |_| |readthedocs|
+| |GH Release| |_| |GH PRs| |_| |GH LastCommit|
 |
 
 .. |_| unicode:: 0xA0
    :trim:
-.. |github license| image:: https://img.shields.io/github/license/aio-libs/aiosmtpd
+.. |github license| image:: https://img.shields.io/github/license/aio-libs/aiosmtpd?logo=Open+Source+Initiative&logoColor=0F0
    :target: https://github.com/aio-libs/aiosmtpd/blob/master/LICENSE
    :alt: Project License on GitHub
+.. |PyPI Version| image:: https://img.shields.io/pypi/v/aiosmtpd?logo=pypi&logoColor=yellow
+   :target: https://pypi.org/project/aiosmtpd/
+   :alt: PyPI Package
+.. |PyPI Python| image:: https://img.shields.io/pypi/pyversions/aiosmtpd?logo=python&logoColor=yellow
+   :target: https://pypi.org/project/aiosmtpd/
+   :alt: Supported Python Versions
 .. .. For |GA badge|, don't forget to check actual workflow name in unit-testing-and-coverage.yml
 .. |GA badge| image:: https://github.com/aio-libs/aiosmtpd/workflows/aiosmtpd%20CI/badge.svg
    :target: https://github.com/aio-libs/aiosmtpd/actions
@@ -25,21 +31,15 @@
 .. |readthedocs| image:: https://img.shields.io/readthedocs/aiosmtpd?logo=Read+the+Docs
    :target: https://aiosmtpd.readthedocs.io/en/latest/?badge=latest
    :alt: Documentation Status
-.. |PyPI Version| image:: https://badge.fury.io/py/aiosmtpd.svg
-   :target: https://badge.fury.io/py/aiosmtpd
-   :alt: PyPI Package
-.. |PyPI Python| image:: https://img.shields.io/pypi/pyversions/aiosmtpd.svg
-   :target: https://pypi.org/project/aiosmtpd/
-   :alt: Supported Python Versions
 .. .. Do NOT include the Discourse badge!
 .. .. Below are badges just for PyPI
 .. |GH Release| image:: https://img.shields.io/github/v/release/aio-libs/aiosmtpd?logo=github
    :target: https://github.com/aio-libs/aiosmtpd/releases
    :alt: GitHub latest release
-.. |PullRequests| image:: https://img.shields.io/github/issues-pr/aio-libs/aiosmtpd?logo=GitHub
+.. |GH PRs| image:: https://img.shields.io/github/issues-pr/aio-libs/aiosmtpd?logo=GitHub
    :target: https://github.com/aio-libs/aiosmtpd/pulls
    :alt: GitHub pull requests
-.. |LastCommit| image:: https://img.shields.io/github/last-commit/aio-libs/aiosmtpd?logo=GitHub
+.. |GH LastCommit| image:: https://img.shields.io/github/last-commit/aio-libs/aiosmtpd?logo=GitHub
    :target: https://github.com/aio-libs/aiosmtpd/commits/master
    :alt: GitHub last commit
 
@@ -61,10 +61,19 @@ Starting version 1.3.1,
 files provided through PyPI or `GitHub Releases`_
 will be signed using one of the following GPG Keys:
 
-+-------------------------+----------------+------------------------------+
-| GPG Key ID              | Owner          | Email                        |
-+=========================+================+==============================+
-| ``5D60 CE28 9CD7 C258`` | Pandu E POLUAN | pepoluan at gmail period com |
-+-------------------------+----------------+------------------------------+
-
 .. _`GitHub Releases`: https://github.com/aio-libs/aiosmtpd/releases
+
+.. .. In the second column of the table, prefix each line with "| "
+   .. In the third column, refrain from putting in a direct link to keep the table tidy.
+      Rather, use the |...|_ construct and do the replacement+linking directive below the table
+
++-------------------------+--------------------------------+-----------+
+| GPG Key ID              | Owner / Email                  | Key       |
++=========================+================================+===========+
+| ``5D60 CE28 9CD7 C258`` | | Pandu POLUAN /               | |pep_gh|_ |
+|                         | | pepoluan at gmail period com |           |
++-------------------------+--------------------------------+-----------+
+
+.. .. The |_| contruct is U+00A0 (non-breaking space), defined at the start of the file
+.. |pep_gh| replace:: On |_| GitHub
+.. _`pep_gh`: https://github.com/pepoluan.gpg
diff --git a/README.rst b/README.rst
@@ -2,14 +2,22 @@
  aiosmtpd - An asyncio based SMTP server
 =========================================
 
-| |github license| |PyPI| |PyPI Python|
-| |GA badge| |codecov| |LGTM.com| |readthedocs|
+| |github license| |_| |PyPI Version| |_| |PyPI Python|
+| |GA badge| |_| |codecov| |_| |LGTM.com| |_| |readthedocs|
 |
 | |Discourse|
 
-.. |github license| image:: https://img.shields.io/github/license/aio-libs/aiosmtpd
+.. |_| unicode:: 0xA0
+   :trim:
+.. |github license| image:: https://img.shields.io/github/license/aio-libs/aiosmtpd?logo=Open+Source+Initiative&logoColor=0F0
    :target: https://github.com/aio-libs/aiosmtpd/blob/master/LICENSE
    :alt: Project License on GitHub
+.. |PyPI Version| image:: https://img.shields.io/pypi/v/aiosmtpd?logo=pypi&logoColor=yellow
+   :target: https://pypi.org/project/aiosmtpd/
+   :alt: PyPI Package
+.. |PyPI Python| image:: https://img.shields.io/pypi/pyversions/aiosmtpd?logo=python&logoColor=yellow
+   :target: https://pypi.org/project/aiosmtpd/
+   :alt: Supported Python Versions
 .. .. For |GA badge|, don't forget to check actual workflow name in unit-testing-and-coverage.yml
 .. |GA badge| image:: https://github.com/aio-libs/aiosmtpd/workflows/aiosmtpd%20CI/badge.svg
    :target: https://github.com/aio-libs/aiosmtpd/actions
@@ -20,15 +28,9 @@
 .. |LGTM.com| image:: https://img.shields.io/lgtm/grade/python/github/aio-libs/aiosmtpd.svg?logo=lgtm&logoWidth=18
    :target: https://lgtm.com/projects/g/aio-libs/aiosmtpd/context:python
    :alt: Semmle/LGTM.com quality
-.. |readthedocs| image:: https://readthedocs.org/projects/aiosmtpd/badge/?version=latest
-   :target: https://aiosmtpd.readthedocs.io/en/latest/?badge=latest
+.. |readthedocs| image:: https://img.shields.io/readthedocs/aiosmtpd?logo=Read+the+Docs&logoColor=white
+   :target: https://aiosmtpd.readthedocs.io/en/latest/
    :alt: Documentation Status
-.. |PyPI| image:: https://badge.fury.io/py/aiosmtpd.svg
-   :target: https://badge.fury.io/py/aiosmtpd
-   :alt: PyPI Package
-.. |PyPI Python| image:: https://img.shields.io/pypi/pyversions/aiosmtpd.svg
-   :target: https://pypi.org/project/aiosmtpd/
-   :alt: Supported Python Versions
 .. .. If you edit the above badges, don't forget to edit setup.cfg
 .. .. The |Discourse| badge MUST NOT be included in setup.cfg
 .. |Discourse| image:: https://img.shields.io/discourse/status?server=https%3A%2F%2Faio-libs.discourse.group%2F&style=social

diff --git a/aiosmtpd/__init__.py b/aiosmtpd/__init__.py
@@ -1,4 +1,4 @@
 # Copyright 2014-2021 The aiosmtpd Developers
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "1.4.2"
+__version__ = "1.5.0a1"