Skip to content

Commit

Permalink
fix: remove workspace dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelKreil committed Jan 23, 2025
1 parent aed4c87 commit 9b63471
Show file tree
Hide file tree
Showing 24 changed files with 46 additions and 58 deletions.
4 changes: 0 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion versatiles_container/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ lazy_static.workspace = true
assert_fs.workspace = true
wildmatch.workspace = true

versatiles.workspace = true
versatiles_core = { workspace = true, features = ["test"] }

[features]
Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/converter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//! # Example Usage
//!
//! ```rust
//! use versatiles::container::{convert_tiles_container, MBTilesReader, TilesConverterParameters};
//! use versatiles::types::{TileFormat, TileCompression, TileBBoxPyramid, TilesReaderTrait, TilesReaderParameters};
//! use versatiles_container::{convert_tiles_container, MBTilesReader, TilesConverterParameters};
//! use versatiles_core::types::{TileFormat, TileCompression, TileBBoxPyramid, TilesReaderTrait, TilesReaderParameters};
//! use std::path::Path;
//! use anyhow::Result;
//!
Expand Down Expand Up @@ -220,7 +220,7 @@ impl TilesReaderTrait for TilesConvertReader {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::{MockTilesReader, VersaTilesReader};
use crate::{MockTilesReader, VersaTilesReader};
use assert_fs::NamedTempFile;
use versatiles_core::types::{
TileCompression::*,
Expand Down
3 changes: 2 additions & 1 deletion versatiles_container/src/container/directory/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
//!
//! ## Usage
//! ```no_run
//! use versatiles::{container::DirectoryTilesReader, types::{TileCoord3, TilesReaderTrait}};
//! use versatiles_container::DirectoryTilesReader;
//! use versatiles_core::types::{TileCoord3, TilesReaderTrait};
//! use std::path::Path;
//! use tokio;
//!
Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/directory/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//!
//! ## Usage
//! ```rust
//! use versatiles::container::{DirectoryTilesWriter, MBTilesReader, TilesWriterTrait};
//! use versatiles_container::{DirectoryTilesWriter, MBTilesReader, TilesWriterTrait};
//! use std::path::Path;
//!
//! #[tokio::main]
Expand All @@ -44,7 +44,7 @@
//! ## Testing
//! This module includes comprehensive tests to ensure the correct functionality of writing metadata, handling different file formats, and verifying directory structure.
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::{bail, ensure, Result};
use async_trait::async_trait;
use std::{
Expand Down Expand Up @@ -150,7 +150,7 @@ impl TilesWriterTrait for DirectoryTilesWriter {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::{MockTilesReader, MOCK_BYTES_PBF};
use crate::{MockTilesReader, MOCK_BYTES_PBF};
use versatiles_core::{types::*, utils::decompress_gzip};

/// Tests the functionality of writing tile data to a directory from a mock reader.
Expand Down
8 changes: 4 additions & 4 deletions versatiles_container/src/container/getters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//! # Example Usage
//!
//! ```rust
//! use versatiles::container::{get_reader, write_to_filename};
//! use versatiles::types::{TileFormat, TilesReaderTrait};
//! use versatiles_container::{get_reader, write_to_filename};
//! use versatiles_core::types::{TileFormat, TilesReaderTrait};
//! use std::path::Path;
//! use anyhow::Result;
//!
Expand All @@ -24,7 +24,7 @@
//! }
//! ```
use crate::container::*;
use crate::*;
use anyhow::{bail, Context, Result};
use reqwest::Url;
use std::env;
Expand Down Expand Up @@ -103,7 +103,7 @@ fn get_extension(filename: &str) -> &str {
#[cfg(test)]
pub mod tests {
use super::*;
use crate::container::{MockTilesReader, MockTilesWriter};
use crate::{MockTilesReader, MockTilesWriter};
use anyhow::Result;
use assert_fs::{fixture::NamedTempFile, TempDir};
use std::time::Instant;
Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/mbtiles/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
//!
//! ## Usage Example
//! ```rust
//! use versatiles::container::MBTilesReader;
//! use versatiles::types::{Blob, TileCoord3, TilesReaderTrait};
//! use versatiles_container::MBTilesReader;
//! use versatiles_core::types::{Blob, TileCoord3, TilesReaderTrait};
//! use anyhow::Result;
//! use std::path::Path;
//!
Expand Down Expand Up @@ -407,7 +407,7 @@ struct RecordMetadata {
#[cfg(test)]
pub mod tests {
use super::*;
use crate::container::MockTilesWriter;
use crate::MockTilesWriter;
use lazy_static::lazy_static;
use std::{env, path::PathBuf};

Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/mbtiles/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ## Usage
//! ```rust
//! use versatiles::container::{MBTilesWriter, PMTilesReader, TilesWriterTrait};
//! use versatiles_container::{MBTilesWriter, PMTilesReader, TilesWriterTrait};
//! use std::path::Path;
//!
//! #[tokio::main]
Expand All @@ -28,7 +28,7 @@
//! ## Testing
//! This module includes comprehensive tests to ensure the correct functionality of writing metadata, handling different file formats, and verifying the database structure.
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::{bail, Result};
use async_trait::async_trait;
use r2d2::Pool;
Expand Down Expand Up @@ -187,7 +187,7 @@ impl TilesWriterTrait for MBTilesWriter {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::{MBTilesReader, MockTilesReader, MockTilesWriter};
use crate::{MBTilesReader, MockTilesReader, MockTilesWriter};
use assert_fs::NamedTempFile;

#[tokio::test]
Expand Down
8 changes: 3 additions & 5 deletions versatiles_container/src/container/mock/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
//! These mocks can be used to simulate tile reading operations in tests, allowing verification of code behavior under controlled conditions.
//!
//! ```rust
//! use versatiles::{
//! container::{MockTilesReader, MockTilesReaderProfile},
//! types::TilesReaderTrait
//! };
//! use versatiles_container::{MockTilesReader, MockTilesReaderProfile};
//! use versatiles_core::types::TilesReaderTrait;
//! use std::result::Result;
//!
//! #[tokio::test]
Expand Down Expand Up @@ -133,7 +131,7 @@ impl std::fmt::Debug for MockTilesReader {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::MockTilesWriter;
use crate::MockTilesWriter;
use anyhow::Result;
use versatiles_core::utils::decompress;

Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/mock/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//! These mocks can be used to simulate tile writing operations in tests, allowing verification of code behavior under controlled conditions.
//!
//! ```rust
//! use versatiles::container::{MockTilesReader, MockTilesReaderProfile, MockTilesWriter, TilesWriterTrait};
//! use versatiles_container::{MockTilesReader, MockTilesReaderProfile, MockTilesWriter, TilesWriterTrait};
//! use anyhow::Result;
//!
//! #[tokio::test]
Expand All @@ -20,7 +20,7 @@
//! }
//! ```
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::Result;
use async_trait::async_trait;
use versatiles_core::{io::DataWriterTrait, types::TilesReaderTrait};
Expand Down Expand Up @@ -78,7 +78,7 @@ impl TilesWriterTrait for MockTilesWriter {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::{MockTilesReader, MockTilesReaderProfile};
use crate::{MockTilesReader, MockTilesReaderProfile};

#[tokio::test]
async fn convert_png() -> Result<()> {
Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ pub use getters::{get_reader, write_to_filename};
mod mbtiles;
pub use mbtiles::*;

#[cfg(feature = "test")]
#[cfg(any(test, feature = "test"))]
mod mock;
#[cfg(feature = "test")]
#[cfg(any(test, feature = "test"))]
pub use mock::*;

mod pmtiles;
Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/pipeline/reader.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::container::get_reader;
use crate::get_reader;
use anyhow::{anyhow, Context, Result};
use async_trait::async_trait;
use futures::future::BoxFuture;
Expand Down Expand Up @@ -124,7 +124,7 @@ impl std::fmt::Debug for PipelineReader {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::MockTilesWriter;
use crate::MockTilesWriter;

pub const VPL: &str = include_str!("../../../../testdata/berlin.vpl");

Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/pmtiles/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
//!
//! ## Usage Example
//! ```rust
//! use versatiles::container::PMTilesReader;
//! use versatiles::types::{TileCoord3, TilesReaderTrait};
//! use versatiles_container::PMTilesReader;
//! use versatiles_core::types::{TileCoord3, TilesReaderTrait};
//! use std::path::Path;
//!
//! #[tokio::main]
Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/pmtiles/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ## Usage Example
//! ```rust
//! use versatiles::container::{MBTilesReader, PMTilesWriter, TilesWriterTrait};
//! use versatiles_container::{MBTilesReader, PMTilesWriter, TilesWriterTrait};
//! use std::path::Path;
//!
//! #[tokio::main]
Expand All @@ -29,7 +29,7 @@
//! This module includes comprehensive tests to ensure the correct functionality of writing metadata, handling different tile formats, and verifying the integrity of the written data.
use super::types::{EntriesV3, EntryV3, HeaderV3, PMTilesCompression, TileId};
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::Result;
use async_trait::async_trait;
use versatiles_core::{io::DataWriterTrait, progress::get_progress_bar, types::*, utils::compress};
Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/tar/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//! ## Usage Example
//!
//! ```no_run
//! use versatiles::container::{TarTilesReader, TarTilesWriter, TilesWriterTrait};
//! use versatiles::types::{TileCoord3, TilesReaderTrait};
//! use versatiles_container::{TarTilesReader, TarTilesWriter, TilesWriterTrait};
//! use versatiles_core::types::{TileCoord3, TilesReaderTrait};
//! use std::path::Path;
//! use anyhow::Result;
//!
Expand Down
2 changes: 1 addition & 1 deletion versatiles_container/src/container/tar/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ impl Debug for TarTilesReader {
#[cfg(test)]
pub mod tests {
use super::*;
use crate::container::{make_test_file, MockTilesWriter, MOCK_BYTES_PBF};
use crate::{make_test_file, MockTilesWriter, MOCK_BYTES_PBF};
use versatiles_core::utils::decompress_gzip;
#[cfg(feature = "cli")]
use versatiles_core::utils::PrettyPrint;
Expand Down
2 changes: 1 addition & 1 deletion versatiles_container/src/container/tar/writer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Provides functionality for writing tile data to a tar archive.
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::{bail, Result};
use async_trait::async_trait;
use std::{
Expand Down
4 changes: 2 additions & 2 deletions versatiles_container/src/container/versatiles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//! # Usage Example
//!
//! ```rust
//! use versatiles::container::{MBTilesReader, TilesWriterTrait, VersaTilesReader, VersaTilesWriter};
//! use versatiles::types::{TileCoord3, TilesReaderTrait};
//! use versatiles_container::{MBTilesReader, TilesWriterTrait, VersaTilesReader, VersaTilesWriter};
//! use versatiles_core::types::{TileCoord3, TilesReaderTrait};
//! use std::path::Path;
//! use anyhow::Result;
//!
Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/versatiles/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
//! This module provides the `VersaTilesReader` struct, which implements the `TilesReader` trait for reading tile data from a `versatiles` container. It supports reading metadata, tile data, and probing the container for debugging purposes.
//!
//! ```no_run
//! use versatiles::container::VersaTilesReader;
//! use versatiles::types::{TileCoord3, TileCompression, TileFormat, TileBBoxPyramid, TilesReaderTrait, TilesReaderParameters};
//! use versatiles_container::VersaTilesReader;
//! use versatiles_core::types::{TileCoord3, TileCompression, TileFormat, TileBBoxPyramid, TilesReaderTrait, TilesReaderParameters};
//! use anyhow::Result;
//! use futures::StreamExt;
//! use std::path::Path;
Expand Down Expand Up @@ -480,7 +480,7 @@ impl PartialEq for VersaTilesReader {
#[cfg(test)]
mod tests {
use super::*;
use crate::container::{make_test_file, MockTilesReader, TilesWriterTrait, VersaTilesWriter, MOCK_BYTES_PBF};
use crate::{make_test_file, MockTilesReader, TilesWriterTrait, VersaTilesWriter, MOCK_BYTES_PBF};
use versatiles_core::{assert_wildcard, io::DataWriterBlob, utils::decompress_gzip};

#[tokio::test]
Expand Down
6 changes: 3 additions & 3 deletions versatiles_container/src/container/versatiles/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//! # Example
//!
//! ```rust
//! use versatiles::container::{MBTilesReader, TilesWriterTrait, VersaTilesWriter};
//! use versatiles::types::{TileBBoxPyramid, TileCompression, TileFormat};
//! use versatiles_container::{MBTilesReader, TilesWriterTrait, VersaTilesWriter};
//! use versatiles_core::types::{TileBBoxPyramid, TileCompression, TileFormat};
//! use std::path::Path;
//! use anyhow::Result;
//!
Expand All @@ -27,7 +27,7 @@
//! ```
use super::types::{BlockDefinition, BlockIndex, FileHeader, TileIndex};
use crate::container::TilesWriterTrait;
use crate::TilesWriterTrait;
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use log::{debug, trace};
Expand Down
2 changes: 1 addition & 1 deletion versatiles_core/src/progress/progress_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//! # Examples
//!
//! ```rust
//! use versatiles_core::utils::progress::get_progress_bar;
//! use versatiles_core::progress::get_progress_bar;
//!
//! let mut progress = get_progress_bar("Processing", 100);
//! progress.set_position(50);
Expand Down
2 changes: 0 additions & 2 deletions versatiles_geometry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,3 @@ versatiles_core.workspace = true

[dev-dependencies]
tokio = { workspace = true, features = ["macros"] }

versatiles.workspace = true
2 changes: 0 additions & 2 deletions versatiles_image/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@ webp = { version = "0.3.0", default-features = false, features = ["img"] }
versatiles_core.workspace = true

[dev-dependencies]

versatiles.workspace = true
4 changes: 1 addition & 3 deletions versatiles_pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ anyhow.workspace = true
async-trait.workspace = true
futures.workspace = true
imageproc = { version = "0.25.0", default-features = false }
itertools.workspace = true
itertools = { workspace = true, features = ["use_alloc"] }
lazy_static.workspace = true
log.workspace = true
nom = { version = "7.1.3" }
Expand All @@ -33,5 +33,3 @@ assert_fs.workspace = true
lazy_static.workspace = true
regex.workspace = true
tokio = { workspace = true, features = ["macros"] }

versatiles.workspace = true

0 comments on commit 9b63471

Please sign in to comment.