Prepare 2.2 releasetrollius-2.2

2 files changed, 20 insertions, 4 deletions

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 8c54c96..3170470 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -5,8 +5,20 @@ Change log
 .. warning::
    :ref:`The Trollius project is now deprecated! <deprecated>`
 
-Version 2.1
-===========
+Version 2.2 (2018-03-09)
+========================
+
+Changes:
+
+* ``run_aiotest.py`` has been removed since the ``aiotest`` project has been
+  removed
+* Add the "No Maintenance Intended" badge to README
+* The Trollius documentation is no longer online:
+  http://trollius.readthedocs.io/ has been removed
+* Update the GitHub URL to: https://github.com/vstinner/trollius
+
+Version 2.1 (2016-02-05)
+========================
 
 Changes:
 
diff --git a/setup.py b/setup.py
index 64f14da..f68e143 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 # Prepare a release:
 #
+#  - git pull --rebase
 #  - fill trollius changelog
 #  - run maybe ./update-asyncio-step1.sh
 #  - run all tests on Linux: tox
@@ -17,15 +18,18 @@
 #
 #  - git tag trollius-VERSION
 #  - git push --tags
-#  - On Linux: python setup.py register sdist upload
+#  - Remove untracked files/dirs: git clean -fdx
+#  - On Linux: python2 setup.py sdist
 #    FIXME: don't use bdist_wheel because of
 #    FIXME: https://github.com/haypo/trollius/issues/1
+#  - twine upload dist/*
 #  - On Windows: python releaser.py release
 #
 # After the release:
 #
 #  - increment version in setup.py (version) and doc/conf.py (version, release)
-#  - git commit -a && git push
+#  - git commit -a -m "post release X.Y"
+#  - git push
 
 import os
 import sys