diff --git a/.gitattributes b/.gitattributes index f82bd0d..a7c9697 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ releases/tar/** filter=lfs diff=lfs merge=lfs -text +releases/whl/** filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 21808db..fba53aa 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ d2/book1/books !.vscode/launch.json python/build .*.kate-swp +!releases/whl/*.whl diff --git a/Makefile b/Makefile index 00e74e5..441c154 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,12 @@ python_put_dist: done ln -sf $(INSTALL_ROOT)/env3/bin/online-fxreader-pr34-commands $(INSTALL_ROOT)/commands +PYTHON_PROJECTS_NAMES ?= online.fxreader.pr34 +python_whl: + for f in $(PYTHON_PROJECTS_NAMES); do \ + ./m.py deploy:wheel -o releases/whl -p $$f; \ + done + python_put: python_put_dist python_put_env dotfiles_put: diff --git a/python/online/fxreader/pr34/commands_typed/crypto.py b/python/online/fxreader/pr34/commands_typed/crypto.py index 36b7caf..827fb0d 100644 --- a/python/online/fxreader/pr34/commands_typed/crypto.py +++ b/python/online/fxreader/pr34/commands_typed/crypto.py @@ -10,16 +10,18 @@ class PasswordUtils: @classmethod def secret_hash( cls, - secret: str, + secret: str | bytes, mode: Literal['base64'], + salt: Optional[bytes] = None, ) -> tuple[str, str]: ... @overload @classmethod def secret_hash( cls, - secret: str, + secret: str | bytes, mode: Literal['bytes'], + salt: Optional[bytes] = None, ) -> tuple[bytes, bytes]: ... @classmethod @@ -66,7 +68,7 @@ class PasswordUtils: @classmethod def secret_check( cls, - secret: str, + secret: str | bytes, salt: str | bytes, hashed_secret: str | bytes, ) -> bool: diff --git a/releases/whl/online_fxreader_pr34-0.1.4.13-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.4.13-py3-none-any.whl new file mode 100644 index 0000000..98f847e --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.4.13-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64cc4911c7af70e4a4a6de5ea9a915b291efb7eb93320a2cf7176ac9655a7f94 +size 67721