Urban-Analytics-Technology-Platform · sgreenbury · Dec 17, 2024 · Dec 17, 2024
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -1,7 +1,7 @@
 # This file is autogenerated by maturin v1.7.1
 # To update, run
 #
-#    maturin generate-ci github --manifest-path popgetter_py/Cargo.toml
+#    maturin generate-ci github --manifest-path popgetter-py/Cargo.toml
 #
 name: Python
 
@@ -51,7 +51,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: >
             --release
-            --manifest-path popgetter_py/Cargo.toml
+            --manifest-path popgetter-py/Cargo.toml
             --out dist
             --find-interpreter
           sccache: "true"
@@ -99,7 +99,7 @@ jobs:
   #       uses: PyO3/maturin-action@v1
   #       with:
   #         target: ${{ matrix.platform.target }}
-  #         args: --release --out dist --find-interpreter --manifest-path popgetter_py/Cargo.toml
+  #         args: --release --out dist --find-interpreter --manifest-path popgetter-py/Cargo.toml
   #         sccache: "true"
   #         before-script-linux: |
   #             # TODO: update with package instructions specific to target for openssl
@@ -134,7 +134,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: >
             --release
-            --manifest-path popgetter_py/Cargo.toml
+            --manifest-path popgetter-py/Cargo.toml
             --out dist
             --find-interpreter
           sccache: "true"
@@ -164,7 +164,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: >
             --release
-            --manifest-path popgetter_py/Cargo.toml
+            --manifest-path popgetter-py/Cargo.toml
             --out dist
             --find-interpreter
           sccache: "true"
@@ -183,7 +183,7 @@ jobs:
         with:
           command: sdist
           args: >
-            --manifest-path popgetter_py/Cargo.toml
+            --manifest-path popgetter-py/Cargo.toml
             --out dist
       - name: Upload sdist
         uses: actions/upload-artifact@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,5 @@
 [workspace]
-members = [
-    "popgetter",
-    "popgetter_cli",
-    "popgetter_py"
-]
+members = ["popgetter-core", "popgetter-cli", "popgetter-py"]
 
 resolver = "2"
 

diff --git a/popgetter_cli/Cargo.toml → popgetter-cli/Cargo.toml b/popgetter_cli/Cargo.toml → popgetter-cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "popgetter_cli"
+name = "popgetter-cli"
 version = "0.2.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -17,7 +17,7 @@ itertools = { workspace = true }
 log = { workspace = true }
 nonempty = { workspace = true, features = ["serialize"] }
 polars = { workspace = true, features = ["lazy", "is_in", "http", "streaming", "parquet", "polars-io", "regex", "strings", "rows"] }
-popgetter = { path = "../popgetter" }
+popgetter-core = { path = "../popgetter-core" }
 pretty_env_logger = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

diff --git a/popgetter_cli/src/cli.rs → popgetter-cli/src/cli.rs b/popgetter_cli/src/cli.rs → popgetter-cli/src/cli.rs
@@ -6,7 +6,7 @@ use enum_dispatch::enum_dispatch;
 use log::{debug, info};
 use nonempty::nonempty;
 use polars::frame::DataFrame;
-use popgetter::{
+use popgetter_core::{
     config::Config,
     data_request_spec::{DataRequestSpec, RegionSpec},
     formatters::{

diff --git a/popgetter_cli/src/display.rs → popgetter-cli/src/display.rs b/popgetter_cli/src/display.rs → popgetter-cli/src/display.rs
@@ -5,7 +5,7 @@ use std::sync::OnceLock;
 use comfy_table::{presets::NOTHING, *};
 use itertools::izip;
 use polars::{frame::DataFrame, prelude::SortMultipleOptions};
-use popgetter::{metadata::ExpandedMetadata, search::SearchResults, COL};
+use popgetter_core::{metadata::ExpandedMetadata, search::SearchResults, COL};
 
 static LOOKUP: OnceLock<HashMap<&'static str, &'static str>> = OnceLock::new();
 

diff --git a/popgetter_cli/src/main.rs → popgetter-cli/src/main.rs b/popgetter_cli/src/main.rs → popgetter-cli/src/main.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use clap::Parser;
 use cli::{Cli, RunCommand};
 use log::debug;
-use popgetter::config::Config;
+use popgetter_core::config::Config;
 
 const DEFAULT_LOGGING_LEVEL: &str = "warn";
 

diff --git a/popgetter/Cargo.toml → popgetter-core/Cargo.toml b/popgetter/Cargo.toml → popgetter-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "popgetter"
+name = "popgetter-core"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/popgetter/src/column_names.rs → popgetter-core/src/column_names.rs b/popgetter/src/column_names.rs → popgetter-core/src/column_names.rs
diff --git a/popgetter/src/config.rs → popgetter-core/src/config.rs b/popgetter/src/config.rs → popgetter-core/src/config.rs
diff --git a/popgetter/src/data_request_spec.rs → popgetter-core/src/data_request_spec.rs b/popgetter/src/data_request_spec.rs → popgetter-core/src/data_request_spec.rs
diff --git a/popgetter/src/error.rs → popgetter-core/src/error.rs b/popgetter/src/error.rs → popgetter-core/src/error.rs
diff --git a/popgetter/src/formatters.rs → popgetter-core/src/formatters.rs b/popgetter/src/formatters.rs → popgetter-core/src/formatters.rs
diff --git a/popgetter/src/geo.rs → popgetter-core/src/geo.rs b/popgetter/src/geo.rs → popgetter-core/src/geo.rs
diff --git a/popgetter/src/lib.rs → popgetter-core/src/lib.rs b/popgetter/src/lib.rs → popgetter-core/src/lib.rs
diff --git a/popgetter/src/metadata.rs → popgetter-core/src/metadata.rs b/popgetter/src/metadata.rs → popgetter-core/src/metadata.rs
diff --git a/popgetter/src/parquet.rs → popgetter-core/src/parquet.rs b/popgetter/src/parquet.rs → popgetter-core/src/parquet.rs
diff --git a/popgetter/src/search.rs → popgetter-core/src/search.rs b/popgetter/src/search.rs → popgetter-core/src/search.rs
diff --git a/popgetter_py/.gitignore → popgetter-py/.gitignore b/popgetter_py/.gitignore → popgetter-py/.gitignore
diff --git a/popgetter_py/Cargo.toml → popgetter-py/Cargo.toml b/popgetter_py/Cargo.toml → popgetter-py/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "popgetter_py"
+name = "popgetter-py"
 version = "0.1.0"
 edition = "2021"
 
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 anyhow = { workspace = true }
 polars = { workspace = true, features = ["lazy", "is_in", "http", "streaming", "parquet", "polars-io", "regex", "strings", "rows"] }
-popgetter = { path = "../popgetter" }
+popgetter-core = { path = "../popgetter-core" }
 pyo3 = { workspace = true, features = ["anyhow", "experimental-async"] }
 pyo3-polars ={ workspace = true }
 serde = { workspace = true }

diff --git a/popgetter_py/README.md → popgetter-py/README.md b/popgetter_py/README.md → popgetter-py/README.md
diff --git a/popgetter_py/pyproject.toml → popgetter-py/pyproject.toml b/popgetter_py/pyproject.toml → popgetter-py/pyproject.toml
diff --git a/popgetter_py/src/lib.rs → popgetter-py/src/lib.rs b/popgetter_py/src/lib.rs → popgetter-py/src/lib.rs
@@ -1,6 +1,6 @@
 use std::default::Default;
 
-use ::popgetter::{
+use ::popgetter_core::{
     config::Config,
     data_request_spec::DataRequestSpec,
     search::{