From f78ab2336bfaae369acb1a210ec5bb6d2d3d68c4 Mon Sep 17 00:00:00 2001 From: James Meakin <12661555+jmsmkn@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:34:26 +0100 Subject: [PATCH] Update domains --- .github/workflows/sync.yml | 3 ++ pyproject.toml | 1 + pyswot/vendor/domains.py | 79 ++++++++++++++------------------------ pyswot/vendor/stoplist.py | 21 +--------- pyswot/vendor/tlds.py | 2 +- 5 files changed, 36 insertions(+), 70 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index bb11466..882e3ca 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -33,6 +33,9 @@ jobs: - name: Update Vendor Sources run: poetry run python ./scripts/update_vendor.py + - name: Run black + run: poetry run black . + - name: Run pre-commit run: pre-commit run -a continue-on-error: true diff --git a/pyproject.toml b/pyproject.toml index 16855cc..b932d16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ pytest-xdist = "*" pytest-randomly = "*" pytest-cov = "*" chardet = "*" +black = "*" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/pyswot/vendor/domains.py b/pyswot/vendor/domains.py index b445a8a..49ca6b6 100644 --- a/pyswot/vendor/domains.py +++ b/pyswot/vendor/domains.py @@ -1,5 +1,5 @@ # DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN BY update_vendor.py -# From https://github.com/JetBrains/swot.git@2a0b58aa +# From https://github.com/JetBrains/swot.git@5fbe1f98 from typing import Dict, List @@ -16152,10 +16152,7 @@ ], ".bialik.ort.org.il": ["אורט ביאליק", "Ort Bialik"], ".ebin.ort.org.il": ["Ort Ebin High School"], - ".gram.ort.org.il": [ - "מכללת אורט גבעת רם, ירושלים", - "Michlelet Ort Givat Ram, Jerusalem", - ], + ".gram.ort.org.il": ["מכללת אורט גבעת רם"], ".guttman.ort.org.il": ["אורט גוטמן", "ORT GUTTMAN"], ".holon.ort.org.il": [ "אורט חולון", @@ -18997,6 +18994,7 @@ ".saegis.edu.lk": ["Saegis Campus ", "Saegis Campus "], ".sltc.edu.lk": ["SLTC", "Sri Lanka Technological Campus"], ".esoft.lk": ["ESOFT Metro Campus"], + ".gatewaycollege.lk": ["Gateway College"], ".dtet.gov.lk": [ "Department of Technical Education & Training, Sri Lanka" ], @@ -22577,10 +22575,7 @@ ".mahemc.tu.edu.np": ["Mahendra Multiple Campus Nepalgunj"], ".memc.tu.edu.np": ["Mechi Multiple Campus TU Nepal"], ".mmamc.tu.edu.np": ["Mahendra Morang Adarsh Multiple Campus, Nepal"], - ".pmc.tu.edu.np": [ - "पाटन संयुक्त क्याम्पस", - "Patan Multiple Campus, Lalitpur", - ], + ".pmc.tu.edu.np": ["पाटन संयुक्त क्याम्पस", "Patan Multiple Campus, Lalitpur"], ".prnc.tu.edu.np": ["Prithivi narayan campus"], ".rrlc.tu.edu.np": [ "Ratna Rajya Laxmi Campus", @@ -30240,6 +30235,7 @@ ".gfml.si": ["Gimnazija Franca Miklošiča Ljutomer"], ".gimkr.si": ["Gimnazija Kranj"], ".gimnazija-skofjaloka.si": ["Gimnazija Škofja Loka"], + ".dijak.gssk.si": ["Gimnazija in srednja šola Kočevje"], ".ijs.si": ["Jozef Stefan Institute"], ".os-hoce.si": ["Osnovna šola Dušana Flisa Hoče"], ".osbrod.si": ["Osnovna Šola Vižmarje-Brod"], @@ -30635,10 +30631,7 @@ ".ayw.ac.th": ["อยุธยาวิทยาลัย", "Ayutthaya Witthayalai"], ".bcc.ac.th": ["Bangkok Christian College", "bcc.ac.th"], ".bisphuket.ac.th": ["British International School Phuket"], - ".bru.ac.th": [ - "มหาวิทยาลัยราชภัฏบุรีรัมย์", - "Buriram Rajabhat University", - ], + ".bru.ac.th": ["มหาวิทยาลัยราชภัฏบุรีรัมย์", "Buriram Rajabhat University"], ".bsru.ac.th": ["Bansomdejchaopraya Rajabhat University"], ".bu.ac.th": ["Bangkok University"], ".buu.ac.th": ["Burapha University"], @@ -30655,10 +30648,7 @@ "Chiangkhamwittayakhom School", ], ".chiangmai.ac.th": ["Chiang Mai University"], - ".chonvc.ac.th": [ - "วิทยาลัยอาชีวศึกษาชลบุรี", - "Chonburi Vocational College", - ], + ".chonvc.ac.th": ["วิทยาลัยอาชีวศึกษาชลบุรี", "Chonburi Vocational College"], ".student.chula.ac.th": ["Chulalongkorn University"], ".chula.ac.th": ["Chulalongkorn University"], ".cmkl.ac.th": ["CMKL University"], @@ -30667,16 +30657,10 @@ ".cmu.ac.th": ["www.cmu.ac.th", "Chiang Mai University"], ".cmvc.ac.th": ["Chiang Mai Vocational College"], ".cpc.ac.th": ["Rajamangala University of Technology Tawan-ok"], - ".cpru.ac.th": [ - "มหาวิทยาลัยราชภัฏชัยภูมิ", - "Chaiyaphum Rajabhat University", - ], + ".cpru.ac.th": ["มหาวิทยาลัยราชภัฏชัยภูมิ", "Chaiyaphum Rajabhat University"], ".cpu.ac.th": ["Chaopraya University "], ".cra.ac.th": ["ราชวิทยาลัยจุฬาภรณ์", "chulabhorn royal academy"], - ".crru.ac.th": [ - "มหาวิทยาลัยราชภัฏเชียงราย", - "chiang rai rajabhat university", - ], + ".crru.ac.th": ["มหาวิทยาลัยราชภัฏเชียงราย", "chiang rai rajabhat university"], ".damrong.ac.th": ["โรงเรียนดำรงราษฎร์สงเคราะห์ ", "Damrongratsongkroh"], ".debsirin.ac.th": ["เทพศิรินทร์", "Debsirin"], ".dkttc.ac.th": ["วิทยาลัยเทคนิคดอกคำใต้", "DOKKHAMTAI TECHNICAL COLLEGE"], @@ -30815,10 +30799,7 @@ "วิทยาลัยเทคโนโลยีพงษ์สวัสดิ์", "Pongsawadi Technological College", ], - ".prc.ac.th": [ - "โรงเรียนปรินส์รอยแยลส์วิทยาลัย", - "The Prince Royal's College", - ], + ".prc.ac.th": ["โรงเรียนปรินส์รอยแยลส์วิทยาลัย", "The Prince Royal's College"], ".ps.ac.th": ["Potisarnpittayakorn School", "Potisarnpittayakorn School"], ".psru.ac.th": ["Pibulsongkram Rajabhat university"], ".psu.ac.th": ["Prince of Songkla University"], @@ -30892,10 +30873,7 @@ "วิทยาลัยการอาชีพสอง", "Song Industrial and Community Education College", ], - ".southeast.ac.th": [ - "วิทยาลัยเซาธ์อีสท์บางกอก", - "Southeast Bangkok College", - ], + ".southeast.ac.th": ["วิทยาลัยเซาธ์อีสท์บางกอก", "Southeast Bangkok College"], ".spu.ac.th": ["Sripatum University"], ".sriyapai.ac.th": ["โรงเรียนศรียาภัย", "SriyapaiSchool"], ".srru.ac.th": ["มหาวิทยาลัยราชภัฏสุรินทร์"], @@ -30920,18 +30898,12 @@ "Triam Udom Suksa Pattanakarn School", ], ".ubu.ac.th": ["Ubonratchathani University"], - ".udontech.ac.th": [ - "วิทยาลัยเทคนิคอุดรธานี", - "Udon Thani Technical College", - ], + ".udontech.ac.th": ["วิทยาลัยเทคนิคอุดรธานี", "Udon Thani Technical College"], ".365.udru.ac.th": [ "มหาวิทยาลัยราชภัฏอุดรธานี", "UDON THANI RAJABHAT UNIVERSITY", ], - ".udru.ac.th": [ - "UDON THANI RAJABHAT UNIVERSITY", - "มหาวิทยาลัยราชภัฏอุดรธานี", - ], + ".udru.ac.th": ["UDON THANI RAJABHAT UNIVERSITY", "มหาวิทยาลัยราชภัฏอุดรธานี"], ".up.ac.th": ["มหาวิทยาลัยพะเยา", "University of Phayao"], ".uru.ac.th": ["Uttaradit Rajabhat University"], ".utc.ac.th": [ @@ -32494,6 +32466,9 @@ "Nelson Mandela African Institution of Science and Technology", "Nelson Mandela African Institution of Science and Technology", ], + ".nyaishozicollege.ac.tz": [ + "Nyaishozi College of Health and Allied Sciences" + ], ".openuniversity.ac.tz": ["Open University of Tanzania"], ".saut.ac.tz": ["St. Augustine University of Tanzania"], ".suanet.ac.tz": ["Sokoine University of Agriculture"], @@ -32676,6 +32651,10 @@ "Университет имени Альфреда Нобеля (Днепр,Украина)", "Alfred Nobel University", ], + ".duikt.edu.ua": [ + "Державний університет інформаційно-комунікаційних технологій", + "State University of Information and Communication Technologies", + ], ".duit.edu.ua": [ "Державний університет інфраструктури та технологій", "State University of infrastructure and technologies", @@ -34190,10 +34169,19 @@ "format - username@dovergramboys.kent.sch.uk", "Dover grammar school for boys, kent, uk", ], + ".bordengrammar.Kent.sch.uk": [ + "Borden Grammar School", + "Borden Grammar School", + ], ".judd.Kent.sch.uk": [ "The Judd School, Tonbridge, Kent, UK", "format - username@judd.kent.sch.uk", ], + ".mgs.Kent.sch.uk": [ + "Maidstone grammar school, Kent, UK", + "format - username@mgs.kent.sch.uk", + ], + ".nks.Kent.sch.uk": ["Norton Knatchbull School"], ".st-james.barnet.sch.uk": ["St James' Catholic High School"], ".bishopveseys.bham.sch.uk": ["Bishop Vesey's Grammar School"], ".wheelerslane.bham.sch.uk": ["Wheelers Lane Technology College "], @@ -34233,15 +34221,6 @@ "Sir John Lawes School, Manland Way, Harpenden AL5 4QP" ], ".stanborough.herts.sch.uk": ["Stanborough School"], - ".bordengrammar.kent.sch.uk": [ - "Borden Grammar School", - "Borden Grammar School", - ], - ".mgs.kent.sch.uk": [ - "Maidstone grammar school, Kent, UK", - "format - username@mgs.kent.sch.uk", - ], - ".nks.kent.sch.uk": ["Norton Knatchbull School"], ".tiffin.kingston.sch.uk": ["Tiffin School, Kingston upon Thames, Surrey"], ".hodgson.lancs.sch.uk": ["Hodgson Academy"], ".millfield.lancs.sch.uk": ["Millfield Science & Performing Arts College"], diff --git a/pyswot/vendor/stoplist.py b/pyswot/vendor/stoplist.py index fe1c6d0..8f60abc 100644 --- a/pyswot/vendor/stoplist.py +++ b/pyswot/vendor/stoplist.py @@ -1,5 +1,5 @@ # DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN BY update_vendor.py -# From https://github.com/JetBrains/swot.git@2a0b58aa +# From https://github.com/JetBrains/swot.git@5fbe1f98 STOPLIST = frozenset( [ @@ -142,14 +142,12 @@ "aluno.unicarioca.edu.br", "aluno.unip.br", "alunos.colegiosaogoncalo.pt", - "alunos.estacio.br", "alunos.estgv.ipv.pt", "alunos.ipb.pt", "alunos.isel.pt", "alunos.unisagrado.edu.br", "alunos.unisanta.br", "alunosatc.edu.br", - "alunouninter.com", "america.edu", "amity.edu", "ammanu.edu.jo", @@ -169,7 +167,6 @@ "art.dmu.edu.eg", "art.edu.lv", "asoiu.edu.az", - "asu.edu", "asu.edu.eg", "ataa.sch.sa", "aths.ac.ae", @@ -370,7 +367,6 @@ "daytonastate.edu", "dcic.me", "ddsbstudent.ca", - "deakin.edu.au", "dekalbschoolsga.org", "deltacollege.edu", "deped.gov.ph", @@ -416,7 +412,6 @@ "ecut.edu.cn", "edu.atec.pt", "edu.azores.gov.pt", - "edu.bme.hu", "edu.cdsj6.edu.mo", "edu.em-lyon.com", "edu.fh-wien.ac.at", @@ -485,7 +480,6 @@ "etu.u-bordeaux.fr", "etu.u-pec.fr", "etu.univ-amu.fr", - "etu.univ-amu.fr", "etud.u-picardie.fr", "etudiant.edcparis.edu", "etudiant.univ-rennes1.fr", @@ -503,7 +497,6 @@ "feucanvas.edu.ph", "fgs.ju.edu.jo", "fh-htachur.ch", - "fh-salzburg.ac.at", "fh-schwaebischhall.de", "fh.unair.ac.id", "fhss.sjp.ac.lk", @@ -659,6 +652,7 @@ "istitutomasterform.it", "istudent.unisel.edu.my", "itb.edu.ec", + "itc.edu.kh", "itca.edu.sv", "itculiacan.edu.mx", "iti.edu.ec", @@ -668,7 +662,6 @@ "itstep.academy", "ittc.edu.vn", "itu.ac.tzbjtu.edu.cn", - "itu.edu.tr", "iu.edu.jo", "iub.edu.pk", "ivytech.edu", @@ -718,7 +711,6 @@ "kmitl.ac.th", "kmitl.ac.th", "kmust.edu.cn", - "kmutt.ac.th", "knights.ucf.edu", "knust.edu.gh", "kocaeli.edu.tr", @@ -1131,7 +1123,6 @@ "peking.pkumail.tech", "pekingwebmail.tech", "petkasem.ac.th", - "pg.edu.pl", "pgc.edu.pk", "philander.edu", "philips.edu.ar", @@ -1214,7 +1205,6 @@ "rule.edu.kh", "rupp.edu.kh", "rutgers.edu", - "rwth-aachen.de", "s-mu.edu.eg", "s.hlju.edu.cn", "s.konan-u.ac.jp", @@ -1785,8 +1775,6 @@ "uncp.edu.pe", "une.edu", "unemi.edu.ec", - "uni-bremen.de", - "uni-muenster.de", "uni-sofia.bg", "uni-wuppertal.de", "uni.opole.pl", @@ -1841,16 +1829,13 @@ "uopstd.edu.jo", "uot.edu.ly", "uotago.ac.nz", - "uottawa.ca", "uowm.gr", "up.ac.pa", "upana.edu.gt", "upb.edu.co", - "upc.edu.pe", "upd.edu.ph", "upeu.edu.pe", "uph.edu", - "upm.edu.my", "upm.edu.sa", "upn.pe", "upnm.edu.my", @@ -1867,7 +1852,6 @@ "usmp.pe", "usms.ac.ma", "usst.edu.cn", - "ust.hk", "ustabuca.edu.co", "ustabuca.edu.co", "ustb.edu.cn", @@ -1883,7 +1867,6 @@ "uteco.edu.do", "uteco.edu.do", "utexas.edu", - "utfpr.edu.br", "utg.edu.gm", "utmachala.edu.ec", "utn.edu.mx", diff --git a/pyswot/vendor/tlds.py b/pyswot/vendor/tlds.py index 70842d9..ac0767c 100644 --- a/pyswot/vendor/tlds.py +++ b/pyswot/vendor/tlds.py @@ -1,5 +1,5 @@ # DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN BY update_vendor.py -# From https://github.com/JetBrains/swot.git@2a0b58aa +# From https://github.com/JetBrains/swot.git@5fbe1f98 TLDS = frozenset( [