Skip to content

Commit

Permalink
Merge branch 'main' into fix_core218
Browse files Browse the repository at this point in the history
  • Loading branch information
shatakshiiii committed Jan 17, 2025
2 parents 90034f5 + bdf7983 commit 78cce43
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 48 deletions.
33 changes: 17 additions & 16 deletions .config/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ black==24.10.0
bracex==2.5.post1
cairocffi==1.7.1
cairosvg==2.7.1
certifi==2024.8.30
certifi==2024.12.14
cffi==1.17.1
cfgv==3.4.0
charset-normalizer==3.4.0
click==8.1.7
colorama==0.4.6
coverage==7.6.7
coverage==7.6.9
coverage-enable-subprocess==1.0
cryptography==43.0.3
cryptography==44.0.0
csscompressor==0.9.5
cssselect2==0.7.0
darglint==1.8.1
Expand All @@ -44,33 +44,33 @@ ghp-import==2.1.0
griffe==1.5.1
hjson==3.1.0
htmlmin2==0.1.13
identify==2.6.2
identify==2.6.3
idna==3.10
importlib-metadata==8.5.0
iniconfig==2.0.0
jinja2==3.1.4
jsmin==3.0.1
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
libtmux==0.37.0
libtmux==0.39.0
linkchecker==10.5.0
lockfile==0.12.2
markdown==3.7
markdown-exec==1.9.3
markdown-exec==1.10.0
markdown-include==0.8.1
markdown-it-py==3.0.0
markupsafe==3.0.2
mccabe==0.7.0
mdurl==0.1.2
mergedeep==1.3.4
mkdocs==1.6.1
mkdocs-ansible==24.3.1
mkdocs-ansible==24.12.0
mkdocs-autorefs==1.2.0
mkdocs-gen-files==0.5.0
mkdocs-get-deps==0.2.0
mkdocs-htmlproofer-plugin==1.3.0
mkdocs-macros-plugin==1.3.7
mkdocs-material==9.5.45
mkdocs-material==9.5.48
mkdocs-material-extensions==1.3.1
mkdocs-minify-plugin==0.8.0
mkdocs-monorepo-plugin==1.1.0
Expand All @@ -86,7 +86,7 @@ pathspec==0.12.1
pbr==6.1.0
pexpect==4.9.0
pillow==11.0.0
pipdeptree==2.23.4
pipdeptree==2.24.0
platformdirs==4.3.6
pluggy==1.5.0
pre-commit==4.0.1
Expand All @@ -97,13 +97,13 @@ pydocstyle==6.3.0
pyflakes==3.2.0
pygments==2.18.0
pymdown-extensions==10.12
pytest==8.3.3
pytest==8.3.4
pytest-env==1.1.5
pytest-mock==3.14.0
pytest-plus==0.7.0
pytest-subtests==0.13.1
pytest-subtests==0.14.1
pytest-xdist==3.6.1
python-daemon==3.1.0
python-daemon==3.1.2
python-dateutil==2.9.0.post0
python-slugify==8.0.4
pyyaml==6.0.2
Expand All @@ -113,22 +113,23 @@ regex==2024.11.6
requests==2.32.3
resolvelib==1.0.1
rich==13.9.4
rpds-py==0.21.0
rpds-py==0.22.3
ruamel-yaml==0.18.6
ruamel-yaml-clib==0.2.12
six==1.16.0
six==1.17.0
snowballstemmer==2.2.0
soupsieve==2.6
subprocess-tee==0.4.2
super-collections==0.5.3
termcolor==2.5.0
text-unidecode==1.3
tinycss2==1.4.0
tomli==2.1.0
tomli==2.2.1
types-setuptools==75.6.0.20241126
typing-extensions==4.12.2
tzdata==2024.2
urllib3==2.2.3
virtualenv==20.27.1
virtualenv==20.28.0
watchdog==6.0.0
wcmatch==10.0
webencodings==0.5.1
Expand Down
11 changes: 6 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ Prerequisites:
### Building from the source and installing packages for testing
After cloning the repository, create and activate a new [virtual environment] in
the root of the repository. Once that is done all we need is to install ansible-navigator
from the source. Use the following command in workspace (root folder of navigator).This
will install package in editable/development mode, along with its additional dependencies
required for testing.
the root of the repository. Once that is done all we need is to install
ansible-navigator from the source. Use the following command in workspace (root
folder of navigator).This will install package in editable/development mode,
along with its additional dependencies required for testing.
```shell-session
pip install -e .\[test]
Expand Down Expand Up @@ -203,7 +203,8 @@ modify accordingly if needed.
### Useful Links

- VS code debugging [guide].
- Facilitate [Python Debugger] (pdb) in navigator for pure command line debugging.
- Facilitate [Python Debugger] (pdb) in navigator for pure command line
debugging.

[guide]: https://code.visualstudio.com/docs/editor/debugging
[python debugger]: https://www.geeksforgeeks.org/python-debugger-python-pdb/
Expand Down
4 changes: 2 additions & 2 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ main branch and making the next patch release in the stream.
## Reporting a Vulnerability

We encourage responsible disclosure practices for security vulnerabilities.
Please read our [policies for reporting bugs] [bug reports policy] if you want to
report a security issue that might affect Ansible.
Please read our [policies for reporting bugs] [bug reports policy] if you want
to report a security issue that might affect Ansible.

[bug reports policy]:
https://docs.ansible.com/ansible/devel/community/reporting_bugs_and_features.html#reporting-a-bug
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
fi
- name: Upload coverage data
uses: codecov/codecov-action@v4.6.0
uses: codecov/codecov-action@v5.1.1
with:
name: ${{ matrix.name }}
fail_ci_if_error: true
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ exclude: >
.tox
)$
repos:
- repo: https://github.com/pycontribs/mirrors-prettier
rev: "v3.3.3"
- repo: https://github.com/rbubley/mirrors-prettier
rev: "v3.4.2"
hooks:
- id: prettier
# Original hook implementation is flaky due to *several* bugs described
Expand Down Expand Up @@ -40,19 +40,19 @@ repos:
language_version: python3

- repo: https://github.com/pappasam/toml-sort
rev: v0.24.1
rev: v0.24.2
hooks:
- id: toml-sort-fix

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.7.4"
rev: "v0.8.3"
hooks:
- id: ruff
args:
- "--exit-non-zero-on-fix"

- repo: https://github.com/streetsidesoftware/cspell-cli
rev: v8.16.0
rev: v8.16.1
hooks:
- id: cspell
name: Spell check with cspell
Expand Down Expand Up @@ -98,7 +98,7 @@ repos:
- id: check-json5

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.42.0
rev: v0.43.0
hooks:
- id: markdownlint
exclude: >
Expand Down Expand Up @@ -147,7 +147,7 @@ repos:
- flake8-docstrings # uses pydocstyle

- repo: https://github.com/jsh9/pydoclint
rev: 0.5.9
rev: 0.5.12
hooks:
- id: pydoclint

Expand Down Expand Up @@ -175,7 +175,7 @@ repos:
- types-typed-ast

- repo: https://github.com/pycqa/pylint.git
rev: v3.3.1
rev: v3.3.2
hooks:
- id: pylint
args:
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
sudo apt-get install podman
```

- Follow the [Docker Desktop for Windows] installation instructions (if podman was
not installed above)
- Follow the [Docker Desktop for Windows] installation instructions (if podman
was not installed above)

- Be sure to complete the [Manage Docker as a non-root user] steps.

Expand Down
8 changes: 4 additions & 4 deletions src/ansible_navigator/ui_framework/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"CursesLinePart",
"CursesLines",
"Decoration",
"Interaction",
"Menu",
"UIConfig",
"UserInterface",
"dict_to_form",
"error_notification",
"form_to_dict",
"Interaction",
"Menu",
"nonblocking_notification",
"success_notification",
"UIConfig",
"UserInterface",
"warning_notification",
)
2 changes: 1 addition & 1 deletion src/ansible_navigator/ui_framework/menu_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def _menu_line_part(
if is_bool:
# booleans are left justified
print_at = column_starts[colno]
elif is_number and not is_enum or is_duration:
elif (is_number and not is_enum) or is_duration:
# right justify on header if int, float or "duration"
print_at = column_starts[colno] + len(header[colno][1]) - len(text)
elif is_progress:
Expand Down
2 changes: 1 addition & 1 deletion src/ansible_navigator/utils/compatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
from importlib.resources.abc import Traversable


__all__ = ["Traversable", "importlib_metadata", "TypeAlias"]
__all__ = ["Traversable", "TypeAlias", "importlib_metadata"]
2 changes: 1 addition & 1 deletion src/ansible_navigator/utils/print.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def color_lines(term_color_bits: int, tokenized: list[list[SimpleLinePart]]) ->
number_of_colors = 2**term_color_bits
ansi_color = rgb_to_ansi(red, green, blue, number_of_colors)
ansi_code = f"\033[38;5;{ansi_color}m"
printable += f"{ansi_code}{line_part.chars}\033[1m"
printable += f"{ansi_code}{line_part.chars}\033[m"
lines.append(printable)
return "".join(lines)

Expand Down
2 changes: 1 addition & 1 deletion src/ansible_navigator/utils/serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,4 +369,4 @@ def write_diagnostics_json(path: str, mode: int, content: object) -> None:
os.umask(oldmask)


__all__ = ("SafeLoader", "SafeDumper", "Loader", "yaml", "SerializationFormat")
__all__ = ("Loader", "SafeDumper", "SafeLoader", "SerializationFormat", "yaml")
5 changes: 2 additions & 3 deletions tests/integration/actions/run/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ def test(
if out in line:
received_output[idx] = mask

fixtures_update_requested = (
self.UPDATE_FIXTURES
or os.environ.get("ANSIBLE_NAVIGATOR_UPDATE_TEST_FIXTURES") == "true"
fixtures_update_requested = self.UPDATE_FIXTURES or (
os.environ.get("ANSIBLE_NAVIGATOR_UPDATE_TEST_FIXTURES") == "true"
and not any((step.present, step.absent))
)
if fixtures_update_requested:
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ skip_missing_interpreters = true
requires =
# disabled until we make it compatible with tox v4
# ensures that tox returns no zero if git reports dirty after test runs
# until tox-uv issues are resolved
# tox-extra
tox-extra<2.1.0
# allow users using cross-platform mounted drives to use tox:
toxworkdir={env:TOX_WORK_DIR:.tox}

Expand Down Expand Up @@ -97,7 +96,6 @@ commands =

[testenv:lint]
description = Enforce quality standards under {basepython} ({envpython})
install_command = pip install {opts} {packages}
commands =
# pre-commit prettier might fix the generated schema file, but that is fine
sh -c "ansible-navigator --ee false settings --schema json > src/ansible_navigator/data/ansible-navigator.json"
Expand All @@ -106,6 +104,7 @@ commands =
--all-files}
deps =
pre-commit
pre-commit-uv
--editable .
setenv =
# NOTE: Although stage=manual hooks are included in the above
Expand Down

0 comments on commit 78cce43

Please sign in to comment.