diff --git a/.python-version b/.python-version deleted file mode 100644 index e4fba2183587225f216eeada4c78dfab6b2e65f5..0000000000000000000000000000000000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12 diff --git a/README.md b/README.md index 88e1a78c84adcf5d5f0d1c0335775591eac80ea9..b11a07713e19db2ff56b2c066dfa9aade3f9edce 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,14 @@ # py-spectre Python implementation of [Spectre](https://spectre.app). +## Code Quality + +1. `black .` +2. `isort .` +3. `flake8` +4. `mypy` +5. `pytest` + ## License -[GPLv3](LICENSE) - Same as original algorithm +[GPLv3](LICENSE) - Same as original algorithm \ No newline at end of file diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 82d9e434075c3869f40e2854df09bf019279f3f7..0000000000000000000000000000000000000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 624652c994d6283ad56dbbf57e42af56998e9bba..0000000000000000000000000000000000000000 --- a/flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - outputs = - { nixpkgs, ... }: - let - systems = [ - "x86_64-linux" - "i686-linux" - "x86_64-darwin" - "aarch64-linux" - "armv6l-linux" - "armv7l-linux" - ]; - forAllSystems = f: nixpkgs.lib.genAttrs systems f; - in - { - devShells = forAllSystems ( - system: - let - pkgs = import nixpkgs { inherit system; }; - in - { - default = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - uv - ruff - mypy - python3Packages.pytest - ]; - }; - } - ); - }; -} diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 735647b762ad66afa435bcc60783a087b9ce0d78..0000000000000000000000000000000000000000 --- a/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[project] -name = "spectre" -version = "0.1.0" -description = "Python implementation of Spectre/Masterpassword" -readme = "README.md" -authors = [ - { name = "jolheiser", email = "git@jolheiser.com" } -] -requires-python = ">=3.9" -dependencies = [] -license = "GPL-3.0" - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..c2401e004e3dee1bfb4817a5638989d18191e97c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,22 @@ +attrs==21.2.0 +black==21.11b1 +click==8.0.3 +flake8==4.0.1 +iniconfig==1.1.1 +isort==5.10.1 +mccabe==0.6.1 +mypy==0.910 +mypy-extensions==0.4.3 +packaging==21.3 +pathspec==0.9.0 +platformdirs==2.4.0 +pluggy==1.0.0 +py==1.11.0 +pycodestyle==2.8.0 +pyflakes==2.4.0 +pyparsing==3.0.6 +pytest==6.2.5 +regex==2021.11.10 +toml==0.10.2 +tomli==1.2.2 +typing_extensions==4.0.0 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000000000000000000000000000000000..f997df9398c348fe7b57a1a5670195dd2ed4b81d --- /dev/null +++ b/setup.cfg @@ -0,0 +1,17 @@ +[isort] +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +use_parentheses=True +line_length=88 + +[flake8] +ignore = E203, E266, E501, W503 +max-line-length = 88 +max-complexity = 18 +select = B,C,E,F,W,T4 +exclude = .git,venv + +[mypy] +files=spectre,test +ignore_missing_imports=true \ No newline at end of file diff --git a/src/spectre/__init__.py b/spectre/__init__.py rename from src/spectre/__init__.py rename to spectre/__init__.py diff --git a/src/spectre/py.typed b/src/spectre/py.typed deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 Binary files a/src/spectre/py.typed and /dev/null differ diff --git a/src/spectre/scope.py b/spectre/scope.py rename from src/spectre/scope.py rename to spectre/scope.py diff --git a/src/spectre/spectre.py b/spectre/spectre.py rename from src/spectre/spectre.py rename to spectre/spectre.py index ba5c1b0d80578971c433d291bf93a7278ad0b2c5..9c17fe1805c24b9fdc6f08f8fccc87f9db8ea66a 100644 --- a/src/spectre/spectre.py +++ b/spectre/spectre.py @@ -1,7 +1,6 @@ import hashlib import struct from hmac import HMAC -from typing import Optional from spectre.scope import Scope, Scoper, default_scoper from spectre.template import Template, _characters, _templates @@ -46,7 +45,7 @@ def site( self, site_name: str, - template_type: Optional[Template] = None, + template_type: Template = None, counter: int = 1, scope: Scope = Scope.AUTHENTICATION, ) -> str: diff --git a/src/spectre/template.py b/spectre/template.py rename from src/spectre/template.py rename to spectre/template.py diff --git a/src/test/__init__.py b/test/__init__.py rename from src/test/__init__.py rename to test/__init__.py diff --git a/src/test/spectre_tests.xml b/test/spectre_tests.xml rename from src/test/spectre_tests.xml rename to test/spectre_tests.xml diff --git a/src/test/test_spectre.py b/test/test_spectre.py rename from src/test/test_spectre.py rename to test/test_spectre.py index 3a0964c84d9776be3aa79aa36909863abc59ba10..45d3fafc1e9613ed170915b66a3d2b72dc2627cd 100644 --- a/src/test/test_spectre.py +++ b/test/test_spectre.py @@ -24,7 +24,7 @@ assert pw == "Ig^JIcxD!*)TbefJBi6-" def test_spectre(): - tree = ElementTree(file="src/test/spectre_tests.xml") + tree = ElementTree(file="test/spectre_tests.xml") tests = tree.getroot().findall("case") default = tests[0] diff --git a/uv.lock b/uv.lock deleted file mode 100644 index 79c2d883fbc0ec87ecb2f97333c64b76705771c3..0000000000000000000000000000000000000000 --- a/uv.lock +++ /dev/null @@ -1,8 +0,0 @@ -version = 1 -revision = 1 -requires-python = ">=3.9" - -[[package]] -name = "spectre" -version = "0.1.0" -source = { editable = "." }