NexVeridian/wikidata-to-surrealdb
1
0
Fork 0
mirror of https://github.com/NexVeridian/wikidata-to-surrealdb.git synced 2025-09-02 09:59:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: makefile and update dependences

Browse source
This commit is contained in:
Elijah McMorris 2024-09-25 22:11:24 -07:00
parent 47cde83c7a
commit d9803555d1
Signed by: NexVeridian
SSH key fingerprint: SHA256:bsA1SKZxuEcEVHAy3gY1HUeM5ykRJl0U0kQHQn0hMg8
7 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -2758,9 +2758,9 @@ checksum = "568fde39e6aec674be99c9dd38b4c79040faf31038bd5a41ab1908db00c2319b"
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.5" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62871f2d65009c0256aed1b9cfeeb8ac272833c404e13d53d400cd0dad7a2ac0" checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
] ]
@ -3543,9 +3543,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "surrealdb" name = "surrealdb"
version = "2.0.1" version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a327b352feacd0e724399dcb6a673acd6fb2a88e0dc9c3fed7758d97dceef1" checksum = "39763f42366823f524ded4e423420fe990352a18665f00151521ea49f590d33e"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"async-channel", "async-channel",
@ -3584,9 +3584,9 @@ dependencies = [
[[package]] [[package]]
name = "surrealdb-core" name = "surrealdb-core"
version = "2.0.1" version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80433611bdf00df5ff59d52a708b60ac23598db3e3f9460cde625ea925c8f776" checksum = "12d8339a5d2968dedee86705482becc6a6181a07cc30ed2e674526a81bd7389e"
dependencies = [ dependencies = [
"addr", "addr",
"ahash 0.8.11", "ahash 0.8.11",
@ -4511,9 +4511,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.6.19" version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c52ac009d615e79296318c1bcce2d422aaca15ad08515e344feeda07df67a587" checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]

4
Cargo.toml
View file

@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
anyhow = "1.0" anyhow = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
surrealdb = { version = "2.0.1", features = ["protocol-http", "kv-mem"] } surrealdb = { version = "2.0.2", features = ["protocol-http", "kv-mem"] }
tokio = { version = "1.39", features = ["fs", "time", "sync"] } tokio = { version = "1.39", features = ["fs", "time", "sync"] }
futures = "0.3" futures = "0.3"
wikidata = "1.1" wikidata = "1.1"
@ -19,7 +19,7 @@ backon = { version = "1.2", features = ["tokio-sleep"] }
[dev-dependencies] [dev-dependencies]
rstest = "0.22" rstest = "0.22"
surrealdb = { version = "2.0.1", features = ["kv-mem"] } surrealdb = { version = "2.0.2", features = ["kv-mem"] }
criterion = { version = "0.5", features = ["async_tokio"] } criterion = { version = "0.5", features = ["async_tokio"] }
pprof = { version = "0.13", features = ["criterion", "protobuf-codec"] } pprof = { version = "0.13", features = ["criterion", "protobuf-codec"] }

2
Makefile
View file

@ -2,10 +2,12 @@ COMPOSE_FILES := surrealdb surrealdb.dev
.PHONY: $(addprefix up-,$(COMPOSE_FILES)) $(addprefix down-,$(COMPOSE_FILES)) .PHONY: $(addprefix up-,$(COMPOSE_FILES)) $(addprefix down-,$(COMPOSE_FILES))
up: up-surrealdb
$(addprefix up-,$(COMPOSE_FILES)): $(addprefix up-,$(COMPOSE_FILES)):
make down-$(subst up-,,$@) make down-$(subst up-,,$@)
docker compose -f docker-compose-$(subst up-,,$@).yml up --build --pull always -d docker compose -f docker-compose-$(subst up-,,$@).yml up --build --pull always -d
down: down-surrealdb
$(addprefix down-,$(COMPOSE_FILES)): $(addprefix down-,$(COMPOSE_FILES)):
docker compose -f docker-compose-$(subst down-,,$@).yml down --volumes --remove-orphans docker compose -f docker-compose-$(subst down-,,$@).yml down --volumes --remove-orphans
docker network prune -f docker network prune -f

2
docker-compose-surrealdb.dev.yml
View file

@ -1,7 +1,7 @@
services: services:
surrealdb: surrealdb:
container_name: surrealdb container_name: surrealdb
image: surrealdb/surrealdb:v2.0.1 image: surrealdb/surrealdb:v2.0.2
env_file: env_file:
- .env - .env
entrypoint: entrypoint:

2
docker-compose-surrealdb.yml
View file

@ -1,7 +1,7 @@
services: services:
surrealdb: surrealdb:
container_name: surrealdb container_name: surrealdb
image: surrealdb/surrealdb:v2.0.1 image: surrealdb/surrealdb:v2.0.2
env_file: env_file:
- .env - .env
entrypoint: entrypoint:

24
flake.lock generated
View file

@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727103737, "lastModified": 1727306865,
"narHash": "sha256-otyUwbqaXYkeBxPy3Gf0ACB0rHl23OzAlfpsVvY1hbc=", "narHash": "sha256-okbcHbpPc9wDVrppp8kQDOWd+PBwlHNkbiCLQ/GArvM=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "45780a4d66ad647bd3c148509fb081943efdacfd", "rev": "6960f548f3abd498f948105b627d33065e23e37c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1727060013, "lastModified": 1727316705,
"narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=", "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba", "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"rust-analyzer-src": [] "rust-analyzer-src": []
}, },
"locked": { "locked": {
"lastModified": 1727159616, "lastModified": 1727245890,
"narHash": "sha256-1VjZ+khJwZphRJZy2HvbMSCgi3OV7mu8RjVzqCxVi2k=", "narHash": "sha256-B4gUhZxqdn24PqL7z7ZuvLOS84HVskhKRByWdgA4/RI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "4306d494985e00719573bbdeb863c27c6d83dc9c", "rev": "de3acda8b67b92abeeb35ac236924afd959874ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727089097, "lastModified": 1727173215,
"narHash": "sha256-ZMHMThPsthhUREwDebXw7GX45bJnBCVbfnH1g5iuSPc=", "narHash": "sha256-OtMlWYCqBDbnEsByoows785Gem9CSMiXYEBiKKtStk4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "568bfef547c14ca438c56a0bece08b8bb2b71a9c", "rev": "965289e5e07243f1cde3212d8bcaf726d36c5c46",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -135,7 +135,8 @@
packages = { packages = {
default = my-crate; default = my-crate;
inherit my-crate dockerImage; inherit my-crate
dockerImage;
}; };
apps.default = flake-utils.lib.mkApp { apps.default = flake-utils.lib.mkApp {