Skip to content

Commit

Permalink
Dependency Updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
gudaoxuri committed Oct 23, 2023
1 parent 5cc6a44 commit db42fdc
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 68 deletions.
35 changes: 0 additions & 35 deletions CHANGELOG.adoc

This file was deleted.

11 changes: 5 additions & 6 deletions CONTRIBUTING.adoc → CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== Contributing
## Contributing

The Tardis project has just started. Due to personal capacity and energy constraints, the project still has a lot of features to improve. If you
are interested in Rust and want to build a lightweight Rust development framework, you are welcome to participate in building it together. You can.
Expand All @@ -8,20 +8,19 @@ are interested in Rust and want to build a lightweight Rust development framewor
3. add documentation and examples
4. provide some good ideas

=== Development Environment Requirements
### Development Environment Requirements

1. stable channel of Rust distribution
2. local Docker execution environment

=== Code Commit Requirements
### Code Commit Requirements

Before committing, make sure your code can pass automated checks.

[source,bash]
----
```rust
cargo fmt --all --check
cargo clippy --all-features
----
```

Thanks.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ codegen-units = 1
opt-level = "z"

[workspace.package]
version = "0.1.0-beta.12"
version = "0.1.0-rc.1"
authors = ["gudaoxuri <[email protected]>"]
description = "Elegant, clean Rust development framework"
keywords = ["http", "database", "web", "redis", "mq"]
Expand Down
13 changes: 4 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
**Preview version, will not guarantee the stability of the API!
Do NOT use in production environment!**

---

**Elegant, Clean Rust development framework🛸**
Expand Down Expand Up @@ -32,9 +29,7 @@ Do NOT use in production environment!**

## 📦 Components

| Crate | Description |
|-------------------------------|-------------|
| **tardis** [![Crate](https://img.shields.io/crates/v/tardis.svg)](https://crates.io/crates/tardis) [![Docs](https://docs.rs/tardis/badge.svg)](https://docs.rs/tardis) | [README](./tardis/README.md) |
| **tardis-macros** [![Crate](https://img.shields.io/crates/v/tardis-macros.svg)](https://crates.io/crates/tardis) [![Docs](https://docs.rs/tardis-macros/badge.svg)](https://docs.rs/tardis) | |


| Crate | Description |
| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
| **tardis** [![Crate](https://img.shields.io/crates/v/tardis.svg)](https://crates.io/crates/tardis) [![Docs](https://docs.rs/tardis/badge.svg)](https://docs.rs/tardis) | [README](./tardis/README.md) |
| **tardis-macros** [![Crate](https://img.shields.io/crates/v/tardis-macros.svg)](https://crates.io/crates/tardis) [![Docs](https://docs.rs/tardis-macros/badge.svg)](https://docs.rs/tardis) | |
20 changes: 10 additions & 10 deletions tardis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ chrono = { version = "0.4", features = ["serde"] }
config = { version = "0.13" }
regex = { version = "1.5" }
url = { version = "2.2", features = ["serde"] }
lru = { version = "0.11.0" }
typed-builder = { version = "0.16" }
lru = { version = "0.12.0" }
typed-builder = { version = "0.18" }
paste = { version = "1.0" }
# Tokio
tokio = { version = "1", features = [
Expand All @@ -84,12 +84,12 @@ tokio = { version = "1", features = [
"sync",
] }
# Tardis Macros
tardis-macros = { version = "0.1.0-beta.11", path = "../tardis-macros", optional = true }
tardis-macros = { version = "0.1.0-rc.1", path = "../tardis-macros", optional = true }
# Log
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tracing-appender = { version = "0.2", optional = true }
console-subscriber = { version = "0.1", optional = true }
console-subscriber = { version = "0.2", optional = true }
# Tracing
tracing-opentelemetry = { version = "0.21", optional = true }
opentelemetry = { version = "0.20", default-features = false, features = [
Expand Down Expand Up @@ -180,15 +180,15 @@ redis = { version = "0.23", features = [
"tokio-comp",
"tokio-native-tls-comp",
], optional = true }
deadpool-redis = { version = "0.12", optional = true }
deadpool-redis = { version = "0.13", optional = true }

# Rabbit
lapin = { version = "2", optional = true }
amq-protocol-types = { version = "7.0", optional = true }
async-global-executor = { version = "2", features = ["tokio"], optional = true }

# Mail
lettre = { version = "0.10.4", features = [
lettre = { version = "0.11", features = [
"smtp-transport",
"tokio1",
"tokio1-native-tls",
Expand All @@ -200,18 +200,18 @@ rust-s3 = { version = "0.33", optional = true }
anyhow = { version = "1.0", optional = true }

# K8s
kube = { version = "0.85", features = ["runtime"], optional = true }
k8s-openapi = { version = "0.19", features = ["v1_21"], optional = true }
kube = { version = "0.88", features = ["runtime"], optional = true }
k8s-openapi = { version = "0.20", features = ["v1_21"], optional = true }

# Test
testcontainers = { version = "0.14", optional = true }
testcontainers = { version = "0.15", optional = true }

[dev-dependencies]
# Common
tokio = { version = "1", features = ["time", "rt", "macros", "sync"] }
criterion = { version = "0.5" }
poem-grpc-build = "0.2.21"
prost = "0.11.9"
prost = "0.12"
strip-ansi-escapes = "0.2.0"

[[test]]
Expand Down
18 changes: 11 additions & 7 deletions tardis/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
**Preview version, will not guarantee the stability of the API!
Do NOT use in production environment!**

---

**Elegant, Clean Rust development framework🛸**
Expand Down Expand Up @@ -73,12 +70,14 @@ TardisFuns::web_server().x // Some web service operations
### Web service example

Dependency Configuration

```toml
[dependencies]
tardis = { version = "^0", features = ["web-server"] }
```

Processor Configuration

```ignore
use tardis::basic::error::TardisError;
use tardis::web::poem_openapi;
Expand All @@ -100,6 +99,7 @@ impl Api {
```

Startup class configuration

```ignore
use tardis::basic::result::TardisResult;
use tardis::tokio;
Expand Down Expand Up @@ -168,7 +168,8 @@ brew install protobuf

### FAQ

* An `` failed to run custom build command for openssl-sys`` error occurs when running under Windows.The solution is as follows( @see https://github.com/sfackler/rust-openssl/issues/1062 ):
* An `` failed to run custom build command for openssl-sys`` error occurs when running under Windows.The solution is as follows( @see https://github.com/sfackler/rust-openssl/issues/1062 ):

```shell
git clone https://github.com/Microsoft/vcpkg --depth=1
cd vcpkg
Expand All @@ -178,12 +179,13 @@ brew install protobuf
set OPENSSL_NO_VENDOR=1
set OPENSSL_DIR=<Current Dir>\packages\openssl_x64-windows-static
```

* An `` failed to run custom build command for openssl-sys`` error occurs when running under Ubuntu(similar to other distributions):

```shell
apt install build-essential perl pkg-config libssl-dev
```
* FreeBSD deployment for ``openssl-sys``

```shell
sudo pkg install cmake ninja zip pkgconf gmake
git clone https://github.com/Microsoft/vcpkg --depth=1
Expand All @@ -193,14 +195,16 @@ brew install protobuf
./vcpkg install openssl
```
* An `` failed to run custom build command for opentelemetry-proto`` error occurs when running under Linux:

```shell
apt install protobuf-compiler
```
* An `` failed to run custom build command for opentelemetry-proto`` error occurs when running under MacOS:

```shell
brew install protobuf
```

----
Thanks to `Jetbrains` for the [Open Source License](https://www.jetbrains.com/community/opensource/)
---

Thanks to `Jetbrains` for the [Open Source License](https://www.jetbrains.com/community/opensource/)

0 comments on commit db42fdc

Please sign in to comment.