Merge remote-tracking branch 'refs/remotes/origin/main' into anna_v2

# Conflicts:
#	hydroflow_lang/src/graph/ops/state.rs

.github/workflows/ci.yml

@@ -181,10 +181,10 @@ jobs:
         run: curl -LsSf https://get.nexte.st/latest/windows-tar | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
 
       - name: Run cargo nextest on all targets
-        run: cargo nextest run --no-fail-fast --features python --all-targets
+        run: cargo nextest run --no-fail-fast --features python --features deploy --all-targets
 
       - name: Run doctests
-        run: cargo test --no-fail-fast --features python --doc
+        run: cargo test --no-fail-fast --features python --features deploy --doc
 
       - name: Install Python
         uses: actions/setup-python@v4

.github/workflows/release.yml

@@ -89,7 +89,6 @@ jobs:
           hydroflow hydroflow_lang hydroflow_macro hydroflow_plus
           hydroflow_datalog hydroflow_datalog_core
           hydro_deploy hydro_cli hydroflow_deploy_integration
-          hydroflow_plus_deploy
           stageleft stageleft_macro stageleft_tool
           multiplatform_test
         env:

.vscode/settings.json

@@ -16,7 +16,4 @@
     "files.watcherExclude": {
         "**/target": true
     },
-    "rust-analyzer.cargo.features": [
-        "python"
-    ]
 }

Cargo.toml

@@ -8,7 +8,6 @@ members = [
     "hydro_deploy/hydro_cli",
     "hydro_deploy/hydro_cli_examples",
     "hydro_deploy/hydroflow_deploy_integration",
-    "hydro_deploy/hydroflow_plus_deploy",
     "hydroflow",
     "hydroflow_datalog",
     "hydroflow_datalog_core",

docs/docs/hydroflow_plus/quickstart/clusters.mdx

@@ -59,7 +59,7 @@ To deploy this application, we must set up the Hydro Deploy configuration as bef
 use std::cell::RefCell;
 
 use hydro_deploy::{Deployment, HydroflowCrate};
-use hydroflow_plus_deploy::TrybuildHost;
+use hydroflow_plus::deploy::TrybuildHost;
 
 #[tokio::main]
 async fn main() {

hydro_deploy/core/Cargo.toml

@@ -37,4 +37,3 @@ tempfile = "3.0.0"
 tokio = { version = "1.29.0", features = [ "full" ] }
 tokio-stream = { version = "0.1.3", default-features = false }
 tokio-util = { version = "0.7.5", features = [ "compat", "io-util" ] }
-