chore: Fix schema only builds.

pywr · Jul 23, 2024 · 409da2f · 409da2f
1 parent 97e048d
commit 409da2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pywr-schema/src/nodes/loss_link.rs b/pywr-schema/src/nodes/loss_link.rs
@@ -6,9 +6,8 @@ use crate::metric::Metric;
 use crate::model::LoadArgs;
 use crate::nodes::{NodeAttribute, NodeMeta};
 use crate::parameters::TryIntoV2Parameter;
-use pywr_core::aggregated_node::Factors;
 #[cfg(feature = "core")]
-use pywr_core::metric::MetricF64;
+use pywr_core::{aggregated_node::Factors, metric::MetricF64};
 use pywr_schema_macros::PywrVisitAll;
 use pywr_v1_schema::nodes::LossLinkNode as LossLinkNodeV1;
 use schemars::JsonSchema;
@@ -25,6 +24,7 @@ pub enum LossFactor {
     Net { factor: Metric },
 }
 
+#[cfg(feature = "core")]
 impl LossFactor {
     pub fn load(
         &self,
@@ -254,14 +254,15 @@ impl TryFrom<LossLinkNodeV1> for LossLinkNode {
 mod tests {
     use crate::model::PywrModel;
     #[cfg(feature = "core")]
-    use pywr_core::test_utils::run_all_solvers;
-    use pywr_core::test_utils::ExpectedOutputs;
+    use pywr_core::test_utils::{run_all_solvers, ExpectedOutputs};
+    #[cfg(feature = "core")]
     use tempfile::TempDir;
 
     fn loss_link1_str() -> &'static str {
         include_str!("../test_models/loss_link1.json")
     }
 
+    #[cfg(feature = "core")]
     fn loss_link1_outputs_str() -> &'static str {
         include_str!("../test_models/loss_link1-expected.csv")
     }

diff --git a/pywr-schema/src/nodes/water_treatment_works.rs b/pywr-schema/src/nodes/water_treatment_works.rs
@@ -224,14 +224,15 @@ impl WaterTreatmentWorks {
 mod tests {
     use crate::model::PywrModel;
     #[cfg(feature = "core")]
-    use pywr_core::test_utils::run_all_solvers;
-    use pywr_core::test_utils::ExpectedOutputs;
+    use pywr_core::test_utils::{run_all_solvers, ExpectedOutputs};
+    #[cfg(feature = "core")]
     use tempfile::TempDir;
 
     fn wtw1_str() -> &'static str {
         include_str!("../test_models/wtw1.json")
     }
 
+    #[cfg(feature = "core")]
     fn wtw1_outputs_str() -> &'static str {
         include_str!("../test_models/wtw1-expected.csv")
     }

diff --git a/pywr-schema/src/outputs/csv.rs b/pywr-schema/src/outputs/csv.rs
@@ -4,6 +4,7 @@ use crate::error::SchemaError;
 use pywr_core::recorders::{CsvLongFmtOutput, CsvWideFmtOutput, Recorder};
 use pywr_schema_macros::PywrVisitPaths;
 use schemars::JsonSchema;
+#[cfg(feature = "core")]
 use std::num::NonZeroU32;
 #[cfg(feature = "core")]
 use std::path::Path;