Close #680 CI Update (#681)

* Remove python3.6 and python3.7 from CI
* Adjustments for ansible-tests on 2.12
* Add python3.10 to CI
* Update poetry
* Add poetry run to commands
* Update black and reformat files
* Update packaging, pylint
* Update antsibull
* Remove 2.10 tests

Author: rodvand

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10"]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install and configure Poetry
-        uses: snok/install-poetry@v1.1.1
+        uses: snok/install-poetry@v1
         with:
           virtualenvs-create: false
       - name: Install Python packages
@@ -28,15 +28,15 @@ jobs:
           ansible-galaxy collection build .
           ansible-galaxy collection install netbox*.tar.gz -p /home/runner/.ansible/collections
       - name: Run Black
-        run: black . --check --diff
+        run: poetry run black . --check --diff
       - name: Run Ansible Sanity tests
-        run: ansible-test sanity -v --requirements --python ${{ matrix.python-version }} --skip-test pep8 plugins/
+        run: poetry run ansible-test sanity -v --requirements --python ${{ matrix.python-version }} --skip-test pep8 plugins/
         working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
       - name: Run Ansible Unit tests
-        run: ansible-test units -vvv --coverage --python ${{ matrix.python-version }}
+        run: poetry run ansible-test units -vvv --coverage --python ${{ matrix.python-version }}
         working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
       - name: Run Ansible Coverage
-        run: ansible-test coverage report --all --omit "tests/*,hacking/*,docs/*" --show-missing
+        run: poetry run ansible-test coverage report --all --omit "tests/*,hacking/*,docs/*" --show-missing
         working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
   integration:
     runs-on: ubuntu-latest

docs/_extensions/pygments_lexer.py

@@ -70,7 +70,9 @@ class AnsibleOutputPrimaryLexer(RegexLexer):
         # #########################################
         # # BEGIN: states from JSON lexer #########
         # #########################################
-        "whitespace": [(r"\s+", token.Text),],
+        "whitespace": [
+            (r"\s+", token.Text),
+        ],
         # represents a simple terminal value
         "simplevalue": [
             (r"(true|false|null)\b", token.Keyword.Constant),

plugins/inventory/nb_inventory.py

@@ -478,26 +478,36 @@ def group_extractors(self):
         # Locations were added in 2.11 replacing rack-groups.
         if self.api_version >= version.parse("2.11"):
             extractors.update(
-                {"location": self.extract_location,}
+                {
+                    "location": self.extract_location,
+                }
             )
         else:
             extractors.update(
-                {"rack_group": self.extract_rack_group,}
+                {
+                    "rack_group": self.extract_rack_group,
+                }
             )
 
         if self.services:
             extractors.update(
-                {"services": self.extract_services,}
+                {
+                    "services": self.extract_services,
+                }
             )
 
         if self.interfaces:
             extractors.update(
-                {"interfaces": self.extract_interfaces,}
+                {
+                    "interfaces": self.extract_interfaces,
+                }
             )
 
         if self.interfaces or self.dns_name or self.ansible_host_dns_name:
             extractors.update(
-                {"dns_name": self.extract_dns_name,}
+                {
+                    "dns_name": self.extract_dns_name,
+                }
             )
 
         return extractors
@@ -1288,7 +1298,7 @@ def fetch_api_docs(self):
         try:
             status = self._fetch_information(self.api_endpoint + "/api/status")
             netbox_api_version = ".".join(status["netbox-version"].split(".")[:2])
-        except:
+        except Exception:
             netbox_api_version = 0
 
         tmp_dir = os.path.split(DEFAULT_LOCAL_TMP)[0]
@@ -1297,7 +1307,7 @@ def fetch_api_docs(self):
         try:
             with open(tmp_file) as file:
                 openapi = json.load(file)
-        except:
+        except Exception:
             openapi = {}
 
         cached_api_version = openapi.get("info", {}).get("version")
@@ -1725,7 +1735,8 @@ def main(self):
             elif getattr(self, "site_group_names", None) and host.get("site"):
                 # Add host to site group when host is NOT assigned to a location
                 self.inventory.add_host(
-                    group=self.site_group_names[host["site"]["id"]], host=hostname,
+                    group=self.site_group_names[host["site"]["id"]],
+                    host=hostname,
                 )
 
     def parse(self, inventory, loader, path, cache=True):
@@ -1753,7 +1764,7 @@ def parse(self, inventory, loader, path, cache=True):
         self.fetch_all = self.get_option("fetch_all")
         self.headers = {
             "User-Agent": "ansible %s Python %s"
-            % (ansible_version, python_version.split(" ")[0]),
+            % (ansible_version, python_version.split(" ", maxsplit=1)[0]),
             "Content-type": "application/json",
         }
         self.cert = self.get_option("cert")

plugins/module_utils/netbox_utils.py

@@ -1019,19 +1019,23 @@ def _find_ids(self, data, user_query_params):
                 elif isinstance(v, list):
                     id_list = list()
                     for list_item in v:
-                        if k in (
-                            "regions",
-                            "sites",
-                            "roles",
-                            "device_types",
-                            "platforms",
-                            "cluster_groups",
-                            "clusters",
-                            "contact_groups",
-                            "tenant_groups",
-                            "tenants",
-                            "tags",
-                        ) and isinstance(list_item, str):
+                        if (
+                            k
+                            in (
+                                "regions",
+                                "sites",
+                                "roles",
+                                "device_types",
+                                "platforms",
+                                "cluster_groups",
+                                "clusters",
+                                "contact_groups",
+                                "tenant_groups",
+                                "tenants",
+                                "tags",
+                            )
+                            and isinstance(list_item, str)
+                        ):
                             temp_dict = {"slug": self._to_slug(list_item)}
                         elif isinstance(list_item, dict):
                             norm_data = self._normalize_data(list_item)
@@ -1378,7 +1382,7 @@ def check_mutually_exclusive(self, terms, module_parameters):
         return results
 
     def _check_required_if(self, spec, param=None):
-        """ ensure that parameters which conditionally required are present """
+        """ensure that parameters which conditionally required are present"""
         if spec is None:
             return
 

plugins/modules/netbox_device_interface_template.py

@@ -123,7 +123,10 @@ def main():
                 options=dict(
                     device_type=dict(required=True, type="raw"),
                     name=dict(required=True, type="str"),
-                    type=dict(required=True, type="str",),
+                    type=dict(
+                        required=True,
+                        type="str",
+                    ),
                     mgmt_only=dict(required=False, type="bool"),
                 ),
             ),

plugins/modules/netbox_rack.py

@@ -259,13 +259,27 @@ def main():
                             "Wall-mounted cabinet",
                         ],
                     ),
-                    width=dict(required=False, type="int", choices=[10, 19, 21, 23,],),
+                    width=dict(
+                        required=False,
+                        type="int",
+                        choices=[
+                            10,
+                            19,
+                            21,
+                            23,
+                        ],
+                    ),
                     u_height=dict(required=False, type="int"),
                     desc_units=dict(required=False, type="bool"),
                     outer_width=dict(required=False, type="int"),
                     outer_depth=dict(required=False, type="int"),
                     outer_unit=dict(
-                        required=False, type="str", choices=["Millimeters", "Inches",],
+                        required=False,
+                        type="str",
+                        choices=[
+                            "Millimeters",
+                            "Inches",
+                        ],
                     ),
                     comments=dict(required=False, type="str"),
                     tags=dict(required=False, type="list", elements="raw"),