From 576ecdaab6b98f201f57be9d08fb74b7ae1b9bf1 Mon Sep 17 00:00:00 2001 From: Guinsly Mondesir Date: Sat, 21 Mar 2020 10:26:25 -0400 Subject: [PATCH] version --- ask_schools/__init__.py | 24 ++++++++++++++++++------ pyproject.toml | 8 ++++---- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ask_schools/__init__.py b/ask_schools/__init__.py index 9ab187d..bf27d97 100644 --- a/ask_schools/__init__.py +++ b/ask_schools/__init__.py @@ -1,4 +1,12 @@ -__version__ = '0.2.7' +__version__ = "0.3.1" + +suffixes = ["york","tor","sp","gue","otech","mac","west","ott","rye","brk","queens","lake","guehum","york.fr","ocad","car","stp.fr","lan","lan.fr","alg","int","int.fr","uoit"] +suffixes_school = ["York University","University of Toronto","Scholars-Portal","Guelph University","Ontario Tech","McMaster University","Western University","Ottawa University","Ryerson University","Brock University","Queen's University","Lakehead University","Guelph-Humber University","York University","OCAD University","Carleton University","Saint-Paul University","Laurentian University","Laurentian University","Algoma University","Mentee","Mentee","Ontario Tech University"] + +queue = ["algoma","algoma-fr","brock","carleton-txt","carleton","guelph","guelph-humber","guelph-humber-txt","lakehead","laurentian","laurentian-fr","mcmaster","mcmaster-txt","ocad","otech","ottawa","ottawa-fr","ottawa-fr-txt","ottawa-txt","practice-webinars","practice-webinars-fr","practice-webinars-txt","queens","ryerson","saintpaul","saintpaul-fr","scholars-portal","toronto","toronto-mississauga","toronto-scarborough","toronto-st-george","western","western-fr","western-proactive","western-txt","york","york-glendon","york-glendon-fr","york-txt"] +queue_simple_name = ["algoma","algoma","brock","carleton","carleton","guelph","guelph","guelph","lakehead","laurentian","laurentian","mcmaster","mcmaster","ocad","otech","ottawa","ottawa","ottawa","ottawa","practice","practice","practice","queens","ryerson","saintpaul","saintpaul","scholars","toronto","toronto","toronto","toronto","western","western","western","western","york","york","york","york"] +queue_university = ["Algoma University","Algoma University","Brock University","Carleton University","Carleton University","Guelph University","Guelph-Humber University","Guelph-Humber University","Lakehead University","Laurentian University","Laurentian University","McMaster University","McMaster University","OCAD University","Ontario Tech","Ottawa University","Ottawa University","Ottawa University","Ottawa University","practice","practice","practice","Queen's University","Ryerson University","Saint-Paul University","Saint-Paul University","Scholars-Portal","University of Toronto","University of Toronto","University of Toronto","University of Toronto","Western University","Western University","Western University","Western University","York-University","York-University","York-University","York-University"] + school_name = { 'Toronto':{'suffix':'_tor', 'short':'Toronto', 'full':'University of Toronto'}, @@ -71,10 +79,7 @@ def find_school_by_operator_suffix(operator): elif "_mac" in operator: return "McMaster" elif "_york" in operator: - if ".fr" in operator: - return "York-Glendon" - else: - return "York" + return "York" elif "_sp" in operator: return "Scholars Portal" elif "_ott" in operator: @@ -89,7 +94,7 @@ def find_school_by_queue_or_profile_name(queue): if queue in ["toronto-st-george", 'toronto-st-george-proactive', 'toronto-scarborough', 'toronto-mississauga']: return "University of Toronto" - elif queue in ["york", 'york-glendon-fr', 'york-glendon']: + elif queue in ["york-txt", "york", 'york-glendon-fr', 'york-glendon']: return "York University" elif queue in ['guelph']: return 'Guelph University' @@ -178,6 +183,13 @@ def find_school_abbr_by_queue_or_profile_name(queue): "Ontario Tech University", "Western Ontario University", "Queens University"] +FRENCH_QUEUES = ['algoma-fr', 'clavardez', 'laurentian-fr', 'ottawa-fr', + 'saintpaul-fr', 'western-fr', 'york-glendon-fr'] +SMS_QUEUES = ['carleton-txt', 'clavardez-txt', 'guelph-humber-txt', + 'mcmaster-txt', 'ottawa-fr-txt', 'ottawa-txt', + 'scholars-portal-txt', 'western-txt', 'york-txt'] +PRACTICE_QUEUES = ['practice-webinars', 'practice-webinars-fr', 'practice-webinars-txt'] + def find_routing_model_by_profile_name(university_name): if university_name is None: return university_name diff --git a/pyproject.toml b/pyproject.toml index ba4ea9c..021d142 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,13 @@ [tool.poetry] name = "ask_schools" -version = "0.2.7" -description = "Ask Scholars Portal Name Conversion" +version = "0.3.1" +description = "Ask Scholars Portal School Name Conversion" authors = ["Guinsly Mondesir "] keywords = ["Ask", "Scholars Portal", "Ontario"] license = "MIT" readme = "README.md" -homepage = "https://github.com/guinslym/flake8-markdown" -repository = "https://github.com/guinslym/flake8-markdown" +homepage = "https://github.com/guinslym/ask_schools" +repository = "https://github.com/guinslym/ask_schools" classifiers = [ "Operating System :: OS Independent", "Topic :: Software Development :: Documentation",