From 61b75ebcad3a8fa871e79ab8d574f0a5bd108654 Mon Sep 17 00:00:00 2001 From: Ziheng Sun Date: Thu, 4 Jul 2024 12:53:28 -0400 Subject: [PATCH] don't shadow the default packages --- pygeoweaver/__init__.py | 2 +- pygeoweaver/{log_config.py => pgw_log_config.py} | 6 +++--- pygeoweaver/{logging.ini => pgw_logging.ini} | 0 pyproject.toml | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) rename pygeoweaver/{log_config.py => pgw_log_config.py} (88%) rename pygeoweaver/{logging.ini => pgw_logging.ini} (100%) diff --git a/pygeoweaver/__init__.py b/pygeoweaver/__init__.py index 89390ff..e56bd56 100644 --- a/pygeoweaver/__init__.py +++ b/pygeoweaver/__init__.py @@ -1,5 +1,5 @@ from pygeoweaver.commands.pgw_interface import * -from pygeoweaver.log_config import setup_logging +from pygeoweaver.pgw_log_config import setup_logging setup_logging() diff --git a/pygeoweaver/log_config.py b/pygeoweaver/pgw_log_config.py similarity index 88% rename from pygeoweaver/log_config.py rename to pygeoweaver/pgw_log_config.py index 82944c6..21c591d 100644 --- a/pygeoweaver/log_config.py +++ b/pygeoweaver/pgw_log_config.py @@ -14,10 +14,10 @@ def setup_logging(): current_file = inspect.getfile(inspect.currentframe()) current_file_path = os.path.abspath(current_file) current_folder = os.path.dirname(current_file_path) - # Get the absolute path to the logging.ini file - logging_ini_path = os.path.abspath(f'{current_folder}/logging.ini') + # Get the absolute path to the pgw_logging.ini file + logging_ini_path = os.path.abspath(f'{current_folder}/pgw_logging.ini') - # Open the logging.ini file + # Open the pgw_logging.ini file with open(logging_ini_path, 'rt') as f: config_str = f.read() config_str = config_str.replace('%(log_file)s', os.path.expanduser(log_file)) diff --git a/pygeoweaver/logging.ini b/pygeoweaver/pgw_logging.ini similarity index 100% rename from pygeoweaver/logging.ini rename to pygeoweaver/pgw_logging.ini diff --git a/pyproject.toml b/pyproject.toml index 0da7fc7..f419041 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pygeoweaver" -version = "1.0.6" +version = "1.0.7" authors = [{ name="Geoweaver team", email="geoweaver.app@gmail.com" }] description = "This is a wrapper package of the Geoweaver app." readme = "README.md" @@ -22,7 +22,6 @@ dependencies = [ "ipython", "pandas", "halo", - "pydantic", "tabulate", ]