diff --git a/.yamlfmt b/.yamlfmt index 0246164a..6d723a3f 100644 --- a/.yamlfmt +++ b/.yamlfmt @@ -1,3 +1,5 @@ +doublestar: true # Include/exclude patterns will use git style globbing + formatter: type: basic max_line_length: 100 diff --git a/.zetch.lock b/.zetch.lock index afacc1c6..b7e780d0 100644 --- a/.zetch.lock +++ b/.zetch.lock @@ -1,22 +1,22 @@ { "version": "0.0.10", "files": { + "py_rust/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", + "docs/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", "README.zetch.md": "5a9e12fc034f4df80e8ff726f0317573ea69c1c5f403ce87651fc967c3f8d452", - "docs/index.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", - "docs/CONTRIBUTING.zetch.md": "bace46dc064746b54cf472eba960d934d705c2f83120b865a4b47032ff1552c5", "CODE_OF_CONDUCT.zetch.md": "bf106326ffc75f5167cfde27c997c77c6b97c843a9e392b564355d0e70e50b97", - "py_rust/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", - "LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", "js/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", - "js/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", - "docs/CODE_OF_CONDUCT.zetch.md": "bf106326ffc75f5167cfde27c997c77c6b97c843a9e392b564355d0e70e50b97", - "rust/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", "js/tsconfig.zetch.json": "fb5d57b825bb3c2f6dd4254bf939f2444e52946622a7f93b91e3acb75876ebbc", - "docs/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", - "py_rust/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", - "CONTRIBUTING.zetch.md": "bace46dc064746b54cf472eba960d934d705c2f83120b865a4b47032ff1552c5", "py/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", + "docs/index.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", + "docs/CONTRIBUTING.zetch.md": "bace46dc064746b54cf472eba960d934d705c2f83120b865a4b47032ff1552c5", + "rust/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", "py/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", - "rust/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b" + "py_rust/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", + "CONTRIBUTING.zetch.md": "bace46dc064746b54cf472eba960d934d705c2f83120b865a4b47032ff1552c5", + "js/LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", + "rust/README.zetch.md": "b5044e91ef0ebf3797ceeb79fa86d3316480497758b0cea8be7fce83e1d3f8a7", + "LICENSE.zetch.md": "d2c12e539d357957b950a54a5477c3a9f87bd2b3ee707be7a4db7adaf5aacc2b", + "docs/CODE_OF_CONDUCT.zetch.md": "bf106326ffc75f5167cfde27c997c77c6b97c843a9e392b564355d0e70e50b97" } } \ No newline at end of file diff --git a/bitbazaar.code-workspace b/bitbazaar.code-workspace index 5faaff5f..86af3d45 100644 --- a/bitbazaar.code-workspace +++ b/bitbazaar.code-workspace @@ -76,8 +76,7 @@ "editor.formatOnSave": true, "editor.formatOnPaste": false, "editor.codeActionsOnSave": { - // Ruff will auto fix issues and sort imports (needs extension https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff) - "source.fixAll": true + "source.fixAll": "explicit" }, // Ruff (replaces black) formats python code (needs extension https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff) "editor.defaultFormatter": "charliermarsh.ruff" diff --git a/py_rust/Cargo.lock b/py_rust/Cargo.lock index d8d06488..4a85b3bc 100644 --- a/py_rust/Cargo.lock +++ b/py_rust/Cargo.lock @@ -118,15 +118,16 @@ dependencies = [ [[package]] name = "bitbazaar" -version = "0.0.23" +version = "0.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3572d2f022b0dff0c9020bdce3da6a97cfddb33efb7ebf95463c86ca9230a43a" +checksum = "7fa6a913a8716b25a10922db990d607c9d230e329ccd11a49eca54500f22c29b" dependencies = [ "chrono", "clap", "colored", "comfy-table", "error-stack", + "normpath", "once_cell", "parking_lot", "regex", @@ -144,7 +145,9 @@ dependencies = [ "bitbazaar", "colored", "error-stack", + "parking_lot", "pyo3", + "strum", "tracing", ] @@ -462,6 +465,15 @@ dependencies = [ "adler", ] +[[package]] +name = "normpath" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" diff --git a/py_rust/Cargo.toml b/py_rust/Cargo.toml index 4673a80e..b4ce7a55 100644 --- a/py_rust/Cargo.toml +++ b/py_rust/Cargo.toml @@ -7,7 +7,6 @@ license = "MIT" # This crate should only be released as a python package, so disable any rust side crates publishing: publish = false - [lib] name = "bitbazaar_rs" crate-type = ["cdylib"] @@ -18,15 +17,10 @@ path = "src/lib.rs" colored = '2' tracing = "0.1" error-stack = "0.4" - - -[dependencies.bitbazaar] -features = [] -version = '0.0.23' - -[dependencies.pyo3] -features = ['extension-module', 'chrono', 'generate-import-lib'] -version = '0.20.0' +bitbazaar = { version = '0.0.28', features = [] } +pyo3 = { version = '0.20.0', features = ['extension-module', 'chrono', 'generate-import-lib'] } +parking_lot = { version = "0.12", features = ['deadlock_detection', 'serde'] } +strum = { version = '0.25', features = ['derive'] } [profile.profiler] inherits = "release" # Adds on top of the default release profile diff --git a/py_rust/pyproject.toml b/py_rust/pyproject.toml index a9b52c54..83c25c3a 100644 --- a/py_rust/pyproject.toml +++ b/py_rust/pyproject.toml @@ -6,8 +6,6 @@ build-backend = "maturin" python-source = "python" module-name = "bitbazaar_rs._rs" -dependencies = [] - [project] name = "bitbazaar_rs" description = "An assortment of publicly available cross-language utilities useful to my projects." @@ -32,6 +30,9 @@ classifiers = [ 'License :: OSI Approved', ] +# Python deps: +dependencies = [] + [project.urls] "Sourcecode" = "https://github.com/zakstucke/bitbazaar" "Documentation" = "https://zakstucke.github.io/bitbazaar"