altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: name corrections, flake removal

Browse source
This commit is contained in:
Robert Sparks 2023-08-17 16:34:26 -05:00
parent 22dc5b6dc7
commit 3b067a468a
No known key found for this signature in database
GPG key ID: 6E2A6A5775F91318
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/doc/templatetags/tests_ietf_filters.py
View file

@ -8,7 +8,7 @@ from ietf.doc.factories import (
CharterFactory, CharterFactory,
NewRevisionDocEventFactory, NewRevisionDocEventFactory,
) )
from ietf.doc.models import State, DocEvent, Document from ietf.doc.models import DocEvent
from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs, is_valid_url from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs, is_valid_url
from ietf.person.models import Person from ietf.person.models import Person
from ietf.utils.test_utils import TestCase from ietf.utils.test_utils import TestCase

4
ietf/idindex/index.py
View file

@ -33,7 +33,7 @@ def all_id_txt():
rfcs = dict() rfcs = dict()
for rfc in Document.objects.filter(type_id="rfc"): for rfc in Document.objects.filter(type_id="rfc"):
draft = next(iter(doc.related_that("became_rfc")), None) draft = next(iter(rfc.related_that("became_rfc")), None)
rfcs[rfc.name] = draft.name if draft else rfc.name rfcs[rfc.name] = draft.name if draft else rfc.name
replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"), replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
@ -116,7 +116,7 @@ def all_id2_txt():
rfcs = dict() rfcs = dict()
for rfc in Document.objects.filter(type_id="rfc"): for rfc in Document.objects.filter(type_id="rfc"):
draft = next(iter(doc.related_that("became_rfc")), None) draft = next(iter(rfc.related_that("became_rfc")), None)
rfcs[rfc.name] = draft.name if draft else rfc.name rfcs[rfc.name] = draft.name if draft else rfc.name
replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"), replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),

22
ietf/stats/views.py
View file

@ -285,7 +285,7 @@ def document_stats(request, stats_type=None):
bins = defaultdict(set) bins = defaultdict(set)
for name, words in document_qs.values_list("name", "words"): for name, words in document_qs.values_list("name", "words"):
bins[put_into_bin(words, bin_size)].add(canonical_name) bins[put_into_bin(words, bin_size)].add(name)
series_data = [] series_data = []
for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]): for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]):
@ -309,20 +309,20 @@ def document_stats(request, stats_type=None):
submission_types[doc_name] = file_types submission_types[doc_name] = file_types
doc_names_with_missing_types = {} doc_names_with_missing_types = {}
for doc_name, rev in document_qs.values_list("name", "rev"): for doc_name, doc_type, rev in document_qs.values_list("name", "type_id" "rev"):
types = submission_types.get(doc_name) types = submission_types.get(doc_name)
if types: if types:
for dot_ext in types.split(","): for dot_ext in types.split(","):
bins[dot_ext.lstrip(".").upper()].add(canonical_name) bins[dot_ext.lstrip(".").upper()].add(doc_name)
else: else:
if canonical_name.startswith("rfc"): if doc_type == "rfc":
filename = canonical_name filename = doc_name
else: else:
filename = canonical_name + "-" + rev filename = doc_name + "-" + rev
doc_names_with_missing_types[filename] = canonical_name doc_names_with_missing_types[filename] = doc_name
# look up the remaining documents on disk # look up the remaining documents on disk
for filename in itertools.chain(os.listdir(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), os.listdir(settings.RFC_PATH)): for filename in itertools.chain(os.listdir(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), os.listdir(settings.RFC_PATH)):
@ -335,10 +335,10 @@ def document_stats(request, stats_type=None):
if not any(ext==allowlisted_ext for allowlisted_ext in settings.DOCUMENT_FORMAT_ALLOWLIST): if not any(ext==allowlisted_ext for allowlisted_ext in settings.DOCUMENT_FORMAT_ALLOWLIST):
continue continue
canonical_name = doc_names_with_missing_types.get(basename) name = doc_names_with_missing_types.get(basename)
if canonical_name: if name:
bins[ext.upper()].add(canonical_name) bins[ext.upper()].add(name)
series_data = [] series_data = []
for fmt, names in sorted(bins.items(), key=lambda t: t[0]): for fmt, names in sorted(bins.items(), key=lambda t: t[0]):
@ -355,7 +355,7 @@ def document_stats(request, stats_type=None):
bins = defaultdict(set) bins = defaultdict(set)
for name, formal_language_name in document_qs.values_list("name", "formal_languages__name"): for name, formal_language_name in document_qs.values_list("name", "formal_languages__name"):
bins[formal_language_name or ""].add(canonical_name) bins[formal_language_name or ""].add(name)
series_data = [] series_data = []
for formal_language, names in sorted(bins.items(), key=lambda t: t[0]): for formal_language, names in sorted(bins.items(), key=lambda t: t[0]):

2
ietf/sync/rfceditor.py
View file

@ -17,7 +17,7 @@ from django.utils.encoding import smart_bytes, force_str
import debug # pyflakes:ignore import debug # pyflakes:ignore
from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName, from ietf.doc.models import ( Document, State, StateType, DocEvent, DocRelationshipName,
DocTagName, RelatedDocument ) DocTagName, RelatedDocument )
from ietf.doc.expire import move_draft_files_to_archive from ietf.doc.expire import move_draft_files_to_archive
from ietf.doc.utils import add_state_change_event, prettify_std_name, update_action_holders from ietf.doc.utils import add_state_change_event, prettify_std_name, update_action_holders