astral-sh · charliermarsh · Jan 19, 2024 · Jan 18, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/README.md b/crates/README.md
@@ -47,6 +47,10 @@ Functionality for detecting the current platform (operating system, architecture
 
 Functionality for parsing and inferring Python platform tags as per [PEP 425](https://peps.python.org/pep-0425/).
 
+## [puffin](./puffin)
+
+Command-line interface for the Puffin package manager.
+
 ## [puffin-build](./puffin-build)
 
 A [PEP 517](https://www.python.org/dev/peps/pep-0517/)-compatible build frontend for Puffin.
@@ -55,10 +59,6 @@ A [PEP 517](https://www.python.org/dev/peps/pep-0517/)-compatible build frontend
 
 Functionality for caching Python packages and associated metadata.
 
-## [puffin-cli](./puffin-cli)
-
-Command-line interface for the Puffin package manager.
-
 ## [puffin-client](./puffin-client)
 
 Client for interacting with PyPI-compatible HTTP APIs.

diff --git a/crates/puffin-traits/src/lib.rs b/crates/puffin-traits/src/lib.rs
@@ -27,7 +27,7 @@ use puffin_interpreter::{Interpreter, Virtualenv};
 ///
 /// ```text
 ///                    ┌────────────────┐
-///                    │puffin-cli      │
+///                    │puffin          │
 ///                    └───────▲────────┘
 ///                            │
 ///                            │

diff --git a/crates/puffin-cli/Cargo.toml → crates/puffin/Cargo.toml b/crates/puffin-cli/Cargo.toml → crates/puffin/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "puffin-cli"
+name = "puffin"
 version = "0.0.1"
 edition = { workspace = true }
 rust-version = { workspace = true }
@@ -13,10 +13,6 @@ default-run = "puffin"
 [lints]
 workspace = true
 
-[[bin]]
-name = "puffin"
-path = "src/main.rs"
-
 [dependencies]
 distribution-filename = { path = "../distribution-filename" }
 distribution-types = { path = "../distribution-types" }

diff --git a/crates/puffin-cli/src/commands/add.rs → crates/puffin/src/commands/add.rs b/crates/puffin-cli/src/commands/add.rs → crates/puffin/src/commands/add.rs
diff --git a/crates/puffin-cli/src/commands/clean.rs → crates/puffin/src/commands/clean.rs b/crates/puffin-cli/src/commands/clean.rs → crates/puffin/src/commands/clean.rs
diff --git a/crates/puffin-cli/src/commands/freeze.rs → crates/puffin/src/commands/freeze.rs b/crates/puffin-cli/src/commands/freeze.rs → crates/puffin/src/commands/freeze.rs
diff --git a/crates/puffin-cli/src/commands/mod.rs → crates/puffin/src/commands/mod.rs b/crates/puffin-cli/src/commands/mod.rs → crates/puffin/src/commands/mod.rs
diff --git a/...es/puffin-cli/src/commands/pip_compile.rs → crates/puffin/src/commands/pip_compile.rs b/...es/puffin-cli/src/commands/pip_compile.rs → crates/puffin/src/commands/pip_compile.rs
diff --git a/...es/puffin-cli/src/commands/pip_install.rs → crates/puffin/src/commands/pip_install.rs b/...es/puffin-cli/src/commands/pip_install.rs → crates/puffin/src/commands/pip_install.rs
diff --git a/crates/puffin-cli/src/commands/pip_sync.rs → crates/puffin/src/commands/pip_sync.rs b/crates/puffin-cli/src/commands/pip_sync.rs → crates/puffin/src/commands/pip_sync.rs
diff --git a/.../puffin-cli/src/commands/pip_uninstall.rs → crates/puffin/src/commands/pip_uninstall.rs b/.../puffin-cli/src/commands/pip_uninstall.rs → crates/puffin/src/commands/pip_uninstall.rs
diff --git a/crates/puffin-cli/src/commands/remove.rs → crates/puffin/src/commands/remove.rs b/crates/puffin-cli/src/commands/remove.rs → crates/puffin/src/commands/remove.rs
diff --git a/crates/puffin-cli/src/commands/reporters.rs → crates/puffin/src/commands/reporters.rs b/crates/puffin-cli/src/commands/reporters.rs → crates/puffin/src/commands/reporters.rs
diff --git a/crates/puffin-cli/src/commands/venv.rs → crates/puffin/src/commands/venv.rs b/crates/puffin-cli/src/commands/venv.rs → crates/puffin/src/commands/venv.rs
diff --git a/crates/puffin-cli/src/logging.rs → crates/puffin/src/logging.rs b/crates/puffin-cli/src/logging.rs → crates/puffin/src/logging.rs
diff --git a/crates/puffin-cli/src/main.rs → crates/puffin/src/main.rs b/crates/puffin-cli/src/main.rs → crates/puffin/src/main.rs
diff --git a/crates/puffin-cli/src/printer.rs → crates/puffin/src/printer.rs b/crates/puffin-cli/src/printer.rs → crates/puffin/src/printer.rs
diff --git a/crates/puffin-cli/src/requirements.rs → crates/puffin/src/requirements.rs b/crates/puffin-cli/src/requirements.rs → crates/puffin/src/requirements.rs
diff --git a/crates/puffin-cli/tests/add.rs → crates/puffin/tests/add.rs b/crates/puffin-cli/tests/add.rs → crates/puffin/tests/add.rs
diff --git a/crates/puffin-cli/tests/common/mod.rs → crates/puffin/tests/common/mod.rs b/crates/puffin-cli/tests/common/mod.rs → crates/puffin/tests/common/mod.rs
diff --git a/crates/puffin-cli/tests/pip_compile.rs → crates/puffin/tests/pip_compile.rs b/crates/puffin-cli/tests/pip_compile.rs → crates/puffin/tests/pip_compile.rs
diff --git a/crates/puffin-cli/tests/pip_install.rs → crates/puffin/tests/pip_install.rs b/crates/puffin-cli/tests/pip_install.rs → crates/puffin/tests/pip_install.rs
diff --git a/...puffin-cli/tests/pip_install_scenarios.rs → crates/puffin/tests/pip_install_scenarios.rs b/...puffin-cli/tests/pip_install_scenarios.rs → crates/puffin/tests/pip_install_scenarios.rs
diff --git a/crates/puffin-cli/tests/pip_sync.rs → crates/puffin/tests/pip_sync.rs b/crates/puffin-cli/tests/pip_sync.rs → crates/puffin/tests/pip_sync.rs
diff --git a/crates/puffin-cli/tests/pip_uninstall.rs → crates/puffin/tests/pip_uninstall.rs b/crates/puffin-cli/tests/pip_uninstall.rs → crates/puffin/tests/pip_uninstall.rs
diff --git a/crates/puffin-cli/tests/remove.rs → crates/puffin/tests/remove.rs b/crates/puffin-cli/tests/remove.rs → crates/puffin/tests/remove.rs
diff --git a/crates/puffin-cli/tests/venv.rs → crates/puffin/tests/venv.rs b/crates/puffin-cli/tests/venv.rs → crates/puffin/tests/venv.rs
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,7 @@ Changelog = "https://pypi.org/project/puffin-alpha/"
 
 [tool.maturin]
 bindings = "bin"
-manifest-path = "crates/puffin-cli/Cargo.toml"
+manifest-path = "crates/puffin/Cargo.toml"
 module-name = "puffin"
 python-source = "python"
 strip = true

diff --git a/scripts/benchmarks/uninstall.sh b/scripts/benchmarks/uninstall.sh
@@ -13,5 +13,5 @@ set -euxo pipefail
 TARGET=${1}
 
 hyperfine --runs 20 --warmup 3 --prepare "rm -rf .venv && virtualenv .venv && source activate .venv/bin/activate && pip install ${TARGET}" \
-    "./target/release/puffin-cli uninstall ${TARGET}" \
+    "./target/release/puffin uninstall ${TARGET}" \
     "pip uninstall -y ${TARGET}"
diff --git a/scripts/scenarios/update.py b/scripts/scenarios/update.py
@@ -51,7 +51,7 @@
 PACKSE = TOOL_ROOT / "packse-scenarios"
 REQUIREMENTS = TOOL_ROOT / "requirements.txt"
 PROJECT_ROOT = TOOL_ROOT.parent.parent
-TARGET = PROJECT_ROOT / "crates" / "puffin-cli" / "tests" / "pip_install_scenarios.rs"
+TARGET = PROJECT_ROOT / "crates" / "puffin" / "tests" / "pip_install_scenarios.rs"
 
 try:
     import packse