Fix formating and missed merge conflicts

Author: jdrew82

examples/03-remote-system/main.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Main executable for DiffSync "example3"."""
+
 import sys
 import argparse
 

examples/06-ip-prefixes/adapter_ipam_a.py

@@ -20,7 +20,7 @@ def create(cls, adapter, ids, attrs):
                 "cidr": ids["prefix"],
                 "family": ipaddress.ip_address(ids["prefix"].split("/")[0]).version,
                 "vrf": attrs["vrf"],
-                "vlan": f'VLAN{attrs["vlan_id"]}',
+                "vlan": f"VLAN{attrs['vlan_id']}",
                 "customer_id": attrs["tenant"] if attrs["tenant"] else None,
             }
         )
@@ -34,7 +34,7 @@ def update(self, attrs):
                 if "vrf" in attrs:
                     elem["vrf"] = attrs["vrf"]
                 if "vlan_id" in attrs:
-                    elem["vlan_id"] = f'VLAN{attrs["vlan_id"]}'
+                    elem["vlan_id"] = f"VLAN{attrs['vlan_id']}"
                 if "tenant" in attrs:
                     elem["customer_id"] = attrs["tenant"]
                 break

examples/06-ip-prefixes/main.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Main example."""
+
 from adapter_ipam_a import IpamA
 from adapter_ipam_b import IpamB
 

tasks.py

@@ -148,9 +148,7 @@ def lock(context, check=False):
 @task
 def clean(context):
     """Remove the project specific image."""
-    print(
-        f"Attempting to forcefully remove image {context.diffsync.image_name}:{context.diffsync.image_ver}"
-    )
+    print(f"Attempting to forcefully remove image {context.diffsync.image_name}:{context.diffsync.image_ver}")
     context.run(f"docker rmi {context.diffsync.image_name}:{context.diffsync.image_ver} --force")
     print(f"Successfully removed image {context.diffsync.image_name}:{context.diffsync.image_ver}")
 

tests/integration/__init__.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 """Integration tests for DiffSync.
 
 Copyright (c) 2020 Network To Code, LLC <[email protected]>
@@ -15,6 +14,3 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-=======
-"""Integration tests package."""
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

tests/unit/__init__.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 """Unit tests for DiffSync.
 
 Copyright (c) 2020 Network To Code, LLC <[email protected]>
@@ -15,6 +14,3 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-=======
-"""Unit tests package."""
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

tests/unit/conftest.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 """Used to setup fixtures to be used through tests.
 
 Copyright (c) 2020 Network To Code, LLC <[email protected]>
@@ -487,15 +486,3 @@ def diff_element_with_children():
     parent_element.add_child(child_element_4)
 
     return parent_element
-=======
-"""Used to setup fixtures to be used through tests"""
-
-import pytest
-from click.testing import CliRunner
-
-
-@pytest.fixture
-def cli_runner():
-    """Provide CLI runner for Click tests."""
-    return CliRunner()
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)