Re: Does anybody have release plans for current roundup devel?

* Joseph Myers <[email protected]> [20190220 04:49]:
> On Tue, 19 Feb 2019, John P. Rouillard wrote:
> 
> > There is at least one patch:
> > 
> >   https://issues.roundup-tracker.org/issue2551023
> > 
> > that could go into a 1.6.1 release. Thomas Hein do you have a cheat
> > sheet for creating a 1.6 release branch and tagging a 1.6.1 release?
> 
> I've previously suggested that my fix for issue2550994 (breakage caused by 
> configparser backports; fix is 0cdf19b82354) ought to be added to the 1.6 
> branch (which already exists) if such a release is to be made.

This would be:

hg co maint-1.6
hg graft -r 0cdf19b82354
# resolve merge conflict in CHANGES.txt by removing everything new
# except the entry for fixing issue2550994

I have done this (takes less than a minute), but I'm reluctant to
push it without testing it, so I have attached it here.
You can use "hg import roundup161-issue2550994.patch" while on the
maint-1.6 branch.

While looking at this I noticed that "hg log -b maint-1.6" shows
things that are not mentioned in CHANGES.txt. I don't know if this
was to make merging it into default easier (no conflicts), or to
avoid extra work, or if it has just been forgotten :)

> (Though 
> I'm more interested in having a 2.0.0 release from current trunk, with 
> successive 2.0.1, 2.0.2 etc. following reasonably quickly should issues be 
> found with the changes in 2.0.)

I'd like to see a maintained 1.6 branch for some time, e.g. the gpg
problems in the default branch would be problematic for us. Or does
it work and just the tests fail?

Regards,
Thomas

-- 
Thomas Arendsen Hein <[email protected]> - OpenPGP key: 0x5BB3F5195816791A
https://blogs.intevation.de/thomas/         - https://intevation.de/~thomas/
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner

_______________________________________________
Roundup-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/roundup-devel

# HG changeset patch
# User Joseph Myers <[email protected]>
# Date 1534726216 0
#      Mon Aug 20 00:50:16 2018 +0000
# Branch maint-1.6
# Node ID 3dc8013dc164f6529c1399057bffcaf81dc368b9
# Parent  d698d3d843a92eeb85dca582a52437a50aa225f2
Fix issue2550994: breakage caused by configparser backports.

diff -r d698d3d843a9 -r 3dc8013dc164 CHANGES.txt
--- a/CHANGES.txt	Thu Sep 06 17:04:49 2018 -0400
+++ b/CHANGES.txt	Mon Aug 20 00:50:16 2018 +0000
@@ -11,6 +11,18 @@
 v2.7.2 is required to run newer releases of Roundup.
 
 
+2019-??-?? 1.6.x
+
+Features:
+
+- ...
+
+Fixed:
+
+- issue2550994: avoid breakage caused by use of backports of Python 3
+  configparser module to Python 2. (Joseph Myers)
+
+
 2018-07-13 1.6.0
 
 Features:
diff -r d698d3d843a9 -r 3dc8013dc164 roundup/configuration.py
--- a/roundup/configuration.py	Thu Sep 06 17:04:49 2018 -0400
+++ b/roundup/configuration.py	Mon Aug 20 00:50:16 2018 +0000
@@ -2,9 +2,15 @@
 #
 __docformat__ = "restructuredtext"
 
-try:
+# Some systems have a backport of the Python 3 configparser module to
+# Python 2: <https://pypi.org/project/configparser/>.  That breaks
+# Roundup if used with Python 2 because it generates unicode objects
+# where not expected by the Python code.  Thus, a version check is
+# used here instead of try/except.
+import sys
+if sys.version_info[0] > 2:
     import configparser			# Python 3
-except ImportError:
+else:
     import ConfigParser as configparser	# Python 2
 
 import getopt
@@ -12,7 +18,6 @@
 import logging, logging.config
 import os
 import re
-import sys
 import time
 import smtplib