Merged and adapted trunk (7.25.0 and change)

 - Legacy-Id: 18822

Author: rjsparks

bin/mkrelease

@@ -138,6 +138,9 @@ if [ $# -lt $ARGMIN ]; then
     die "$# arguments found, $ARGMIN required"
 fi
 
+by=$(getent passwd $(whoami) | cut -d ':' -f 5 | tr -d ',')
+[ -z "$by" ] && die "Can't determine the real name of the user running this script"
+
 VER=$1
 
 REPO=$(svn info | grep "^Repository Root:" | awk '{ print $3 }')
@@ -307,7 +310,7 @@ $do svn cp $REPO/$SRC $REPO/tags/dev/$DEV -m "Creating new tag 'tags/dev/$DEV' f
 
 $do svn update -q
 
-[ -d ~/src/db/mail ] || mkdir ~/src/db/mail
+[ -d ~/src/db/mail ] || mkdir -p ~/src/db/mail
 echo "
 Hi,
 
@@ -326,7 +329,7 @@ For development, copy the new development version instead:
 
 Regards,
 
-	Henrik
+	$by
 	(via the mkrelease script)
 " > ~/src/db/mail/release-mail-v$VER.txt
 
@@ -335,6 +338,7 @@ cat ~/src/db/mail/release-mail-v$VER.txt | $do mail -s "New datatracker release:
 cat ~/src/db/mail/release-mail-v$VER.txt | $do mail -s "New datatracker release: v$VER" iesg@ietf.org wgchairs@ietf.org codesprints@ietf.org -b henrik@levkowetz.com
 
 
-$do toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
-$do toolpush /www/tools.ietf.org/tools/atomfeed.xml
+# Removed at Henrik's suggestion
+#$do toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
+#$do toolpush /www/tools.ietf.org/tools/atomfeed.xml
 

changelog

@@ -1,3 +1,162 @@
+ietfdb (7.25.0) ietf; urgency=medium
+
+  **Timezone tools on agenda page, other enhancements **
+
+  * Merged in [18712] from jennifer@painless-security.com:
+    Add timezone support to agenda weekview; display UTC on UTC agenda
+    page. Fixes #3111.
+
+  * Merged in [18689] from kivinen@iki.fi:
+    New version of the timezone support for agenda. Now the ongoing
+    bars work. This also moves the javascript from the agenda.html
+    to separate timezone.js file. This commit does not include the
+    moment and moment-timezone javascript libraries that are
+    needed to get this working, they need to be added to
+    ietf/externals/static separately.
+
+  * Add a more granular setting for enabling extra debugging on the agenda
+    page. Commit ready for merge.
+
+  * Merged in [18803] from jennifer@painless-security.com:
+    Integrate week-view timezone handling with changes to main agenda page.
+
+  * recursively create place to stage mail from mkrelease. Remove
+    toolsfeed/toolspush from mkrelease.
+
+  * Allow setuptools to progress past py27
+
+  * Merged in [18782] from rjsparks@nostrum.com:
+    Remove HistoricalGroupFeatures. Fixes #3152.
+
+  * Merged in [18791] from rjsparks@nostrum.com:
+    Allow ballot text to be edited after the ballot is approved. Fixes
+    #3157. Related to #3119.
+
+  * Merged in [18798] from jennifer@painless-security.com:
+    Improve handling of submissions for closed working groups. Fixes #3058.
+
+  * Merged in [18808] from rjsparks@nostrum.com:
+    Tweaked schedule editor colors to match preferences chosen by Liz.
+    Added coloration for sessions having the IAB as a parent.
+
+ -- Robert Sparks <rjsparks@nostrum.com>  01 Feb 2021 16:23:17 +0000
+
+ietfdb (7.24.0) ietf; urgency=medium
+
+  **Bugfixes and minor features**
+
+  * Refactored the import_mailman_listinfo command to run faster (20s 
+    instead of 30+m) and added time logging (for --verbosity 2)
+
+  * Upgraded the required versions of mypy and django-stubs to the latest 
+    that support Django 2.2.  Fixed some issues found by after the upgrades.
+
+  * Fixed a test that was broken when run on December 1st.
+
+  * Added some comment information to settings.py
+
+  * Related to issue #2186:  The issue asked for changing review requests 
+    from state 'assigned' back to state 'requested' if the last associated 
+    assignment is withdrawn.  However, the code to implement this makes the 
+    change for all assignment states, and also when there has been no state 
+    change.  Changed to be more discerning.
+
+  * Make the order of addresses returned by gather_address_lists() 
+    consistent rather than randomly varying from invocation to invocation.
+
+  * Removed log noise when running in repair mode.
+
+  * Added ordering to Session.constraints() to make page renderings stable.
+
+  * When doing test-crawling, ignore variations of the 'next=' query arg.  
+    (The code ignores other query args if 'next' is given).
+
+  * It's very hard to distinguish the different constraint classes on the 
+    meeting requests summary page.  Added numbers 1) 2) 3) etc. to make that 
+    easier.
+
+  * Updated hold-for-merge and ready-for-merge lists
+
+  * Merged in [18714] from rjsparks@nostrum.com:
+    Send email to new mailtrigger controlled destinations when iana expert 
+    review state changes. Fixes #3121.  
+
+  * Merged in [18718] from rjsparks@nostrum.com:
+    Allow program leads to request meetings. Fixes #3141.  
+
+  * Added a README about the custom font-datatracker font library, and how 
+    to add glyphs to it.
+
+  * Added sorting of agenda filter keywords to make page rendering stable.
+
+  * Added additional sorting of Session.constraints() return value to make 
+    page rendering stable.
+
+  * Added sorting of sessions to make make the materials page rendering 
+    stable.
+
+  * Removed a timezone-naive invisible HTML element that had been used for 
+    debugging.
+
+  * Fixed some instances of invalid HTML.
+
+  * Updated the default settings to match document directories moved from 
+    /a/www/ietf-ftp/ to /a/ietfdata/doc/
+
+  * Merged in [18719] from housley@vigilsec.com:
+    Automatically move the IESG document state when a ballot is issued, 
+    prevent a writeup change or re-issue of ballot if the document is already 
+    approved, and warn about issuing ballots before the IETF Last Call is 
+    finished. Fixes #3119. 
+
+  * Merged in [18748] from rjsparks@nostrum.com:
+    Populate interim approved email correctly. Fixes #3150.  
+
+  * Merged in [18753] from henrik@levkowetz.com:
+    Added test case setUp() and tearDown() code to create yang model test 
+    directories for ApiSubmitTests.   
+
+  * Merged in [18723] from mrcullen42@gmail.com:
+    Fixes #3032: Only send expiration warnings for drafts with a 'draft' 
+    state of 'active', to match the drafts that we will actually expire.   
+
+  * Copy both rjsparks and henrik on messages about merged branches.
+
+  * Merged in [18724] from jennifer@painless-security.com:
+    Allow cancellation of individual sessions of multi-session interim 
+    meeting. Fixes #2959.  
+
+  * Merged in [18729] from rcross@amsl.com:
+    Add argument 'days' to get_meeting() to allow specifying lag time 
+
+  * Merged in [18736] from rjsparks@nostrum.com:
+    Fixup document that had no type. Remove dangling review document. Fixes 
+    #3145.  
+
+  * Merged in [18743] from rjsparks@nostrum.com:
+    Cleaning some pyflakes that made it into the last commit.  
+
+  * Merged in [18744] from rjsparks@nostrum.com:
+    Cleaner title on the document history page when the document is an rfc 
+    (or any other document where rev is empty).  
+
+  * Don't allow mysqlclient 2.0.2 due to compilation issues.
+
+  * Merged in [18751] from henrik@levkowetz.com:
+    Added a sort of author names for stability of some stats pages.   
+
+  * Merged in [18752] from henrik@levkowetz.com:
+    Added a 'dumptime' entry to the JSON return from /api/version, in order 
+    to be able to make sure that running 'test-crawl --diff' will use database 
+    data from the same dump to avoid false page diff positives.   
+
+  * Merged in [18765] from henrik@levkowetz.com:
+    Added 'De' as a surname particle, in addition to 'de' (for author Luca 
+    De Cicco).   
+
+ -- Robert Sparks <rjsparks@nostrum.com>  17 Dec 2020 15:42:58 +0000
+
+
 ietfdb (7.23.0) ietf; urgency=medium
 
   **Code Sprint 109, and more**

hold-for-merge

@@ -1,7 +1,6 @@
 # -*- conf-mode -*-
 
-/personal/jennifer/7.22.1.dev0@18712    # Hold for revision based on timezone-aware code
-/personal/kivinen/7.22.1.dev0@18689     # Hold for revision based on timezone-aware code
+# Everyting below this line is OBE
 
 /personal/rcross/7.19.1.dev0@18663
 /personal/rcross/7.19.1.dev0@18662

ietf/__init__.py

@@ -5,13 +5,13 @@
 from . import checks                           # pyflakes:ignore
 
 # Don't add patch number here:
-__version__ = "7.23.1.dev0"
+__version__ = "7.25.1.dev0"
 
 # set this to ".p1", ".p2", etc. after patching
 __patch__   = ""
 
 __date__    = "$Date$"
 
-__rev__     = "$Rev$ (dev) Latest release: Rev. 18707 "
+__rev__     = "$Rev$ (dev) Latest release: Rev. 18814 "
 
 __id__      = "$Id$"

ietf/bower.json

@@ -13,7 +13,8 @@
     "js-cookie": "~2",
     "jquery": "~1",
     "jquery.tablesorter": "~2",
-    "moment": "~1",
+    "moment": "~2",
+    "moment-timezone": "~0",
     "respond": "~1",
     "select2": "~3",
     "select2-bootstrap-css": "~1",
@@ -34,6 +35,11 @@
         "./fonts/*"
       ]
     },
+    "moment": {
+        "main": [
+             "min/moment.min.js"
+        ]
+    },
     "tablesorter": {
         "main": [
             "dist/js/jquery.tablesorter.combined.min.js",

ietf/doc/tests_ballot.py

@@ -394,9 +394,6 @@ def test_edit_ballot_writeup_already_approved(self):
                 ballot_writeup="This is a simple test.",
                 save_ballot_writeup="1"))
         self.assertEqual(r.status_code, 200)
-        msgs = [m for m in r.context['messages']]
-        self.assertTrue(1 == len(msgs))
-        self.assertTrue("Writeup not changed" in msgs[0].message)
         d = Document.objects.get(name=draft.name)
         self.assertTrue('approved' == d.get_state_slug('draft-iesg'))
 

ietf/doc/views_ballot.py

@@ -8,7 +8,6 @@
 
 from django import forms
 from django.conf import settings
-from django.contrib import messages
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.defaultfilters import striptags
@@ -610,19 +609,19 @@ def ballot_writeupnotes(request, name):
         if form.is_valid():
             if prev_state.slug in ['ann', 'approved', 'rfcqueue', 'pub']:
                 ballot_already_approved = True
-                messages.warning(request, "There is an approved ballot for %s.  Writeup not changed." % doc.name)
             else:
                 ballot_already_approved = False
-                t = form.cleaned_data["ballot_writeup"]
-                if t != existing.text:
-                    e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login)
-                    e.by = login
-                    e.type = "changed_ballot_writeup_text"
-                    e.desc = "Ballot writeup was changed"
-                    e.text = t
-                    e.save()
-                elif existing.pk == None:
-                    existing.save()
+
+            t = form.cleaned_data["ballot_writeup"]
+            if t != existing.text:
+                e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login)
+                e.by = login
+                e.type = "changed_ballot_writeup_text"
+                e.desc = "Ballot writeup was changed"
+                e.text = t
+                e.save()
+            elif existing.pk == None:
+                existing.save()
 
             if "issue_ballot" in request.POST and not ballot_already_approved:
                 if prev_state.slug in ['watching', 'writeupw', 'goaheadw']: