final refactoring

src/wags_tails/base_source.py

@@ -7,8 +7,8 @@
 
 import requests
 
-from wags_tails.storage_utils import get_data_dir, get_latest_local_file
-from wags_tails.version_utils import DATE_VERSION_PATTERN, parse_file_version
+from .core_utils.storage import get_data_dir, get_latest_local_file
+from .core_utils.versioning import DATE_VERSION_PATTERN, parse_file_version
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/chembl.py

@@ -7,8 +7,8 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
 
 
 class ChemblData(DataSource):

src/wags_tails/chemidplus.py

@@ -6,9 +6,9 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.version_utils import DATE_VERSION_PATTERN
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.versioning import DATE_VERSION_PATTERN
 
 
 class ChemIDplusData(DataSource):

src/wags_tails/core_utils/__init__.py

@@ -0,0 +1,4 @@
+"""Provide generic helper functions for frequent data-related tasks.
+
+Intended to be largely for internal use.
+"""

src/wags_tails/custom.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Callable, Optional
 
-from wags_tails.base_source import DataSource
+from .base_source import DataSource
 
 
 class CustomData(DataSource):

src/wags_tails/do.py

@@ -7,9 +7,9 @@
 
 import requests
 
-from wags_tails.base_source import GitHubDataSource
-from wags_tails.download_utils import download_http
-from wags_tails.version_utils import DATE_VERSION_PATTERN
+from .base_source import GitHubDataSource
+from .core_utils.downloads import download_http
+from .core_utils.versioning import DATE_VERSION_PATTERN
 
 
 class DoData(GitHubDataSource):

src/wags_tails/drugbank.py

@@ -5,9 +5,9 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http, handle_zip
-from wags_tails.version_utils import parse_file_version
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http, handle_zip
+from .core_utils.versioning import parse_file_version
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/drugsatfda.py

@@ -5,9 +5,9 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http, handle_zip
-from wags_tails.version_utils import DATE_VERSION_PATTERN
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http, handle_zip
+from .core_utils.versioning import DATE_VERSION_PATTERN
 
 
 class DrugsAtFdaData(DataSource):

src/wags_tails/guide_to_pharmacology.py

@@ -6,10 +6,10 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.storage_utils import get_latest_local_file
-from wags_tails.version_utils import parse_file_version
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.storage import get_latest_local_file
+from .core_utils.versioning import parse_file_version
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/hemonc.py

@@ -7,10 +7,10 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.storage_utils import get_latest_local_file
-from wags_tails.version_utils import parse_file_version
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.storage import get_latest_local_file
+from .core_utils.versioning import parse_file_version
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/mondo.py

@@ -6,10 +6,10 @@
 
 import requests
 
-from wags_tails.base_source import GitHubDataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.storage_utils import get_latest_local_file
-from wags_tails.version_utils import DATE_VERSION_PATTERN, parse_file_version
+from .base_source import GitHubDataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.storage import get_latest_local_file
+from .core_utils.versioning import DATE_VERSION_PATTERN, parse_file_version
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/ncit.py

@@ -5,8 +5,8 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http, handle_zip
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http, handle_zip
 
 
 class NcitData(DataSource):

src/wags_tails/oncotree.py

@@ -6,9 +6,9 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.version_utils import DATE_VERSION_PATTERN
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.versioning import DATE_VERSION_PATTERN
 
 _logger = logging.getLogger(__name__)
 

src/wags_tails/rxnorm.py

@@ -8,9 +8,9 @@
 
 import requests
 
-from wags_tails.base_source import DataSource, RemoteDataError
-from wags_tails.download_utils import download_http
-from wags_tails.version_utils import DATE_VERSION_PATTERN
+from .base_source import DataSource, RemoteDataError
+from .core_utils.downloads import download_http
+from .core_utils.versioning import DATE_VERSION_PATTERN
 
 _logger = logging.getLogger(__name__)