merge in 2.2.0b1 changes

Author: rouilj

.hgtags

@@ -135,3 +135,4 @@ ff92cc5d9359ee6c83e1a8338b363a9aa421d64c 2.0.0beta0
 0000000000000000000000000000000000000000 2.1.0b1
 013a2e3da452a5dcc05e15f4a03667a8d4bc0870 2.1.0b1
 cbc18a8bc61f120fc27df2a90d7c922b12bf9014 2.1.0
+b3ba03d2b214ce598d3a181f3b43b46c3406713f 2.2.0b1

CHANGES.txt

@@ -11,7 +11,7 @@ Python v2.5 and v2.6.  Starting with the v1.6 releases of Roundup
 v2.7.2 or later are required to run newer releases of Roundup.  From v2.0
 onwards Python 3.4 and later are also supported.
 
-20xx-yy-zz 2.2.0
+2022-yy-zz 2.2.0
 
 Fixed:
 

COPYING.txt

@@ -3,7 +3,7 @@ Note links for http://www.zope.com/Marks and  http://www.ekit.com/ are dead.
 Roundup Licensing
 -----------------
 
-Copyright (c) 2009-2021 Roundup-Team
+Copyright (c) 2009-2022 Roundup-Team
 Copyright (c) 2003-2009 Richard Jones ([email protected])
 Copyright (c) 2002 eKit.com Inc (http://www.ekit.com/)
 Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)

MANIFEST.in

@@ -2,6 +2,7 @@ recursive-include share *
 recursive-include roundup *.*
 recursive-include frontends *.*
 recursive-include scripts *.* *-*
+recursive-include scripts/Docker Dockerfile *.* *_*
 recursive-include tools *.* base64
 recursive-include test *.py *.txt
 recursive-include doc *.html *.png *.txt *.css *.example

RELEASE.txt

@@ -33,13 +33,15 @@ Roundup release checklist:
 3a. Update license end date in COPYING.txt
 3b. Update doc/acknowledgements.txt (add section for
     release, churn contributers etc.). (Use hg churn -c -r ####..####)
+
 4.  Update documentation
       doc/announcement.txt
       doc/upgrading.txt
 4a. cd to website/www and run 'make linkcheck'. See output in
     _tmp/linkcheck/output.txt
        fix broken references in docs
        verify redirects are correct
+
 5.  Update setup.py info if needed (contacts, classifiers, etc.). When
     releasing check that Development Status matches release: stable,
     beta alpha etc.
@@ -70,6 +72,7 @@ Roundup release checklist:
       python3 setup.py build
 
     (sdist generation will fail if this isn't done)
+
 8.  Rebuild documentation in "share/doc/roundup/html"
 
       python3 setup.py build_doc
@@ -87,6 +90,7 @@ Roundup release checklist:
 
     to create binary distributions in wheel format. (egg format is
     deprecated.)
+
 10. Check the roundup.egg-info/SOURCES.txt to make sure that any new files are
     included.  (use hg status --rev <last release or tag>:tip to list changed
     added and removed files. Last release e.g. 1.5.1 where tip is what would
@@ -101,7 +105,6 @@ Roundup release checklist:
     edit MANIFEST.in to include them. For format docs see
     https://packaging.python.org/guides/using-manifest-in/#using-manifest-in
     (Note: files under website/ shouldn't be in the manifest.)
-
 10a: Check for removed files still in manifest:
 
       hg status --rev 2.0.0:tip | sed -ne 's/^R //p' | while read i ; \
@@ -110,7 +113,6 @@ Roundup release checklist:
 
     any file with a count of 2 or more needs to be removed from
     MANIFEST.in and possibly cleaned out of the build tree.
-
 10b: if you added/removed files rebuild starting at step 6a.
 
 11. Unpack the new tarball created in dist/roundup-<version>.tar.gz
@@ -120,11 +122,13 @@ Roundup release checklist:
       b) demo.py
     with all available Python versions.
 11a. (TBD how to test wheel binary distribution before uploading.)
+
 12. Assuming all is well tag the release in the version-control
     system.
       a) hg tag 1.6.0  # use right version. Should create/commit a changeset
       b) hg push       # update main repo
       c) hg sum        # verify that the tag shows up
+
 13. Upload source distribution to PyPI - requires you sign up for a
     pypi account and be added as a maintainer to roundup. Ask existing
     maintainer for access. You can do this two ways:

doc/acknowledgements.txt

@@ -13,20 +13,29 @@ ideas and everything else that helped!
 2.2
 ---
 
-2.2.0
-~~~~~
+2.2.0b1
+~~~~~~~
 
 Maintainer:  John Rouillard, Ralf Schlatterbeck
 
 Release Manager: John Rouillard
 
 Developer activity by changesets::
 
-    FIXME
+  [email protected]         224  ************************************************
+  [email protected]           11 **
+  aburke                    1
+  [email protected]         1
+  [email protected]      1
 
 Other contributers
 
 Marcus Priesch
+John Kristensen (jerrykan)
+Ashely Burke
+Nagy Gabor
+Norbert Schlemmer
+Thomas Arendsen Hein
 
 2.1
 ---