From 3137508c1d830d7bfc17596453057ae493ac1459 Mon Sep 17 00:00:00 2001 From: boulais01 Date: Mon, 22 Apr 2024 14:08:40 -0500 Subject: [PATCH 1/2] feat: add checks to toml --- .devenv/gc/shell | 2 +- .devenv/gc/shell-1-link | 1 - .devenv/gc/shell-2-link | 1 + poetry.toml | 91 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 91 insertions(+), 4 deletions(-) delete mode 120000 .devenv/gc/shell-1-link create mode 120000 .devenv/gc/shell-2-link diff --git a/.devenv/gc/shell b/.devenv/gc/shell index 2b5306e..f0d48df 120000 --- a/.devenv/gc/shell +++ b/.devenv/gc/shell @@ -1 +1 @@ -shell-1-link \ No newline at end of file +shell-2-link \ No newline at end of file diff --git a/.devenv/gc/shell-1-link b/.devenv/gc/shell-1-link deleted file mode 120000 index 82d3944..0000000 --- a/.devenv/gc/shell-1-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/p4y6p2djvxxmck22kpzjymszjqwxp63s-devenv-shell-env \ No newline at end of file diff --git a/.devenv/gc/shell-2-link b/.devenv/gc/shell-2-link new file mode 120000 index 0000000..9e3a17b --- /dev/null +++ b/.devenv/gc/shell-2-link @@ -0,0 +1 @@ +/nix/store/3dad29jif1y2w72bly039pfs75ndy5y6-devenv-shell-env \ No newline at end of file diff --git a/poetry.toml b/poetry.toml index 351b7ba..3647875 100644 --- a/poetry.toml +++ b/poetry.toml @@ -1,2 +1,89 @@ -[installer] -no-binary = ["ruff"] +[tool.poetry] +name = "bosco" +version = "0.0.0" +description = "" + +[tool.poetry.scripts] +bosco = "bosco.main:cli" + +[tool.poetry.dependencies] +python = "^3.8" +rich = "^10.9.0" +typer = {extras = ["all"], version = "^0.7.0"} +rapidfuzz = "^3.6.1" + +[tool.poetry.dev-dependencies] +taskipy = "^1.8.1" +mypy = "^0.910" +pytest = "^7.2.0" +pymarkdownlnt = "^0.9.8" + +[tool.poetry.group.dev.dependencies] +ruff = "==0.1.15" +symbex = "^1.4" +pytest-cov = "^4.1.0" +pytest-xdist = "^3.5.0" +pytest-clarity = "^1.0.1" +pytest-randomly = "^3.15.0" +mdtoc = "^1.3" + +[tool.taskipy.variables] +project = "bosco" +tests = "tests" +readme = "../README.md" +check-command = { var = "ruff check {project} {tests}", recursive = true } +coverage-test-command = "pytest -s --cov-context=test --cov-fail-under=90 --cov-report term-missing --cov-report json --cov --cov-branch" +coverage-test-command-silent = "pytest -x --show-capture=no --cov-report term-missing --cov-report json --cov --cov-branch" +fixformat-command = { var = "ruff format {project} {tests}", recursive = true } +format-command = { var = "ruff format --check {project} {tests}", recursive = true } +markdownlint-command = { var = "poetry run pymarkdown --config .pymarkdown.cfg scan {readme}", recursive = true } +mypy-command = {var = "mypy {project} {tests}", recursive = true} +symbex-typed-command = {var = "symbex -s --untyped -d {project} --check", recursive = true} +symbex-documented-command = {var = "symbex -s --undocumented -d {project} --check", recursive = true} +test-command = "pytest -x -s -vv -n auto" +test-silent-command = "pytest -x --show-capture=no" + +[tool.taskipy.tasks] +all = "task format && task lint && task test && task coverage" +lint = "task format && task mypy && task symbex && task markdownlint" +symbex = "task symbex-typed && task symbex-documented" +check = { cmd = "{check-command}", help = "Run the ruff linting checks", use_vars = true } +coverage = { cmd = "{coverage-test-command}", help = "Run test coverage monitoring", use_vars = true } +coverage-silent = { cmd = "{coverage-test-command-silent}", help = "Run test coverage monitoring", use_vars = true } +format = { cmd = "{format-command}", help = "Run the ruff formatter on source code", use_vars = true } +format-fix = { cmd = "{fixformat-command}", help = "Run the ruff formatter to fix source code", use_vars = true} +markdownlint = { cmd = "{markdownlint-command}", help = "Run the markdown linter on text files", use_vars = true } +mypy = { cmd = "{mypy-command}", help = "Run the mypy type checks to find potential type errors", use_vars = true } +symbex-typed = { cmd = "{symbex-typed-command}", help = "Run symbex for fully typed functions", use_vars = true } +symbex-documented = { cmd = "{symbex-documented-command}", help = "Run symbex for documentation", use_vars = true } +test = { cmd = "{test-command}", help = "Run tests with order randomization and distribution", use_vars = true } +test-silent = { cmd = "{test-silent-command}", help = "Run tests silently without plugins", use_vars = true } +mdtoc-readme = { cmd = "mdtoc ../README.md", help = "Generate the TOC for the README" } + +[tool.ruff] +line-length = 79 +ignore = [ + "E501", # do not check line length + "E731", # do not assign lambda expression +] +select = [ + "E", # pycodestyle errors + "I", # isort + "F", # Pyflakes + "PL", # pylint + "Q", # flake8-quotes + "RUF", # ruff-specific + "W", # pycodestyle warnings +] + +[tool.isort] +include_trailing_comma = true +force_single_line = true +force_grid_wrap = 0 +use_parentheses = true +ensure_newline_before_comments = true +line_length = 88 + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" \ No newline at end of file From 6190fd9892ef56967354c27285b33f6c8f5906af Mon Sep 17 00:00:00 2001 From: boulais01 Date: Mon, 22 Apr 2024 14:13:53 -0500 Subject: [PATCH 2/2] fix: pyproject.toml update --- poetry.toml | 91 ++------------------------------------------------ pyproject.toml | 53 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 89 deletions(-) diff --git a/poetry.toml b/poetry.toml index 3647875..351b7ba 100644 --- a/poetry.toml +++ b/poetry.toml @@ -1,89 +1,2 @@ -[tool.poetry] -name = "bosco" -version = "0.0.0" -description = "" - -[tool.poetry.scripts] -bosco = "bosco.main:cli" - -[tool.poetry.dependencies] -python = "^3.8" -rich = "^10.9.0" -typer = {extras = ["all"], version = "^0.7.0"} -rapidfuzz = "^3.6.1" - -[tool.poetry.dev-dependencies] -taskipy = "^1.8.1" -mypy = "^0.910" -pytest = "^7.2.0" -pymarkdownlnt = "^0.9.8" - -[tool.poetry.group.dev.dependencies] -ruff = "==0.1.15" -symbex = "^1.4" -pytest-cov = "^4.1.0" -pytest-xdist = "^3.5.0" -pytest-clarity = "^1.0.1" -pytest-randomly = "^3.15.0" -mdtoc = "^1.3" - -[tool.taskipy.variables] -project = "bosco" -tests = "tests" -readme = "../README.md" -check-command = { var = "ruff check {project} {tests}", recursive = true } -coverage-test-command = "pytest -s --cov-context=test --cov-fail-under=90 --cov-report term-missing --cov-report json --cov --cov-branch" -coverage-test-command-silent = "pytest -x --show-capture=no --cov-report term-missing --cov-report json --cov --cov-branch" -fixformat-command = { var = "ruff format {project} {tests}", recursive = true } -format-command = { var = "ruff format --check {project} {tests}", recursive = true } -markdownlint-command = { var = "poetry run pymarkdown --config .pymarkdown.cfg scan {readme}", recursive = true } -mypy-command = {var = "mypy {project} {tests}", recursive = true} -symbex-typed-command = {var = "symbex -s --untyped -d {project} --check", recursive = true} -symbex-documented-command = {var = "symbex -s --undocumented -d {project} --check", recursive = true} -test-command = "pytest -x -s -vv -n auto" -test-silent-command = "pytest -x --show-capture=no" - -[tool.taskipy.tasks] -all = "task format && task lint && task test && task coverage" -lint = "task format && task mypy && task symbex && task markdownlint" -symbex = "task symbex-typed && task symbex-documented" -check = { cmd = "{check-command}", help = "Run the ruff linting checks", use_vars = true } -coverage = { cmd = "{coverage-test-command}", help = "Run test coverage monitoring", use_vars = true } -coverage-silent = { cmd = "{coverage-test-command-silent}", help = "Run test coverage monitoring", use_vars = true } -format = { cmd = "{format-command}", help = "Run the ruff formatter on source code", use_vars = true } -format-fix = { cmd = "{fixformat-command}", help = "Run the ruff formatter to fix source code", use_vars = true} -markdownlint = { cmd = "{markdownlint-command}", help = "Run the markdown linter on text files", use_vars = true } -mypy = { cmd = "{mypy-command}", help = "Run the mypy type checks to find potential type errors", use_vars = true } -symbex-typed = { cmd = "{symbex-typed-command}", help = "Run symbex for fully typed functions", use_vars = true } -symbex-documented = { cmd = "{symbex-documented-command}", help = "Run symbex for documentation", use_vars = true } -test = { cmd = "{test-command}", help = "Run tests with order randomization and distribution", use_vars = true } -test-silent = { cmd = "{test-silent-command}", help = "Run tests silently without plugins", use_vars = true } -mdtoc-readme = { cmd = "mdtoc ../README.md", help = "Generate the TOC for the README" } - -[tool.ruff] -line-length = 79 -ignore = [ - "E501", # do not check line length - "E731", # do not assign lambda expression -] -select = [ - "E", # pycodestyle errors - "I", # isort - "F", # Pyflakes - "PL", # pylint - "Q", # flake8-quotes - "RUF", # ruff-specific - "W", # pycodestyle warnings -] - -[tool.isort] -include_trailing_comma = true -force_single_line = true -force_grid_wrap = 0 -use_parentheses = true -ensure_newline_before_comments = true -line_length = 88 - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" \ No newline at end of file +[installer] +no-binary = ["ruff"] diff --git a/pyproject.toml b/pyproject.toml index 6ebcffa..5debbc3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,61 @@ description = "" authors = ["Gregory M. Kapfhammer "] readme = "README.md" +[tool.poetry.scripts] +bosco = "bosco.main:cli" + [tool.poetry.dependencies] python = "^3.11" +rich = "^10.9.0" +typer = {extras = ["all"], version = "^0.7.0"} + +[tool.poetry.dev-dependencies] +taskipy = "^1.8.1" +mypy = "^0.910" +pytest = "^7.2.0" +pymarkdownlnt = "^0.9.8" + +[tool.poetry.group.dev.dependencies] +ruff = "==0.1.15" +symbex = "^1.4" +pytest-cov = "^4.1.0" +pytest-xdist = "^3.5.0" +pytest-clarity = "^1.0.1" +pytest-randomly = "^3.15.0" +mdtoc = "^1.3" + +[tool.taskipy.variables] +project = "bosco" +tests = "tests" +readme = "../README.md" +check-command = { var = "ruff check {project} {tests}", recursive = true } +coverage-test-command = "pytest -s --cov-context=test --cov-fail-under=90 --cov-report term-missing --cov-report json --cov --cov-branch" +coverage-test-command-silent = "pytest -x --show-capture=no --cov-report term-missing --cov-report json --cov --cov-branch" +fixformat-command = { var = "ruff format {project} {tests}", recursive = true } +format-command = { var = "ruff format --check {project} {tests}", recursive = true } +markdownlint-command = { var = "poetry run pymarkdown --config .pymarkdown.cfg scan {readme}", recursive = true } +mypy-command = {var = "mypy {project} {tests}", recursive = true} +symbex-typed-command = {var = "symbex -s --untyped -d {project} --check", recursive = true} +symbex-documented-command = {var = "symbex -s --undocumented -d {project} --check", recursive = true} +test-command = "pytest -x -s -vv -n auto" +test-silent-command = "pytest -x --show-capture=no" + +[tool.taskipy.tasks] +all = "task format && task lint && task test && task coverage" +lint = "task format && task mypy && task symbex && task markdownlint" +symbex = "task symbex-typed && task symbex-documented" +check = { cmd = "{check-command}", help = "Run the ruff linting checks", use_vars = true } +coverage = { cmd = "{coverage-test-command}", help = "Run test coverage monitoring", use_vars = true } +coverage-silent = { cmd = "{coverage-test-command-silent}", help = "Run test coverage monitoring", use_vars = true } +format = { cmd = "{format-command}", help = "Run the ruff formatter on source code", use_vars = true } +format-fix = { cmd = "{fixformat-command}", help = "Run the ruff formatter to fix source code", use_vars = true} +markdownlint = { cmd = "{markdownlint-command}", help = "Run the markdown linter on text files", use_vars = true } +mypy = { cmd = "{mypy-command}", help = "Run the mypy type checks to find potential type errors", use_vars = true } +symbex-typed = { cmd = "{symbex-typed-command}", help = "Run symbex for fully typed functions", use_vars = true } +symbex-documented = { cmd = "{symbex-documented-command}", help = "Run symbex for documentation", use_vars = true } +test = { cmd = "{test-command}", help = "Run tests with order randomization and distribution", use_vars = true } +test-silent = { cmd = "{test-silent-command}", help = "Run tests silently without plugins", use_vars = true } +mdtoc-readme = { cmd = "mdtoc ../README.md", help = "Generate the TOC for the README" } [tool.ruff] line-length = 79