From d302f6b846a0af35a1b0282c7b86818af5a898c8 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sun, 26 Jun 2022 18:50:14 +0200 Subject: [PATCH] fix: release correct fix --- setup.cfg | 4 +--- src/pango_aliasor/aliasor.py | 20 ++++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/setup.cfg b/setup.cfg index 25246f8..aab25f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,14 +1,12 @@ [metadata] name = pango_aliasor -version = 0.1.2 +version = 0.1.3 description = Pango lineage aliasing and dealiasing long_description = file: README.md long_description_content_type = text/markdown url = https://github.com/corneliusroemer/pango_aliasor author = Cornelius Roemer author_email = cornelius.roemer@gmail.com -license = MIT -license_file = LICENSE classifiers = License :: OSI Approved :: MIT License Programming Language :: Python :: 3 diff --git a/src/pango_aliasor/aliasor.py b/src/pango_aliasor/aliasor.py index c8b8696..4ce7438 100644 --- a/src/pango_aliasor/aliasor.py +++ b/src/pango_aliasor/aliasor.py @@ -1,27 +1,23 @@ #%% class Aliasor: def __init__(self, alias_file=None): - import pandas as pd + import json if alias_file is None: - # import importlib.resources + import importlib.resources - aliases = pd.read_json("https://raw.githubusercontent.com/cov-lineages/pango-designation/master/pango_designation/alias_key.json") - # with importlib.resources.open_text("pango_designation", "alias_key.json") as file: - # aliases = pd.read_json(file) + with importlib.resources.open_text("pango_designation", "alias_key.json") as file: + file = json.load(file) else: - aliases = pd.read_json(alias_file) + file = json.load(alias_file) self.alias_dict = {} - for column in aliases.columns: - if column.startswith('X'): + for column in file.keys(): + if type(file[column]) is list or file[column] == "": self.alias_dict[column] = column else: - self.alias_dict[column] = aliases[column][0] - - self.alias_dict['A'] = 'A' - self.alias_dict['B'] = 'B' + self.alias_dict[column] = file[column] self.realias_dict = {v: k for k, v in self.alias_dict.items()}