Skip to content

Commit 96f6f47

Browse files
committed
Updated rfc-editor sync code to recognize the new Tooling Issue queue state.
- Legacy-Id: 16730
1 parent 3e67a39 commit 96f6f47

4 files changed

Lines changed: 110 additions & 9 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright The IETF Trust 2019, All Rights Reserved
2+
# -*- coding: utf-8 -*-
3+
4+
from __future__ import absolute_import, print_function, unicode_literals
5+
6+
from django.db import migrations
7+
8+
def forward(apps, schema_editor):
9+
State = apps.get_model('doc','State')
10+
State.objects.get_or_create(type_id='draft-rfceditor', slug='tooling-issue', name='TI',
11+
desc='Tooling Issue; an update is needed to one or more of the tools in the publication pipeline before this document can be published')
12+
13+
def reverse(apps, schema_editor):
14+
State = apps.get_model('doc','State')
15+
State.objects.filter(type_id='draft-rfceditor', slug='tooling-issue').delete()
16+
17+
class Migration(migrations.Migration):
18+
19+
dependencies = [
20+
('doc', '0025_ianaexpertdocevent'),
21+
]
22+
23+
operations = [
24+
migrations.RunPython(forward,reverse)
25+
]

ietf/name/fixtures/names.json

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,6 +2183,71 @@
21832183
"model": "doc.state",
21842184
"pk": 150
21852185
},
2186+
{
2187+
"fields": {
2188+
"desc": "One or more registries need experts assigned",
2189+
"name": "Need IANA Expert(s)",
2190+
"next_states": [],
2191+
"order": 0,
2192+
"slug": "need-experts",
2193+
"type": "draft-iana-experts",
2194+
"used": true
2195+
},
2196+
"model": "doc.state",
2197+
"pk": 151
2198+
},
2199+
{
2200+
"fields": {
2201+
"desc": "One or more expert reviews have been assigned",
2202+
"name": "Reviews assigned",
2203+
"next_states": [],
2204+
"order": 1,
2205+
"slug": "reviews-assigned",
2206+
"type": "draft-iana-experts",
2207+
"used": true
2208+
},
2209+
"model": "doc.state",
2210+
"pk": 152
2211+
},
2212+
{
2213+
"fields": {
2214+
"desc": "Some expert reviewers have identified issues",
2215+
"name": "Issues identified",
2216+
"next_states": [],
2217+
"order": 2,
2218+
"slug": "expert-issues",
2219+
"type": "draft-iana-experts",
2220+
"used": true
2221+
},
2222+
"model": "doc.state",
2223+
"pk": 153
2224+
},
2225+
{
2226+
"fields": {
2227+
"desc": "All expert reviews have been completed with no blocking issues",
2228+
"name": "Expert Reviews OK",
2229+
"next_states": [],
2230+
"order": 2,
2231+
"slug": "reviewers-ok",
2232+
"type": "draft-iana-experts",
2233+
"used": true
2234+
},
2235+
"model": "doc.state",
2236+
"pk": 154
2237+
},
2238+
{
2239+
"fields": {
2240+
"desc": "Tooling Issue; an update is needed to one or more of the tools in the publication pipeline before this document can be published",
2241+
"name": "TI",
2242+
"next_states": [],
2243+
"order": 0,
2244+
"slug": "tooling-issue",
2245+
"type": "draft-rfceditor",
2246+
"used": true
2247+
},
2248+
"model": "doc.state",
2249+
"pk": 155
2250+
},
21862251
{
21872252
"fields": {
21882253
"label": "State"
@@ -2232,6 +2297,13 @@
22322297
"model": "doc.statetype",
22332298
"pk": "draft-iana-action"
22342299
},
2300+
{
2301+
"fields": {
2302+
"label": "IANA Experts State"
2303+
},
2304+
"model": "doc.statetype",
2305+
"pk": "draft-iana-experts"
2306+
},
22352307
{
22362308
"fields": {
22372309
"label": "IANA Review state"
@@ -2688,7 +2760,7 @@
26882760
"groupman_roles": "[\"chair\",\"delegate\"]",
26892761
"has_chartering_process": false,
26902762
"has_default_jabber": false,
2691-
"has_documents": false,
2763+
"has_documents": true,
26922764
"has_meetings": false,
26932765
"has_milestones": false,
26942766
"has_nonsession_materials": false,
@@ -13463,7 +13535,7 @@
1346313535
"fields": {
1346413536
"command": "xym",
1346513537
"switch": "--version",
13466-
"time": "2019-06-28T00:12:25.320",
13538+
"time": "2019-08-28T00:12:18.148",
1346713539
"used": true,
1346813540
"version": "xym 0.4"
1346913541
},
@@ -13474,7 +13546,7 @@
1347413546
"fields": {
1347513547
"command": "pyang",
1347613548
"switch": "--version",
13477-
"time": "2019-06-28T00:12:26.510",
13549+
"time": "2019-08-28T00:12:19.512",
1347813550
"used": true,
1347913551
"version": "pyang 1.7.8"
1348013552
},
@@ -13485,7 +13557,7 @@
1348513557
"fields": {
1348613558
"command": "yanglint",
1348713559
"switch": "--version",
13488-
"time": "2019-06-28T00:12:26.755",
13560+
"time": "2019-08-28T00:12:19.751",
1348913561
"used": true,
1349013562
"version": "yanglint 0.14.80"
1349113563
},
@@ -13496,9 +13568,9 @@
1349613568
"fields": {
1349713569
"command": "xml2rfc",
1349813570
"switch": "--version",
13499-
"time": "2019-06-28T00:12:28.742",
13571+
"time": "2019-08-28T00:12:20.931",
1350013572
"used": true,
13501-
"version": "xml2rfc 2.22.3"
13573+
"version": "xml2rfc 2.23.1"
1350213574
},
1350313575
"model": "utils.versioninfo",
1350413576
"pk": 4

ietf/sync/rfceditor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ def update_drafts_from_queue(drafts):
147147
'ISR-AUTH': slookup['isr-auth'],
148148
'REF': slookup['ref'],
149149
'RFC-EDITOR': slookup['rfc-edit'],
150+
'TI': slookup['tooling-issue'],
150151
'TO': slookup['timeout'],
151152
'MISSREF': slookup['missref'],
152153
}
@@ -300,7 +301,6 @@ def extract_doc_list(parentNode, tagName):
300301
wg = None
301302

302303
l = []
303-
pages = ""
304304
for fmt in node.getElementsByTagName("format"):
305305
l.append(get_child_text(fmt, "file-format"))
306306
file_formats = (",".join(l)).lower()

ietf/sync/tests.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,8 @@ def test_rfc_index(self):
288288
</date>
289289
<format>
290290
<file-format>ASCII</file-format>
291-
<char-count>12345</char-count>
292-
<page-count>42</page-count>
293291
</format>
292+
<page-count>42</page-count>
294293
<keywords>
295294
<kw>test</kw>
296295
</keywords>
@@ -401,6 +400,11 @@ def test_rfc_queue(self):
401400
self.assertEqual(len(drafts), 1)
402401
self.assertEqual(len(warnings), 0)
403402

403+
# Test with TI state introduced 11 Sep 2019
404+
t = t.replace("<state>EDIT*R*A(1G)</state>", "<state>TI</state>")
405+
__, warnings = rfceditor.parse_queue(io.StringIO(t))
406+
self.assertEqual(len(warnings), 0)
407+
404408
draft_name, date_received, state, tags, missref_generation, stream, auth48, cluster, refs = drafts[0]
405409

406410
# currently, we only check what we actually use

0 commit comments

Comments
 (0)