Skip to content

Commit 0ea91f8

Browse files
adambaumeisteradambaumeister
authored
fix: Update requirements and CI to meet Validated Collection standards (#657)
1 parent 304737c commit 0ea91f8

File tree

7 files changed

+253
-9
lines changed

7 files changed

+253
-9
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,21 @@ jobs:
8888
strategy:
8989
matrix:
9090
include:
91+
# Note; 2.16 and 2.17 is still needed for AAP support for customers using the rhel8 base image
9192
- ansible: "2.16"
9293
python_ver: "3.11"
9394
- ansible: "2.17"
9495
python_ver: "3.11"
9596
- ansible: "2.18"
9697
python_ver: "3.11"
98+
- ansible: "2.18"
99+
python_ver: "3.12"
100+
- ansible: "2.19"
101+
python_ver: "3.11"
102+
- ansible: "2.19"
103+
python_ver: "3.12"
104+
- ansible: "2.20"
105+
python_ver: "3.12"
97106
runs-on: ubuntu-latest
98107
defaults:
99108
run:

‎plugins/modules/panos_facts.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
"""
227227

228228
from ansible.module_utils.basic import AnsibleModule
229-
from ansible.module_utils.six import iteritems
230229
from ansible_collections.paloaltonetworks.panos.plugins.module_utils.panos import (
231230
get_connection,
232231
)
@@ -590,7 +589,7 @@ def main():
590589

591590
ansible_facts = dict()
592591

593-
for key, value in iteritems(facts):
592+
for key, value in facts.items():
594593
key = "ansible_net_%s" % key
595594
ansible_facts[key] = value
596595

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ package-mode = false
1717
[tool.poetry.dependencies]
1818
python = ">=3.10,<4.0"
1919
pan-os-python = ">=1.12.4,<2.0"
20-
xmltodict = ">=0.12.0,<0.15.0"
21-
aiohttp = ">=3.8.4,<4.0"
22-
dpath = ">=2.1.5,<3.0"
20+
xmltodict = ">=0.12.0"
21+
aiohttp = ">=3.8.4"
22+
dpath = ">=2.1.5"
2323
panos-upgrade-assurance = ">=2.0.0,<3.0"
2424

2525
[tool.poetry.dev-dependencies]

‎requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
aiohttp>=3.8.4,<4.0 ; python_version >= "3.10" and python_version < "4.0"
2-
dpath>=2.1.5,<3.0 ; python_version >= "3.10" and python_version < "4.0"
1+
aiohttp>=3.8.4 ; python_version >= "3.10" and python_version < "4.0"
2+
dpath>=2.1.5 ; python_version >= "3.10" and python_version < "4.0"
33
pan-os-python>=1.12.4,<2.0 ; python_version >= "3.10" and python_version < "4.0"
44
panos-upgrade-assurance>=2.0.0,<3.0 ; python_version >= "3.10" and python_version < "4.0"
5-
xmltodict>=0.12.0,<0.15.0 ; python_version >= "3.10" and python_version < "4.0"
5+
xmltodict>=0.12.0 ; python_version >= "3.10" and python_version < "4.0"

‎tests/sanity/ignore-2.19.txt‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
plugins/httpapi/panos.py validate-modules:missing-gplv3-license
2+
plugins/modules/panos_active_in_ha.py validate-modules:missing-gplv3-license
3+
plugins/modules/panos_address_group.py validate-modules:missing-gplv3-license
4+
plugins/modules/panos_address_object.py validate-modules:missing-gplv3-license
5+
plugins/modules/panos_admin.py validate-modules:missing-gplv3-license
6+
plugins/modules/panos_administrator.py validate-modules:missing-gplv3-license
7+
plugins/modules/panos_admpwd.py validate-modules:missing-gplv3-license
8+
plugins/modules/panos_aggregate_interface.py validate-modules:missing-gplv3-license
9+
plugins/modules/panos_api_key.py validate-modules:missing-gplv3-license
10+
plugins/modules/panos_application_filter.py validate-modules:missing-gplv3-license
11+
plugins/modules/panos_application_group.py validate-modules:missing-gplv3-license
12+
plugins/modules/panos_application_object.py validate-modules:missing-gplv3-license
13+
plugins/modules/panos_bgp_aggregate.py validate-modules:missing-gplv3-license
14+
plugins/modules/panos_bgp_auth.py validate-modules:missing-gplv3-license
15+
plugins/modules/panos_bgp_conditional_advertisement.py validate-modules:missing-gplv3-license
16+
plugins/modules/panos_bgp_dampening.py validate-modules:missing-gplv3-license
17+
plugins/modules/panos_bgp_peer_group.py validate-modules:missing-gplv3-license
18+
plugins/modules/panos_bgp_peer.py validate-modules:missing-gplv3-license
19+
plugins/modules/panos_bgp_policy_filter.py validate-modules:missing-gplv3-license
20+
plugins/modules/panos_bgp_policy_rule.py validate-modules:missing-gplv3-license
21+
plugins/modules/panos_bgp_redistribute.py validate-modules:missing-gplv3-license
22+
plugins/modules/panos_bgp.py validate-modules:missing-gplv3-license
23+
plugins/modules/panos_cert_gen_ssh.py validate-modules:missing-gplv3-license
24+
plugins/modules/panos_check.py validate-modules:missing-gplv3-license
25+
plugins/modules/panos_commit_firewall.py validate-modules:missing-gplv3-license
26+
plugins/modules/panos_commit_panorama.py validate-modules:missing-gplv3-license
27+
plugins/modules/panos_commit_push.py validate-modules:missing-gplv3-license
28+
plugins/modules/panos_commit.py validate-modules:missing-gplv3-license
29+
plugins/modules/panos_config_element.py validate-modules:missing-gplv3-license
30+
plugins/modules/panos_custom_url_category.py validate-modules:missing-gplv3-license
31+
plugins/modules/panos_dag_tags.py validate-modules:missing-gplv3-license
32+
plugins/modules/panos_dag.py validate-modules:missing-gplv3-license
33+
plugins/modules/panos_decryption_rule.py validate-modules:missing-gplv3-license
34+
plugins/modules/panos_device_group.py validate-modules:missing-gplv3-license
35+
plugins/modules/panos_dhcp_relay_ipv6_address.py validate-modules:missing-gplv3-license
36+
plugins/modules/panos_dhcp_relay.py validate-modules:missing-gplv3-license
37+
plugins/modules/panos_dhcp.py validate-modules:missing-gplv3-license
38+
plugins/modules/panos_dynamic_updates.py validate-modules:missing-gplv3-license
39+
plugins/modules/panos_dynamic_user_group.py validate-modules:missing-gplv3-license
40+
plugins/modules/panos_edl.py validate-modules:missing-gplv3-license
41+
plugins/modules/panos_email_profile.py validate-modules:missing-gplv3-license
42+
plugins/modules/panos_email_server.py validate-modules:missing-gplv3-license
43+
plugins/modules/panos_export.py validate-modules:missing-gplv3-license
44+
plugins/modules/panos_gre_tunnel.py validate-modules:missing-gplv3-license
45+
plugins/modules/panos_ha.py validate-modules:missing-gplv3-license
46+
plugins/modules/panos_http_profile_header.py validate-modules:missing-gplv3-license
47+
plugins/modules/panos_http_profile_param.py validate-modules:missing-gplv3-license
48+
plugins/modules/panos_http_profile.py validate-modules:missing-gplv3-license
49+
plugins/modules/panos_http_server.py validate-modules:missing-gplv3-license
50+
plugins/modules/panos_ike_crypto_profile.py validate-modules:missing-gplv3-license
51+
plugins/modules/panos_ike_gateway.py validate-modules:missing-gplv3-license
52+
plugins/modules/panos_import.py validate-modules:missing-gplv3-license
53+
plugins/modules/panos_interface.py validate-modules:missing-gplv3-license
54+
plugins/modules/panos_ipsec_ipv4_proxyid.py validate-modules:missing-gplv3-license
55+
plugins/modules/panos_ipsec_profile.py validate-modules:missing-gplv3-license
56+
plugins/modules/panos_ipsec_tunnel.py validate-modules:missing-gplv3-license
57+
plugins/modules/panos_ipv6_address.py validate-modules:missing-gplv3-license
58+
plugins/modules/panos_l2_subinterface.py validate-modules:missing-gplv3-license
59+
plugins/modules/panos_l3_subinterface.py validate-modules:missing-gplv3-license
60+
plugins/modules/panos_lic.py validate-modules:missing-gplv3-license
61+
plugins/modules/panos_loadcfg.py validate-modules:missing-gplv3-license
62+
plugins/modules/panos_log_forwarding_profile_match_list_action.py validate-modules:missing-gplv3-license
63+
plugins/modules/panos_log_forwarding_profile_match_list.py validate-modules:missing-gplv3-license
64+
plugins/modules/panos_log_forwarding_profile.py validate-modules:missing-gplv3-license
65+
plugins/modules/panos_loopback_interface.py validate-modules:missing-gplv3-license
66+
plugins/modules/panos_management_profile.py validate-modules:missing-gplv3-license
67+
plugins/modules/panos_match_rule.py validate-modules:missing-gplv3-license
68+
plugins/modules/panos_mgtconfig.py validate-modules:missing-gplv3-license
69+
plugins/modules/panos_nat_rule_facts.py validate-modules:missing-gplv3-license
70+
plugins/modules/panos_nat_rule.py validate-modules:missing-gplv3-license
71+
plugins/modules/panos_nat_rule2.py validate-modules:missing-gplv3-license
72+
plugins/modules/panos_object_facts.py validate-modules:missing-gplv3-license
73+
plugins/modules/panos_object.py validate-modules:missing-gplv3-license
74+
plugins/modules/panos_op.py validate-modules:missing-gplv3-license
75+
plugins/modules/panos_pbf_rule.py validate-modules:missing-gplv3-license
76+
plugins/modules/panos_pg.py validate-modules:missing-gplv3-license
77+
plugins/modules/panos_query_rules.py validate-modules:missing-gplv3-license
78+
plugins/modules/panos_readiness_checks.py validate-modules:missing-gplv3-license
79+
plugins/modules/panos_redistribution.py validate-modules:missing-gplv3-license
80+
plugins/modules/panos_region.py validate-modules:missing-gplv3-license
81+
plugins/modules/panos_registered_ip_facts.py validate-modules:missing-gplv3-license
82+
plugins/modules/panos_registered_ip.py validate-modules:missing-gplv3-license
83+
plugins/modules/panos_restart.py validate-modules:missing-gplv3-license
84+
plugins/modules/panos_sag.py validate-modules:missing-gplv3-license
85+
plugins/modules/panos_schedule_object.py validate-modules:missing-gplv3-license
86+
plugins/modules/panos_security_rule_facts.py validate-modules:missing-gplv3-license
87+
plugins/modules/panos_security_rule.py validate-modules:missing-gplv3-license
88+
plugins/modules/panos_service_group.py validate-modules:missing-gplv3-license
89+
plugins/modules/panos_service_object.py validate-modules:missing-gplv3-license
90+
plugins/modules/panos_snapshot_report.py validate-modules:missing-gplv3-license
91+
plugins/modules/panos_snmp_profile.py validate-modules:missing-gplv3-license
92+
plugins/modules/panos_snmp_v2c_server.py validate-modules:missing-gplv3-license
93+
plugins/modules/panos_snmp_v3_server.py validate-modules:missing-gplv3-license
94+
plugins/modules/panos_software.py validate-modules:missing-gplv3-license
95+
plugins/modules/panos_state_snapshot.py validate-modules:missing-gplv3-license
96+
plugins/modules/panos_static_route.py validate-modules:missing-gplv3-license
97+
plugins/modules/panos_syslog_profile.py validate-modules:missing-gplv3-license
98+
plugins/modules/panos_syslog_server.py validate-modules:missing-gplv3-license
99+
plugins/modules/panos_tag_object.py validate-modules:missing-gplv3-license
100+
plugins/modules/panos_template_stack.py validate-modules:missing-gplv3-license
101+
plugins/modules/panos_template_variable.py validate-modules:missing-gplv3-license
102+
plugins/modules/panos_template.py validate-modules:missing-gplv3-license
103+
plugins/modules/panos_tunnel.py validate-modules:missing-gplv3-license
104+
plugins/modules/panos_type_cmd.py validate-modules:missing-gplv3-license
105+
plugins/modules/panos_userid.py validate-modules:missing-gplv3-license
106+
plugins/modules/panos_virtual_router_facts.py validate-modules:missing-gplv3-license
107+
plugins/modules/panos_virtual_router.py validate-modules:missing-gplv3-license
108+
plugins/modules/panos_virtual_wire.py validate-modules:missing-gplv3-license
109+
plugins/modules/panos_vlan_interface.py validate-modules:missing-gplv3-license
110+
plugins/modules/panos_vlan.py validate-modules:missing-gplv3-license
111+
plugins/modules/panos_vm_auth_key.py validate-modules:missing-gplv3-license
112+
plugins/modules/panos_zone_facts.py validate-modules:missing-gplv3-license
113+
plugins/modules/panos_zone.py validate-modules:missing-gplv3-license
114+
plugins/modules/panos_logical_router.py validate-modules:missing-gplv3-license
115+
plugins/modules/panos_logical_router_vrf.py validate-modules:missing-gplv3-license
116+
plugins/modules/panos_logical_router_vrf_ospf_area.py validate-modules:missing-gplv3-license
117+
plugins/modules/panos_logical_router_vrf_ospf_area_interface.py validate-modules:missing-gplv3-license
118+
plugins/modules/panos_logical_router_vrf_static_route.py validate-modules:missing-gplv3-license

0 commit comments

Comments
 (0)