Merge branch 'main' into plant_hypo_mero

Author: jmccrae

scripts/validate.py

@@ -9,6 +9,13 @@
 from collections import Counter
 from from_yaml import load
 
+# This is temporary list of exceptions for linking where a taxon name is 
+# used as a generic name. In this case, Wikidata has only a single entry
+# while OEWN distinguishes between the taxon and the generic name 
+# (e.g., hydrangea vs genus Hydrangea).
+WIKIDATA_DUPLICATION_EXCEPTIONS = [
+"Q134842", "Q138789", "Q161142", "Q644312", "Q1423091", "Q5309794", "Q1024025", "Q133876", "Q1783190", "Q1974044", "Q2704518", "Q2708653", "Q1362995", "Q858999", "Q26949", "Q2511051", "Q5230439", "Q4006525", "Q150242", "Q94815", "Q2719974", "Q908118", "Q2589976", "Q355080", "Q138842", "Q5222959", "Q157905", "Q2975317", "Q2496817", "Q2574724", "Q2707277", "Q161075", "Q2720105", "Q157748", "Q156851", "Q156699", "Q159077", "Q133285", "Q1754165", "Q205265", "Q133827", "Q1425929", "Q158975", "Q1969330", "Q310801", "Q648056", "Q1514169", "Q2452570", "Q1354632", "Q3338824", "Q2213704", "Q135537", "Q7840756", "Q134827", "Q199695", "Q1061596", "Q139000", "Q199456", "Q180597", "Q133017", "Q795375", "Q130948", "Q1708883", "Q2304642", "Q4795779", "Q74083", "Q990101", "Q41317", "Q1137414", "Q2136293", "Q905053", "Q300923", "Q2500468", "Q734870", "Q1518954", "Q40621", "Q132672", "Q309466", "Q1060870", "Q130902", "Q14400", "Q130988", "Q319520", "Q131688", "Q179204", "Q595983", "Q19119", "Q1329239", "Q213536", "Q752529", "Q734720", "Q788536", "Q621861", "Q46316", "Q25336", "Q3388845", "Q344662", "Q2706095", "Q185231", "Q190701", "Q756089", "Q899799", "Q369761", "Q811633", "Q185167", "Q310869", "Q132950", "Q1307559", "Q133259", "Q2166073", "Q329334", "Q1136219" ]
+
 def check_symmetry(wn, fix):
     errors = []
     for synset in wn.synsets:
@@ -393,7 +400,7 @@ def main():
         if synset.wikidata:
             ss_wikidatas = synset.wikidata if isinstance(synset.wikidata, list) else [synset.wikidata]
             for wikidata in ss_wikidatas:
-                if wikidata in wikidatas:
+                if wikidata in wikidatas and wikidata not in WIKIDATA_DUPLICATION_EXCEPTIONS:
                     print(f"ERROR: QID {wikidata} is duplicated")
                     errors += 1
                 else:

src/deprecations.csv

@@ -199,3 +199,27 @@
 "ewn-85556310-n","","ewn-81448123-n","","Duplicate (#1134)"
 "ewn-10410299-n","i91815","ewn-10300973-n","i91146","Duplicate (#1150)"
 "ewn-09750685-n","i87839","ewn-09769084-n","i87974","Duplicate (#1199)"
+"ewn-09714775-n","i87600","ewn-09750913-n","i87841","Does not exist (#1202)"
+"ewn-06930168-n","i72891","ewn-06919215-n","i72806","Does not exist (#1202)"
+"ewn-06928089-n","i72876","ewn-06931172-n","i72899","Does not exist (#1202)"
+"ewn-06944501-n","i72998","ewn-06943976-n","i72995","Does not exist (#1202)"
+"ewn-06944668-n","i72999","ewn-06943976-n","i72995","Does not exist (#1202)"
+"ewn-06946323-n","i73012","ewn-86620955-n","","Split into Mikir and Meitei (#1202)"
+"ewn-06949238-n","i73037","ewn-06949067-n","i73035","Not a distinct language (#1202)"
+"ewn-06955789-n","i73081","ewn-06954406-n","i73074","Does not exist (#1202)"
+"ewn-06961022-n","i73109","ewn-06961158-n","i73110","Duplicate (#1202)"
+"ewn-06962811-n","i73122","ewn-06961158-n","i73110","Duplicate (#1202)"
+"ewn-06990608-n","i73293","ewn-06990094-n","i73290","Does not exist (#1202)"
+"ewn-06970264-n","i73163","ewn-06969284-n","i73156","Does not exist (#1202)"
+"ewn-06969880-n","i73160","ewn-06969284-n","i73156","Does not exist (#1202)"
+"ewn-07006307-n","i73399","ewn-07008452-n","i73418","Duplicate (#1202)"
+"ewn-06934169-n","i72922","ewn-06934283-n","i72923","Does not exist (#1202)"
+"ewn-06935458-n","i72932","ewn-06935652-n","i72934","Duplicate (#1202)"
+"ewn-06936357-n","i72941","ewn-06936569-n","i72943","Duplicate (#1202)"
+"ewn-06948847-n","i73033","ewn-06948688-n","i73031","Duplicate (#1202)"
+"ewn-06974800-n","i73194","ewn-06975194-n","i73197","Duplicate (#1202)"
+"ewn-06986165-n","i73263","ewn-06985752-n","i73261","Duplicate (#1202)"
+"ewn-07005467-n","i73391","ewn-07007795-n","i73413","Duplicate (#1202)"
+"ewn-07008186-n","i73416","ewn-07007882-n","i73414","Duplicate (#1202)"
+"ewn-06978186-n","i73213","ewn-06978970-n","i73219","Duplicate (#1202)"
+"ewn-06978029-n","i73212","ewn-06978360-n","i73214","Duplicate (#1202)"

src/yaml/adj.all.yaml

@@ -22714,6 +22714,7 @@
   ili: i1809
   members:
   - fabian
+  - Fabian
   partOfSpeech: s
   similar:
   - 00326179-a
@@ -31044,6 +31045,7 @@
   - streetwise
   - street smart
   - with-it
+  - street-smart
   partOfSpeech: s
   similar:
   - 00440447-a
@@ -47477,7 +47479,7 @@
   members:
   - circular
   - rotary
-  - orbitual
+  - orbital
   partOfSpeech: s
   similar:
   - 00678969-a
@@ -118563,6 +118565,7 @@
   ili: i9297
   members:
   - thickspread
+  - thick-spread
   partOfSpeech: s
   similar:
   - 01698676-a
@@ -163342,6 +163345,7 @@
   ili: i12845
   members:
   - straightarrow
+  - straight-arrow
   partOfSpeech: s
   similar:
   - 02326142-a

src/yaml/adj.pert.yaml

@@ -4957,7 +4957,7 @@
   - cellulosic fibers
   ili: i15048
   members:
-  - cellulosid
+  - cellulosic
   partOfSpeech: a
 02697176-a:
   definition:
@@ -14289,6 +14289,7 @@
   ili: i16168
   members:
   - doric
+  - Doric
   partOfSpeech: a
 02858358-a:
   definition:

src/yaml/adv.all.yaml

@@ -1651,6 +1651,7 @@
   - yet
   - til now
   - until now
+  - till now
   partOfSpeech: r
 00028594-r:
   definition:
@@ -6433,6 +6434,7 @@
   - so far
   - to that extent
   - to that degree
+  - in so far as
   partOfSpeech: r
 00099778-r:
   definition:
@@ -18044,6 +18046,7 @@
   ili: i19962
   members:
   - scot free
+  - scot-free
   partOfSpeech: r
 00262350-r:
   definition: