Skip to content

Commit

Permalink
Merge branch 'codespell-project:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
polluks authored Aug 23, 2024
2 parents cae2fb9 + b861901 commit deecdb3
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/codespell-private.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
REQUIRE_ASPELL: true
RUFF_OUTPUT_FORMAT: github
# Make sure we're using the latest aspell dictionary
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10
strategy:
fail-fast: false
Expand All @@ -25,6 +25,7 @@ jobs:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
no-toml:
- ""
include:
Expand All @@ -39,6 +40,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
- run: sudo apt-get install libaspell-dev aspell-en
- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ repos:
- -d
- "{extends: relaxed, rules: {line-length: {max: 90}}}"
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.1
rev: v0.6.1
hooks:
- id: ruff
- id: ruff-format
Expand All @@ -75,11 +75,11 @@ repos:
additional_dependencies:
- tomli
- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.18
rev: v0.19
hooks:
- id: validate-pyproject
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.10.1
rev: v1.11.1
hooks:
- id: mypy
args: ["--config-file", "pyproject.toml"]
Expand Down
3 changes: 3 additions & 0 deletions codespell_lib/_codespell.py
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,9 @@ def main(*args: str) -> int:
for ifile, cfg_file in enumerate(used_cfg_files, start=1):
print(f" {ifile}: {cfg_file}")

if options.interactive > 0:
options.write_changes = True

if options.regex and options.write_changes:
return _usage_error(
parser,
Expand Down
53 changes: 52 additions & 1 deletion codespell_lib/data/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2614,6 +2614,7 @@ agani->again
aganist->against
agant->agent
agants->agents, against,
agein->again, ageing,
aggaravate->aggravate
aggaravated->aggravated
aggaravates->aggravates
Expand Down Expand Up @@ -3832,6 +3833,7 @@ altitide->altitude
altitute->altitude
altnerately->alternately
altogehter->altogether
altogher->altogether
altogheter->altogether
altough->although
altought->although
Expand Down Expand Up @@ -5471,6 +5473,8 @@ applicaton->application
applicatons->applications
applicble->applicable
applicible->applicable
applictaion->application
applictaions->applications
appliction->application
applictions->applications
applide->applied
Expand Down Expand Up @@ -9732,6 +9736,7 @@ boostrappers->bootstrappers
boostrapping->bootstrapping
boostraps->bootstraps
booteek->boutique
bootime->boot time
bootlaoder->bootloader
bootlaoders->bootloaders
bootle->bottle
Expand Down Expand Up @@ -10971,8 +10976,10 @@ capabilitiy->capability
capabillities->capabilities
capabillity->capability
capabilties->capabilities
capabiltiies->capabilities
capabiltities->capabilities
capabiltity->capability
capabiltiy->capability
capabilty->capability
capabitilies->capabilities
capabitily->capability
Expand Down Expand Up @@ -12834,6 +12841,10 @@ clame->claim
clammer->clamber, clamor,
clanup->cleanup
clanups->cleanups
clapse->collapse, clasp, claps, lapse,
clapsed->collapsed
clapses->collapses
clapsing->collapsing
claravoyant->clairvoyant
claravoyantes->clairvoyants
claravoyants->clairvoyants
Expand Down Expand Up @@ -12996,6 +13007,7 @@ cliboard->clipboard
cliboards->clipboards
clibpoard->clipboard
clibpoards->clipboards
clicable->clickable
clickin->clicking, click in,
cliens->clients
cliensite->client-side
Expand Down Expand Up @@ -14503,7 +14515,7 @@ complets->completes
complette->complete
complettly->completely
complety->completely
complext->complexity
complext->complexity, complex,
complextion->complexion
complextions->complexions
compliace->compliance
Expand Down Expand Up @@ -14709,6 +14721,8 @@ comverter->converter
comverters->converters
comverting->converting
comverts->converts
comvolution->convolution
comvolutions->convolutions
conact->contact
conacted->contacted
conacting->contacting
Expand Down Expand Up @@ -19586,6 +19600,8 @@ demagogs->demagogues
demaind->demand
demandin->demanding, demand in,
demaned->demand, demeaned,
demaond->demand
demaonds->demands
demenor->demeanor
demension->dimension
demensional->dimensional
Expand Down Expand Up @@ -24348,6 +24364,7 @@ enternal->internal, external, eternal,
enternally->internally, externally, eternally,
enterprice->enterprise
enterprices->enterprises
enterpris->enterprise
entertainin->entertaining, entertain in,
entery->entry
enteties->entities
Expand All @@ -24367,6 +24384,7 @@ enthusiatically->enthusiastically
entierly->entirely
entired->entered, entire,
entireity->entirety
entirerly->entirely
entires->entries
entirey->entirely
entirity->entirety
Expand Down Expand Up @@ -24685,6 +24703,7 @@ equivalancy->equivalency
equivalant->equivalent
equivalantly->equivalently
equivalants->equivalents
equivalen->equivalent
equivalenet->equivalent, equivalents,
equivalentsly->equivalently, equivalency,
equivallent->equivalent
Expand Down Expand Up @@ -27154,6 +27173,7 @@ extrem->extremum, extreme,
extremaly->extremely
extremeley->extremely
extremelly->extremely
extremem->extreme
extrememe->extreme
extrememely->extremely
extrememly->extremely
Expand Down Expand Up @@ -27426,6 +27446,13 @@ fauture->feature
fautured->featured
fautures->features
fauturing->featuring
favilitate->facilitate
favilitated->facilitated
favilitates->facilitates
favilitating->facilitating
favilitation->facilitation
favilitator->facilitator
favilitators->facilitators
favorin->favoring, favor in,
favoutrable->favourable
favritt->favorite
Expand Down Expand Up @@ -32255,6 +32282,7 @@ indivudual->individual
indivudually->individually
indivuduals->individuals
indizies->indices
indoro->indoor
indpendent->independent
indpendently->independently
indrect->indirect
Expand Down Expand Up @@ -32338,6 +32366,8 @@ infalte->inflate
infalted->inflated
infaltes->inflates
infalting->inflating
infastructure->infrastructure
infastructures->infrastructures
infectuous->infectious
infered->inferred
inferface->interface
Expand Down Expand Up @@ -36867,6 +36897,7 @@ mathods->methods
matinay->matinee
matirx->matrix
matix->matrix
matrces->matrices
matreial->material
matreials->materials
matresses->mattresses
Expand Down Expand Up @@ -37445,6 +37476,7 @@ Microsof->Microsoft
Microsofot->Microsoft
Micrsft->Microsoft
Micrsoft->Microsoft
middel->middle
middlware->middleware
mideval->medieval
midevil->medieval
Expand Down Expand Up @@ -37700,6 +37732,10 @@ mirorred->mirrored
mirorring->mirroring
mirorrs->mirrors
mirors->mirrors, minors,
mirrir->mirror
mirrired->mirrored
mirriring->mirroring
mirrirs->mirrors
mirro->mirror
mirroed->mirrored
mirrorin->mirroring, mirror in,
Expand Down Expand Up @@ -45775,6 +45811,8 @@ prohibt->prohibit
prohibted->prohibited
prohibting->prohibiting
prohibts->prohibits
proir->prior
proirities->priorities
proirity->priority
projcet->project
projcets->projects
Expand Down Expand Up @@ -47189,6 +47227,7 @@ reademe->README
readiable->readable
readibility->readability
readible->readable
readibly->readably
readig->reading
readigs->readings
readin->reading, read in,
Expand Down Expand Up @@ -47651,6 +47690,7 @@ recogninse->recognise
recognisin->recognising
recognizeable->recognizable
recognizin->recognizing
recognizion->recognition
recognzied->recognized
recomend->recommend
recomendation->recommendation
Expand Down Expand Up @@ -48014,6 +48054,8 @@ reduceable->reducible
reducin->reducing
redudancy->redundancy
redudant->redundant
redumndancy->redundancy
redumndant->redundant
redunancy->redundancy
redunant->redundant
redundacy->redundancy
Expand Down Expand Up @@ -48658,6 +48700,7 @@ releaing->releasing
releant->relevant, relent,
releas->release
releasead->released
releaseds->released, releases,
releaseing->releasing
releasin->releasing
releasse->release
Expand Down Expand Up @@ -51834,6 +51877,7 @@ seeging->sieging
seein->seeing, see in, seen, stein,
seelect->select
seelected->selected
seemd->seemed
seemes->seems
seemless->seamless
seemlessly->seamlessly
Expand Down Expand Up @@ -52335,6 +52379,8 @@ seplicurally->sepulchrally
seplicuraly->sepulchrally
seplicurlly->sepulchrally
seporate->separate
sepparatelly->separately
sepparately->separately
sepparation->separation
sepparations->separations
sepperate->separate
Expand Down Expand Up @@ -55507,7 +55553,11 @@ stuructured->structured
stuructures->structures
sturucturing->structuring
stutdown->shutdown
stutied->studied
stuties->studies
stutus->status
stuty->study
stutying->studying
styed->stayed, styled,
styhe->style
styile->style
Expand Down Expand Up @@ -55886,6 +55936,7 @@ succefull->successful, successfully,
succefully->successfully
succefuly->successfully
succes->success
succesdsful->successful
succesful->successful
succesfull->successful
succesfullly->successfully
Expand Down
2 changes: 1 addition & 1 deletion codespell_lib/data/dictionary_rare.txt
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ lien->line
liens->lines
lightening->lightning, lighting,
loafing->loading
loath->loathe
lod->load, loud, lode,
loner->longer
loos->loose, lose,
Expand Down Expand Up @@ -238,6 +237,7 @@ regraded->regarded
regrading->regarding
remainer->remainder
remainers->remainders
repot->report, repost,
retuned->returned
retying->retrying
revered->reversed
Expand Down
2 changes: 0 additions & 2 deletions codespell_lib/tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,6 @@ def test_interactivity(
cs.main("-i", "-1", fname)
assert e.type is SystemExit
assert e.value.code != 0
with FakeStdin("y\n"):
assert cs.main("-i", "3", fname) == 1
with FakeStdin("n\n"):
result = cs.main("-w", "-i", "3", fname, std=True)
assert isinstance(result, tuple)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@ max-complexity = 45
[tool.ruff.lint.pylint]
allow-magic-value-types = ["bytes", "int", "str",]
max-args = 13
max-branches = 47
max-branches = 48
max-returns = 12
max-statements = 119

0 comments on commit deecdb3

Please sign in to comment.