Skip to content

Commit 32c88cb

Browse files
committed
fix: migrate tox.ini and adopt uv.lock
1 parent d14d9b3 commit 32c88cb

File tree

13 files changed

+2876
-384
lines changed

13 files changed

+2876
-384
lines changed

.config/constraints.txt

Lines changed: 0 additions & 127 deletions
This file was deleted.

.config/dictionary.txt

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
COLORTERM
2+
ESCDELAY
3+
KEGEX
4+
Kegex
5+
Lightbulbs
6+
PULLABLE
7+
Representer
8+
Rocannon's
19
ansiblelint
210
argname
311
argnames
@@ -7,16 +15,13 @@ argvalues
715
autorefs
816
basesystem
917
caplog
10-
cliconf # Ansible network cli abstraction plugin
18+
cliconf
1119
codeclimate
1220
colname
13-
colorterm
1421
coltext
1522
colval
16-
devel
1723
dumpable
1824
dunder
19-
escdelay
2025
facelessuser
2126
fedoraproject
2227
fontawesome
@@ -33,54 +38,43 @@ importables
3338
inlinehilite
3439
introspector
3540
keepends
36-
kegex # An action's regex
41+
kegex
3742
kegexes
3843
lentext
3944
levelname
40-
libonig
4145
lightbulbs
4246
linenums
4347
lintable
4448
lintables
4549
magiclink
4650
maskables
47-
maxsplit
48-
mergeable
4951
mkdocstrings
50-
mqueue # https://github.com/ansible/ansible-runner/issues/984
52+
mqueue
5153
myproject
52-
netcommon # Ansible network collection, seen in tests and README
54+
netcommon
5355
netconf
5456
nonblocking
5557
oldmask
5658
oneline
57-
onigurumacffi
5859
oxfordcomma
59-
preclear
6060
precommand
6161
premanent
6262
pullable
6363
pymdownx
64-
redhatinsights
6564
representer
6665
returndocs
67-
rocannon's
68-
scap
6966
scrollback
7067
somevalue
7168
stripspaces
7269
subaction
7370
subschema
7471
superfences
7572
templatable
76-
templated
7773
testhost
7874
testname
7975
testsfailed
80-
tracebacks
8176
truecolor
8277
usefixtures
8378
volmount
8479
withast
85-
workdir
8680
xmss

.config/requirements-docs.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

.config/requirements-test.in

Lines changed: 0 additions & 12 deletions
This file was deleted.

.config/requirements.in

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
FORCE_COLOR: 1
1818
PY_COLORS: 1
19-
TOXENV: packaging
19+
TOXENV: pkg
2020
TOX_PARALLEL_NO_SPINNER: 1
2121

2222
steps:

.github/workflows/tox.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
other_names: |
3838
lint
3939
docs
40+
pkg
4041
platforms: linux,macos
4142
tox:
4243
name: ${{ matrix.name }} / python ${{ matrix.python_version }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,6 @@ out
161161

162162
# Ansible
163163
.ansible/
164+
165+
# Ansible Navigator artifact files
166+
playbook-artifact-*.json

.pre-commit-config.yaml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
ci:
22
autoupdate_schedule: quarterly
3-
skip:
4-
- renovate-config-validator
53
default_language_version:
64
python: python3.11
7-
exclude: "(?x)^(\n _readthedocs|\n .tox\n)$\n"
85
repos:
9-
- repo: https://github.com/renovatebot/pre-commit-hooks
10-
rev: 41.119.5
6+
- repo: meta
117
hooks:
12-
- id: renovate-config-validator
13-
alias: renovate
14-
args:
15-
- --strict
8+
- id: check-useless-excludes
169
- repo: https://github.com/rbubley/mirrors-prettier
1710
rev: v3.6.2
1811
hooks:
@@ -25,26 +18,26 @@ repos:
2518
additional_dependencies:
2619
- prettier
2720
- prettier-plugin-toml
28-
- repo: https://github.com/pappasam/toml-sort
29-
rev: v0.24.3
30-
hooks:
31-
- id: toml-sort-fix
32-
- repo: https://github.com/tox-dev/tox-ini-fmt
33-
rev: 1.6.0
34-
hooks:
35-
- id: tox-ini-fmt
3621
- repo: https://github.com/streetsidesoftware/cspell-cli
3722
rev: v9.2.0
3823
hooks:
3924
- id: cspell
40-
name: Spell check with cspell
25+
entry: bash
26+
pass_filenames: false
27+
args:
28+
[
29+
"-euo",
30+
"pipefail",
31+
"-c",
32+
"cspell-cli . --relative --no-progress --no-summary && cspell-cli . --disable-dictionary=words --no-exit-code --words-only --quiet --unique | LC_ALL=C sort > .config/dictionary.txt",
33+
]
34+
name: cspell + remove unused and sort dictionary
4135
- repo: https://github.com/pre-commit/pre-commit-hooks.git
4236
rev: v6.0.0
4337
hooks:
4438
- id: trailing-whitespace
4539
- id: check-merge-conflict
4640
- id: end-of-file-fixer
47-
- id: requirements-txt-fixer
4841
- id: check-added-large-files
4942
- id: fix-byte-order-marker
5043
- id: check-case-conflict
@@ -73,9 +66,6 @@ repos:
7366
args:
7467
- -L
7568
- dout
76-
exclude:
77-
"(?x)^\n (\n tests/fixtures/integration/actions/.*\\.json|\n
78-
\ src/ansible_navigator/data/grammar/.*\\.json\n )\n$\n"
7969
- repo: https://github.com/adrienverge/yamllint.git
8070
rev: v1.37.1
8171
hooks:

cspell.config.yaml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,27 @@ dictionaries:
1212
- "!cryptocurrencies"
1313
- "!cpp"
1414
ignorePaths:
15-
# All dot files in the root
16-
- \.*
17-
# This file
15+
- "*.egg-info"
16+
- _readthedocs
17+
- build
18+
- context/Containerfile
19+
- context/_build
20+
- coverage.lcov
21+
- coverage.xml
1822
- cspell.config.yaml
19-
# The docs requirements file
20-
- docs/requirements.in
21-
# Ignore licenses
23+
- junit.xml
2224
- licenses/*
23-
# The mypy configuration file
24-
- mypy.ini
25-
# The shared file for tool configuration
25+
- out
26+
- playbook-artifact-*.json
2627
- pyproject.toml
27-
# The setup file
28-
- setup.cfg
29-
# All grammar (text-mate) tokenization files
28+
- site
29+
- src/ansible_navigator/_version.py
3030
- src/ansible_navigator/data/grammar/*.json
31-
# Theme files
3231
- src/ansible_navigator/data/themes/*.json
33-
# Anything in the vendored tokenization directory
3432
- src/ansible_navigator/tm_tokenize/*
35-
# requirements.txt is generated
36-
- requirements.txt
37-
# All fixture files in the tests directory
33+
- tests/fixtures/common/builder/test_ee/context/Dockerfile
3834
- tests/fixtures/integration/actions/**/*.json
39-
# The tox configuration file
40-
- tox.ini
35+
- uv.lock
4136

4237
ignoreRegExpList:
4338
- "--\\w+" # ansible-navigator long CLI parameters

0 commit comments

Comments
 (0)