Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
@shatakshiiii
shatakshiiii committed Jul 19, 2024
2 parents 8d8dbc0 + c2f9b16 commit 330b72e
Show file tree
Hide file tree
Showing 110 changed files with 1,103 additions and 1,083 deletions.
20 changes: 10 additions & 10 deletions .config/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras pyproject.toml
#
ansible-builder==3.1.0
ansible-compat==24.6.1
ansible-compat==24.7.0
ansible-core==2.16.5
ansible-lint==24.6.1
ansible-lint==24.7.0
ansible-runner==2.4.0
attrs==23.2.0
babel==2.15.0
Expand All @@ -23,7 +23,7 @@ cfgv==3.4.0
charset-normalizer==3.3.2
click==8.1.7
colorama==0.4.6
coverage==7.5.4
coverage==7.6.0
coverage-enable-subprocess==1.0
cryptography==42.0.8
csscompressor==0.9.5
Expand All @@ -34,20 +34,20 @@ distlib==0.3.8
distro==1.9.0
dnspython==2.6.1
docutils==0.21.2
exceptiongroup==1.2.1
exceptiongroup==1.2.2
execnet==2.1.1
filelock==3.15.4
flake8==7.1.0
flake8-docstrings==1.7.0
ghp-import==2.1.0
griffe==0.47.0
htmlmin2==0.1.13
identify==2.5.36
identify==2.6.0
idna==3.7
iniconfig==2.0.0
jinja2==3.1.4
jsmin==3.0.1
jsonschema==4.22.0
jsonschema==4.23.0
jsonschema-specifications==2023.12.1
libtmux==0.37.0
linkchecker==10.4.0
Expand Down Expand Up @@ -82,7 +82,7 @@ pathspec==0.12.1
pbr==6.0.0
pexpect==4.9.0
pillow==10.4.0
pipdeptree==2.23.0
pipdeptree==2.23.1
platformdirs==4.2.2
pluggy==1.5.0
pre-commit==3.7.1
Expand All @@ -97,7 +97,7 @@ pytest==8.2.2
pytest-env==1.1.3
pytest-mock==3.14.0
pytest-plus==0.7.0
pytest-subtests==0.12.1
pytest-subtests==0.13.0
pytest-xdist==3.6.1
python-daemon==3.0.1
python-dateutil==2.9.0.post0
Expand All @@ -110,7 +110,7 @@ requests==2.32.3
requirements-parser==0.9.0
resolvelib==1.0.1
rich==13.7.1
rpds-py==0.18.1
rpds-py==0.19.0
ruamel-yaml==0.18.6
ruamel-yaml-clib==0.2.8
six==1.16.0
Expand All @@ -121,7 +121,7 @@ termcolor==2.4.0
text-unidecode==1.3
tinycss2==1.3.0
tomli==2.0.1
types-setuptools==70.2.0.20240704
types-setuptools==70.3.0.20240710
typing-extensions==4.12.2
tzdata==2024.1
urllib3==2.2.2
Expand Down
2 changes: 1 addition & 1 deletion src/ansible_navigator/data/images_dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is structured like a multi stage build

# The names ('as') need to correspond the the ImageEntry enum in utils/package_data.py
FROM ghcr.io/ansible/creator-ee:v24.2.0 as DEFAULT_EE
FROM ghcr.io/ansible/community-ansible-dev-tools:latest as DEFAULT_EE

# This is also hard coded in tests/fixtures/integration/execution_environment_image/ansible-navigator_set_ee_image.yml
FROM ghcr.io/ansible/creator-base:latest as SMALL_IMAGE
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" 2│current_value: 42",
" 3│default: false",
" 4│default_value: 86400",
" 5│description: Expiration timeout for the cache plugin data",
" 5│description: Expiration timeout for the cache plugin data.",
" 6│env:",
" 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT",
" 8│ini:",
Expand Down
2 changes: 1 addition & 1 deletion ...s/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" 2│current_value: 42",
" 3│default: false",
" 4│default_value: 86400",
" 5│description: Expiration timeout for the cache plugin data",
" 5│description: Expiration timeout for the cache plugin data.",
" 6│env:",
" 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT",
" 8│ini:",
Expand Down
13 changes: 7 additions & 6 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
" 7│ name: filter_1",
" 8│ notes:",
" 9│ - This is a dummy filter plugin",
"10│ short_description: This is test filter plugin",
"11│ version_added: 1.0.0",
"12│ version_added_collection: company_name.coll_1",
"13│examples: null",
"14│metadata: null",
"15│return: null",
"10│ plugin_name: company_name.coll_1.filter_1",
"11│ short_description: This is test filter plugin",
"12│ version_added: 1.0.0",
"13│ version_added_collection: company_name.coll_1",
"14│examples: null",
"15│metadata: null",
"16│return: null",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
27 changes: 14 additions & 13 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
"18│ - Dummy option I(foo)",
"19│ required: true",
"20│ type: str",
"21│ plugin_type: lookup",
"22│ short_description: This is test lookup plugin",
"23│ version_added: 1.0.0",
"24│ version_added_collection: company_name.coll_1",
"25│examples: |-",
"26│ - name: Retrieve a value deep inside a using a path",
"27│ ansible.builtin.set_fact:",
"28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"29│metadata: null",
"30│return:",
"31│ _raw:",
"32│ description:",
"33│ - One or more zero-based indices of the matching list items.",
"21│ plugin_name: company_name.coll_1.lookup_1",
"22│ plugin_type: lookup",
"23│ short_description: This is test lookup plugin",
"24│ version_added: 1.0.0",
"25│ version_added_collection: company_name.coll_1",
"26│examples: |-",
"27│ - name: Retrieve a value deep inside a using a path",
"28│ ansible.builtin.set_fact:",
"29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"30│metadata: null",
"31│return:",
"32│ _raw:",
"33│ description:",
"34│ - One or more zero-based indices of the matching list items.",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
35 changes: 18 additions & 17 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,24 @@
"24│ description:",
"25│ - Dummy option I(foo)",
"26│ type: str",
"27│ short_description: This is a test module",
"28│ version_added: 1.0.0",
"29│ version_added_collection: company_name.coll_1",
"30│examples: |-",
"31│ - name: test task-1",
"32│ company_name.coll_1.mod_1:",
"33│ foo: somevalue",
"34│ bar: candidate",
"35│metadata: null",
"36│return:",
"37│ baz:",
"38│ description: test return 1",
"39│ returned: success",
"40│ sample:",
"41│ - a",
"42│ - b",
"43│ type: list",
"27│ plugin_name: company_name.coll_1.mod_1",
"28│ short_description: This is a test module",
"29│ version_added: 1.0.0",
"30│ version_added_collection: company_name.coll_1",
"31│examples: |-",
"32│ - name: test task-1",
"33│ company_name.coll_1.mod_1:",
"34│ foo: somevalue",
"35│ bar: candidate",
"36│metadata: null",
"37│return:",
"38│ baz:",
"39│ description: test return 1",
"40│ returned: success",
"41│ sample:",
"42│ - a",
"43│ - b",
"44│ type: list",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
" \"notes\": [",
" \"This is a dummy filter plugin\"",
" ],",
" \"plugin_name\": \"company_name.coll_1.filter_1\",",
" \"short_description\": \"This is test filter plugin\",",
" \"version_added\": \"1.0.0\",",
" \"version_added_collection\": \"company_name.coll_1\"",
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
" \"type\": \"str\"",
" }",
" },",
" \"plugin_name\": \"company_name.coll_1.lookup_1\",",
" \"plugin_type\": \"lookup\",",
" \"short_description\": \"This is test lookup plugin\",",
" \"version_added\": \"1.0.0\",",
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
" \"type\": \"str\"",
" }",
" },",
" \"plugin_name\": \"company_name.coll_1.mod_1\",",
" \"short_description\": \"This is a test module\",",
" \"version_added\": \"1.0.0\",",
" \"version_added_collection\": \"company_name.coll_1\"",
Expand Down
13 changes: 7 additions & 6 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
" 7│ name: filter_1",
" 8│ notes:",
" 9│ - This is a dummy filter plugin",
"10│ short_description: This is test filter plugin",
"11│ version_added: 1.0.0",
"12│ version_added_collection: company_name.coll_1",
"13│examples: null",
"14│metadata: null",
"15│return: null",
"10│ plugin_name: company_name.coll_1.filter_1",
"11│ short_description: This is test filter plugin",
"12│ version_added: 1.0.0",
"13│ version_added_collection: company_name.coll_1",
"14│examples: null",
"15│metadata: null",
"16│return: null",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
27 changes: 14 additions & 13 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
"18│ - Dummy option I(foo)",
"19│ required: true",
"20│ type: str",
"21│ plugin_type: lookup",
"22│ short_description: This is test lookup plugin",
"23│ version_added: 1.0.0",
"24│ version_added_collection: company_name.coll_1",
"25│examples: |-",
"26│ - name: Retrieve a value deep inside a using a path",
"27│ ansible.builtin.set_fact:",
"28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"29│metadata: null",
"30│return:",
"31│ _raw:",
"32│ description:",
"33│ - One or more zero-based indices of the matching list items.",
"21│ plugin_name: company_name.coll_1.lookup_1",
"22│ plugin_type: lookup",
"23│ short_description: This is test lookup plugin",
"24│ version_added: 1.0.0",
"25│ version_added_collection: company_name.coll_1",
"26│examples: |-",
"27│ - name: Retrieve a value deep inside a using a path",
"28│ ansible.builtin.set_fact:",
"29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"30│metadata: null",
"31│return:",
"32│ _raw:",
"33│ description:",
"34│ - One or more zero-based indices of the matching list items.",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
35 changes: 18 additions & 17 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,24 @@
"24│ description:",
"25│ - Dummy option I(foo)",
"26│ type: str",
"27│ short_description: This is a test module",
"28│ version_added: 1.0.0",
"29│ version_added_collection: company_name.coll_1",
"30│examples: |-",
"31│ - name: test task-1",
"32│ company_name.coll_1.mod_1:",
"33│ foo: somevalue",
"34│ bar: candidate",
"35│metadata: null",
"36│return:",
"37│ baz:",
"38│ description: test return 1",
"39│ returned: success",
"40│ sample:",
"41│ - a",
"42│ - b",
"43│ type: list",
"27│ plugin_name: company_name.coll_1.mod_1",
"28│ short_description: This is a test module",
"29│ version_added: 1.0.0",
"30│ version_added_collection: company_name.coll_1",
"31│examples: |-",
"32│ - name: test task-1",
"33│ company_name.coll_1.mod_1:",
"34│ foo: somevalue",
"35│ bar: candidate",
"36│metadata: null",
"37│return:",
"38│ baz:",
"39│ description: test return 1",
"40│ returned: success",
"41│ sample:",
"42│ - a",
"43│ - b",
"44│ type: list",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"comment": "ansible-navigator images top window",
"additional_information": {
"present": [
"v24.2.0"
"community-ansible-dev-tools"
],
"absent": [],
"compared_fixture": false
},
"output": [
" Image Tag Execution environment Created Size",
"0│creator-base latest False some time ago 341 MB",
"1│creator-ee v24.2.0 True 5 weeks ago 686 MB",
"1│community-ansible-dev-tools latest True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
8 changes: 4 additions & 4 deletions tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "test[01-:f v24.2.0-filter for v24.2.0]",
"name": "test[01-:f latest-filter for latest]",
"index": 1,
"comment": "filter for v24.2.0",
"comment": "filter for latest",
"additional_information": {
"present": [
"v24.2.0"
"latest"
],
"absent": [],
"compared_fixture": false
},
"output": [
" Image Tag Execution environment Created Size",
"0│creator-ee v24.2.0 True 5 weeks ago 686 MB",
"0│community-ansible-dev-tools latest True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
Loading

0 comments on commit 330b72e

Please sign in to comment.