korpling · thomaskrause · Nov 13, 2023 · Nov 13, 2023 · Nov 13, 2023 · Nov 13, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - the spreadsheet importer will use the correct namespace `default_ns` for segmentation ordering relations
 - fixed ordering of token nodes in spreadsheet import
 
+### Removed
+
+- removed `show-documentation` subcommand and moved the documentation from mdBook to the crate documentation in the source code
+
 ## [0.3.1] - 2023-08-04
 
 ### Fixed

diff --git a/Cargo.toml b/Cargo.toml
@@ -12,36 +12,30 @@ version = "0.3.1"
 ansi_term = "0.12"
 anyhow = "1.0"
 csv = "1.1"
-encoding_rs_io = "0.1.7"
 encoding_rs = "0.8"
+encoding_rs_io = "0.1.7"
 glob = "0.3"
 graphannis = "2.4"
 graphannis-core = "2.4"
-include_dir = {version = "0.7", optional = true}
 indicatif = "0.17"
 itertools = "0.11"
 log = "0.4"
-mime_guess = {version = "2", optional = true}
 normpath = "1.1"
-open = {version = "5", optional = true}
-ordered-float = {version = "3.4.0", default-features = false}
+ordered-float = {version = "4.1", default-features = false}
 pest = "2.7"
 pest_derive = "2.0"
-portpicker = {version = "0.1.1", optional = true}
-quick-xml = "0.28"
+quick-xml = "0.31"
 rayon = "1.1"
 regex = "1.4"
 serde = "1.0"
 serde_derive = "1.0"
 structopt = "0.3"
-tabled = "0.12"
+tabled = "0.14"
 tempfile = "3"
 thiserror = "1.0"
-tiny_http = {version = "0.12", optional = true}
 toml = "0.8.0"
 tracing-subscriber = "0.3"
 umya-spreadsheet = "1.0"
-url = {version = "2", optional = true}
 xml-rs = "0.8"
 
 [dev-dependencies]
@@ -50,10 +44,6 @@ insta = {version = "1.26.0", features = ["toml", "redactions"]}
 pretty_assertions = "1.3"
 ureq = {version = "2.7.1", default-features = false}
 
-[features]
-default = ["embed-documentation"]
-embed-documentation = ["dep:include_dir", "dep:tiny_http", "dep:mime_guess", "dep:portpicker", "dep:open", "dep:url"]
-
 # Compile some of the dependencies in release mode if when we are ourself in
 # "dev" mode (like building debug binaries or running tests)
 [profile.dev.package]

diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/docs/book.toml b/docs/book.toml
diff --git a/docs/book/compile.txt b/docs/book/compile.txt
diff --git a/docs/src/README.md b/docs/src/README.md
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
diff --git a/docs/src/compile.txt b/docs/src/compile.txt
diff --git a/docs/src/exporter/README.md b/docs/src/exporter/README.md
diff --git a/docs/src/graph_op/README.md b/docs/src/graph_op/README.md
diff --git a/docs/src/importer/README.md b/docs/src/importer/README.md
diff --git a/docs/src/test.txt b/docs/src/test.txt
diff --git a/src/bin/annatto.rs b/src/bin/annatto.rs
@@ -1,12 +1,8 @@
-#[cfg(feature = "embed-documentation")]
-use annatto::documentation_server;
 use annatto::{
     error::AnnattoError,
     workflow::{execute_from_file, StatusMessage, Workflow},
     StepID,
 };
-#[cfg(feature = "embed-documentation")]
-use anyhow::anyhow;
 use indicatif::{ProgressBar, ProgressStyle};
 
 use std::{collections::HashMap, convert::TryFrom, path::PathBuf, sync::mpsc, thread};
@@ -30,9 +26,6 @@ enum Cli {
         #[structopt(parse(from_os_str))]
         workflow_file: std::path::PathBuf,
     },
-    #[cfg(feature = "embed-documentation")]
-    /// Show the documentation for this version of Annatto in the browser.
-    ShowDocumentation,
 }
 
 pub fn main() -> anyhow::Result<()> {
@@ -41,13 +34,6 @@ pub fn main() -> anyhow::Result<()> {
     let args = Cli::from_args();
     match args {
         Cli::Run { workflow_file, env } => convert(workflow_file, env)?,
-        #[cfg(feature = "embed-documentation")]
-        Cli::ShowDocumentation => {
-            let (_, _, handle) = documentation_server::start_server(true)?;
-            handle
-                .join()
-                .map_err(|_e| anyhow!("Waiting for documentation server thread failed"))??;
-        }
         Cli::Validate { workflow_file } => {
             Workflow::try_from((workflow_file, false))?;
         }