diff --git a/pyproject.toml b/pyproject.toml index bd0555a..45e5dee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,12 +6,27 @@ requires = [ ] build-backend = "setuptools.build_meta" +[tool.setuptools] +include-package-data = true + +[tool.setuptools.packages.find] +where = ["."] +include = ["udot_wrangler"] + +[tool.setuptools.package-data] +udot_wrangler = ["settings/*"] + [project] name = "udot-wrangler" -version = "0.1.2" +version = "0.1.3" description = "Network Wrangler parameters for UDOT" readme = "README.md" requires-python = ">=3.10" +authors = [ + {name = "Sijia Wang", email = "sijia.wang@wsp.com"}, +] +license = "Apache-2.0" +license-files = ["LICENSE"] dependencies = [ "cube-wrangler", "ipykernel>=6.29.5", diff --git a/udot_wrangler/__init__.py b/udot_wrangler/__init__.py index d302eda..b253d49 100644 --- a/udot_wrangler/__init__.py +++ b/udot_wrangler/__init__.py @@ -1,3 +1,3 @@ -__version__ = "0.1.2" +__version__ = "0.1.3" from .parameters import UDOT_Parameters diff --git a/udot_wrangler/parameters.py b/udot_wrangler/parameters.py index e531261..82754a0 100644 --- a/udot_wrangler/parameters.py +++ b/udot_wrangler/parameters.py @@ -6,9 +6,9 @@ def get_base_dir(udot_wrangler_base_dir=os.getcwd()): d = udot_wrangler_base_dir for i in range(3): - if ".settings" in os.listdir(d): - WranglerLogger.info("udot Wrangler base directory set as: {}".format(d)) - return d + if "settings" in os.listdir(d): + WranglerLogger.info("udot Wrangler base directory set as: {}".format(os.path.dirname(d))) + return os.path.dirname(d) d = os.path.dirname(d) msg = "Cannot find UDOT Wrangler base directory from {}, please input using keyword in parameters: `udot_wrangler_base_dir =` ".format( @@ -72,7 +72,7 @@ def __init__(self, **kwargs): if "settings_location" in kwargs: self.settings_location = kwargs.get("settings_location") else: - self.settings_location = os.path.join(self.base_dir, ".settings") + self.settings_location = os.path.join(self.base_dir, "udot_wrangler", "settings") if "scratch_location" in kwargs: self.scratch_location = kwargs.get("scratch_location") diff --git a/.settings/log_to_net.csv b/udot_wrangler/settings/log_to_net.csv similarity index 100% rename from .settings/log_to_net.csv rename to udot_wrangler/settings/log_to_net.csv diff --git a/.settings/net_to_dbf.csv b/udot_wrangler/settings/net_to_dbf.csv similarity index 100% rename from .settings/net_to_dbf.csv rename to udot_wrangler/settings/net_to_dbf.csv diff --git a/uv.lock b/uv.lock index fa781b0..42b43f5 100644 --- a/uv.lock +++ b/uv.lock @@ -2535,7 +2535,7 @@ wheels = [ [[package]] name = "udot-wrangler" -version = "0.1.2" +version = "0.1.3" source = { editable = "." } dependencies = [ { name = "cube-wrangler" },