diff --git a/.github/mergify.yml b/.github/mergify.yml index 057c323..b50cdc9 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -73,20 +73,6 @@ pull_request_rules: - -files=.markdownlint-cli2.yaml - -files=.github/workflows/docs.yml - - or: - - and: - - check-success=spellcheck - - or: - - files~=\.md$ - - files=tox.ini - - files~=^\.spellcheck[^/]+$ - - files=.github/workflows/spellcheck.yml - - and: - - -files~=\.md$ - - -files=tox.ini - - -files~=^\.spellcheck[^/]+$ - - -files=.github/workflows/spellcheck.yml - actions: merge: method: merge @@ -101,7 +87,6 @@ pull_request_rules: - files=scripts/ruff.sh - files=.pre-commit-config.yaml - files=.pylintrc - - files~=^\.spellcheck[^/]+$ - files=tox.ini - files=.markdownlint-cli2.yaml actions: diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml deleted file mode 100644 index 681d58c..0000000 --- a/.github/workflows/spellcheck.yml +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -name: Spellcheck - -on: - push: - branches: - - "main" - paths: - - '**.md' - - '.github/workflows/spellcheck.yml' # This workflow - pull_request: - branches: - - "main" - paths: - - '**.md' - - '.github/workflows/spellcheck.yml' # This workflow - -env: - LC_ALL: en_US.UTF-8 - -defaults: - run: - shell: bash - -permissions: - contents: read - -jobs: - spellcheck: - runs-on: ubuntu-latest - steps: - - name: "Harden Runner" - uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0 - with: - egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - - name: "Checkout" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 - - - name: Spellcheck - uses: rojopolis/spellcheck-github-actions@584b2ae95998967a53af7fbfb7f5b15352c38748 # v0.49.0 diff --git a/.spellcheck-en-custom.txt b/.spellcheck-en-custom.txt deleted file mode 100644 index 3251d44..0000000 --- a/.spellcheck-en-custom.txt +++ /dev/null @@ -1,30 +0,0 @@ - -# make spellcheck-sort -# Please keep this file sorted: -# SPDX-License-Identifier: Apache-2.0 -Backport -backported -benchmarking -codebase -cli -dev -dr -eval -gpt -hoc -http -instructlab -jsonl -justfile -MMLU -openai -pre -SDG -Tatsu -tl -TODO -tox -venv -vllm -barebones -LM diff --git a/.spellcheck.yml b/.spellcheck.yml deleted file mode 100644 index 36dc7e4..0000000 --- a/.spellcheck.yml +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -matrix: -- name: markdown - aspell: - lang: en - d: en_US - camel-case: true - mode: markdown - sources: - - "**/*.md|!.tox/**|!venv/**" - dictionary: - wordlists: - - .spellcheck-en-custom.txt - pipeline: - - pyspelling.filters.context: - context_visible_first: true - escapes: '\\[\\`~]' - delimiters: - # Ignore multiline content between fences (fences can have 3 or more back ticks) - # ```language - # content - # ``` - - open: '(?s)^(?P *`{3,}).*?$' - close: '^(?P=open)$' - # Ignore text between inline back ticks - - open: '(?P`+)' - close: '(?P=open)' diff --git a/Makefile b/Makefile index 6155b53..26892eb 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,6 @@ md-lint: ## Lint markdown files $(ECHO_PREFIX) printf " %-12s ./...\n" "[MD LINT]" $(CMD_PREFIX) podman run --rm -v $(CURDIR):/workdir --security-opt label=disable docker.io/davidanson/markdownlint-cli2:latest > /dev/null -.PHONY: spellcheck -spellcheck: ## Spellcheck markdown files - tox p -e spellcheck - -.PHONY: spellcheck-sort -spellcheck-sort: .spellcheck-en-custom.txt ## Sort spellcheck directory - sort -d -f -o $< $< - .PHONY: verify verify: check-tox ## Run linting, typing, and formatting checks via tox tox p -e fastlint,mypy,ruff diff --git a/requirements-dev.txt b/requirements-dev.txt index e1acce2..1ec6b68 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,7 +14,6 @@ pytest-html ruff isort -pyspelling mypy>=1.10.0 types-tqdm diff --git a/tox.ini b/tox.ini index a50c2ad..6513073 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ [tox] # py3-unit runs unit tests with 'python3' # py311-unit runs the same tests with 'python3.11' -envlist = ruff, lint, mypy, spellcheck, py3-{unit, functional} +envlist = ruff, lint, mypy, py3-{unit, functional} minversion = 4.4 [testenv] @@ -71,17 +71,6 @@ commands = ./scripts/ruff.sh {posargs:fix} allowlist_externals = ./scripts/ruff.sh -[testenv:spellcheck] -description = spell check (needs 'aspell' command) -skip_install = true -skipsdist = true -deps = - pyspelling -commands = - sh -c 'command -v aspell || (echo "aspell is not installed. Please install it." && exit 1)' - {envpython} -m pyspelling --config {toxinidir}/.spellcheck.yml --spellchecker aspell -allowlist_externals = sh - [testenv:mypy] description = Python type checking with mypy deps =