From eca322da587e035796428285f5245d73fa802aa8 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Fri, 10 Jun 2022 18:42:19 -0400 Subject: [PATCH] Add dev steps in README * Also fixed issues in setup.cfg * Dropped unnecessary deps in Cargo.toml --- README.md | 14 +++++++ README.zh.md | 14 +++++++ resolver/Cargo.lock | 96 +-------------------------------------------- resolver/Cargo.toml | 4 +- setup.cfg | 4 +- 5 files changed, 33 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index 8150662..66726de 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,17 @@ Development and testing is done on Ubuntu 22.04. ![architecture.png](architecture.en.png) Looks like the Lucky Charms factory, says @aaronbrighton ... + + +## Development + +### Ubuntu 22.04 + +```bash +sudo apt update +sudo apt install gcc libssl-dev python3-dev python3.10-venv +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +python3 -m venv path/to/env +source path/to/env/bin/activate +pip install -e path/to/kloop +``` diff --git a/README.zh.md b/README.zh.md index e7359ab..3975e20 100644 --- a/README.zh.md +++ b/README.zh.md @@ -46,3 +46,17 @@ kLoop 的源代码或发行版。 ![架构图.png](architecture.zh.png) @aaronbrighton 说像 Lucky Charms 卡通麦片工厂…… + + +## 开发 + +### Ubuntu 22.04 + +```bash +sudo apt update +sudo apt install gcc libssl-dev python3-dev python3.10-venv +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +python3 -m venv path/to/env +source path/to/env/bin/activate +pip install -e path/to/kloop +``` diff --git a/resolver/Cargo.lock b/resolver/Cargo.lock index 0b29308..291c4d0 100644 --- a/resolver/Cargo.lock +++ b/resolver/Cargo.lock @@ -25,12 +25,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - [[package]] name = "cfg-if" version = "1.0.0" @@ -136,7 +130,7 @@ checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -145,15 +139,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hostname" version = "0.3.1" @@ -252,60 +237,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - [[package]] name = "parking_lot" version = "0.12.0" @@ -515,23 +446,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" -dependencies = [ - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "pin-project-lite", - "socket2", - "winapi", -] - [[package]] name = "trust-dns-proto" version = "0.21.2" @@ -552,7 +466,6 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio", "url", ] @@ -571,7 +484,6 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", "trust-dns-proto", ] @@ -614,12 +526,6 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - [[package]] name = "widestring" version = "0.5.1" diff --git a/resolver/Cargo.toml b/resolver/Cargo.toml index 15ea409..03056f1 100644 --- a/resolver/Cargo.toml +++ b/resolver/Cargo.toml @@ -11,8 +11,8 @@ crate-type = ["staticlib"] libc = "0.2.124" log = "0.4.16" resolv-conf = { version = "0.7.0", features = ["system"] } -trust-dns-proto = { git = "https://github.com/fantix/trust-dns", branch = "0_21_2_patch", default-features = true } -trust-dns-resolver = { git = "https://github.com/fantix/trust-dns", branch = "0_21_2_patch", default-features = true } +trust-dns-proto = { git = "https://github.com/fantix/trust-dns", branch = "0_21_2_patch", default-features = false } +trust-dns-resolver = { git = "https://github.com/fantix/trust-dns", branch = "0_21_2_patch", default-features = false, features = ["system-config"]} futures-util = "0.3.21" futures-io = "0.3.5" futures-executor = "0.3.5" diff --git a/setup.cfg b/setup.cfg index 620f90c..50b1709 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,10 @@ [metadata] name = kLoop -version = 0.2.0 +version = 0.1.0 author = Fantix King author_email = fantix.king@gmail.com description = An asyncio event loop using Linux io_uring and kTLS. -long_description = file: README.en.md +long_description = file: README.md long_description_content_type = text/markdown url = https://github.com/fantix/kloop project_urls =