diff --git a/Makefile b/Makefile index c81acaa..20454a8 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ test-dist:: clean build install-dist test-readme REDIRECT_OUTPUT ?= > /dev/null test-readme:: - bash test-readme.sh $(REDIRECT_OUTPUT) + bash scripts/test-readme.sh $(REDIRECT_OUTPUT) push:: test-fast git-off-main git-no-unsaved @branch=$$(git symbolic-ref --short HEAD); \ @@ -24,7 +24,7 @@ build: install-ci poetry build download-lists:: - bash download-lists.sh + bash scripts/download-lists.sh clean:: find . -type d -name "__pycache__" -exec rm -rf {} + @@ -51,7 +51,7 @@ check:: poetry run black . --check poetry run isort . --check poetry run flake8 . --ignore=E501,W503 - bash -n *.sh + bash -n scripts/*.sh lint:: isort . diff --git a/poetry.lock b/poetry.lock index 47d4b56..b4f323e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1284,6 +1284,17 @@ files = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] +[[package]] +name = "toml" +version = "0.10.2" +description = "Python Library for Tom's Obvious, Minimal Language" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, +] + [[package]] name = "tomli" version = "2.0.1" @@ -1456,4 +1467,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8.1, <4.0" -content-hash = "6b6e24aabad5de2972ca9960ad194567f66944c0873b2f73405cedf492738687" +content-hash = "5d18380aa2462972e8c08f63f7a657750b13f2ee829fe65366d98b78fcd084b8" diff --git a/pyproject.toml b/pyproject.toml index 279b8ee..b5272ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,7 @@ importlib-resources = { version = "^6.4.0", python = "<3.9" } pycryptodome = "~3.20.0" pytest = "~8.2.1" pytest-xdist = "~3.6.1" +toml = "^0.10.2" [tool.poetry.scripts] bipsea = "bipsea.bipsea:cli" diff --git a/download-lists.sh b/scripts/download-lists.sh similarity index 100% rename from download-lists.sh rename to scripts/download-lists.sh diff --git a/test-readme.sh b/scripts/test-readme.sh similarity index 92% rename from test-readme.sh rename to scripts/test-readme.sh index 444c75d..7191e77 100644 --- a/test-readme.sh +++ b/scripts/test-readme.sh @@ -29,7 +29,7 @@ poetry run bipsea validate -f free -m "123456123456123456" | poetry run bipsea x poetry run bipsea validate -f free -m "$(cat input.txt)" -poetry run bipsea validate -m $MNEMONIC | poetry run bipsea xprv | poetry run bipsea derive -a base85 +poetry run bipsea validate -m "$MNEMONIC" | poetry run bipsea xprv | poetry run bipsea derive -a base85 poetry run bipsea validate -m "$MNEMONIC" | poetry run bipsea xprv | poetry run bipsea derive -a mnemonic -t jpn -n 12