diff --git a/setup.py b/setup.py index e718231..ff76210 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,14 @@ setup( name='automatchnames', - version='1.2.6', + version='1.2.7', packages=find_packages(), package_data={"wcvp_download": ["inputs/*", "inputs/wgsrpd-master/level3/*"]}, install_requires=[ - 'pandas>=2.0.1', - 'numpy>=1.24.2', - 'requests>=2.31.0', - 'tqdm>=4.64.1', + 'pandas>=2.1.4', + 'numpy>=1.26', + 'requests>=2.31', + 'tqdm>=4.66', 'typing', 'zstandard' ], @@ -19,6 +19,6 @@ url='https://github.com/alrichardbollans/automatchnames', license='GNU v.3', author='Adam Richard-Bollans', - description='A package for downloading WCVP and matching names to it', + description='A package for downloading the WCVP and matching names to it', long_description=open('readme.md', encoding="utf8").read() ) diff --git a/wcvp_download/get_distributions_from_wcvp.py b/wcvp_download/get_distributions_from_wcvp.py index e5c4ee2..4960ae3 100644 --- a/wcvp_download/get_distributions_from_wcvp.py +++ b/wcvp_download/get_distributions_from_wcvp.py @@ -20,7 +20,7 @@ def get_distributions_for_accepted_taxa(df: pd.DataFrame, acc_name_col: str, inc [wcvp_accepted_columns['name'], native_code_column, introduced_code_column]] # relevant_data = wcvp_with_dists[wcvp_with_dists[wcvp_columns['wcvp_id'].isin(df[wcvp_id_col].values)]] for name in df[acc_name_col].unique(): - if name not in wcvp_with_dists[wcvp_accepted_columns['name']].unique().values: + if name not in wcvp_with_dists[wcvp_accepted_columns['name']].unique(): raise ValueError( f'{name} not an accepted name in your WCVP version when checking for distribution data. This could be an issue with incorrectly specified version.\n Or could be a result of inclusion of Artifical Hyrbids. Also check spelling')