Fixes for merge conflicts

Author: jdrew82

.bandit.yml

@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-# Default owners for all files in this repository
-=======
 # Default owner(s) of all files in this repository
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 * @glennmatthews @michalis1 @jdrew82

.flake8

@@ -1,20 +1,13 @@
 ---
 extends: "default"
 rules:
-<<<<<<< HEAD
-  comments: "enable"
-=======
   comments:
     min-spaces-from-content: 1
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   empty-values: "enable"
   indentation:
     indent-sequences: "consistent"
   line-length: "disable"
   quoted-strings:
     quote-type: "double"
-<<<<<<< HEAD
-=======
 ignore: |
   .venv/
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

.github/CODEOWNERS

@@ -1,27 +1,3 @@
-<<<<<<< HEAD
-ARG PYTHON_VER
-
-FROM python:${PYTHON_VER}-slim
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  build-essential \
-  redis \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN pip install --upgrade pip \
-  && pip install poetry==1.5.1
-
-
-WORKDIR /local
-COPY pyproject.toml /local
-COPY poetry.lock /local
-
-RUN poetry config virtualenvs.create false \
-  && poetry install --no-interaction --no-ansi --no-root
-
-COPY . /local
-RUN poetry install --no-interaction --no-ansi 
-=======
 ARG PYTHON_VER="3.10"
 
 FROM python:${PYTHON_VER}-slim
@@ -48,4 +24,3 @@ COPY . /local
 
 # Install the app
 RUN poetry install --with dev --all-extras
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

.pydocstyle.ini

@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-Copyright 2020-2023 Network to Code <[email protected]>
-Network to Code, LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-=======
 Apache Software License 2.0
 
 Copyright (c) 2025, Network to Code, LLC
@@ -18,7 +7,6 @@ you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

.yamllint.yml

@@ -1,11 +1,10 @@
-<<<<<<< HEAD
 # DiffSync
 
 DiffSync is a utility library that can be used to compare and synchronize different datasets.
 
 For example, it can be used to compare a list of devices from 2 inventory systems and, if required, synchronize them in either direction.
 
-# Primary Use Cases
+## Primary Use Cases
 
 DiffSync is at its most useful when you have multiple sources or sets of data to compare and/or synchronize, and especially if any of the following are true:
 
@@ -14,7 +13,7 @@ DiffSync is at its most useful when you have multiple sources or sets of data to
 - If various types of data in your data set naturally form a tree-like or parent-child relationship with other data.
 - If the different data sets have some attributes in common and other attributes that are exclusive to one or the other.
 
-# Overview of DiffSync
+## Overview of DiffSync
 
 DiffSync acts as an intermediate translation layer between all of the data sets you are diffing and/or syncing. In practical terms, this means that to use DiffSync, you will define a set of data models as well as the “adapters” needed to translate between each base data source and the data model. In Python terms, the adapters will be subclasses of the `Adapter` class, and each data model class will be a subclass of the `DiffSyncModel` class.
 
@@ -29,7 +28,7 @@ You can also ask DiffSync to “sync” one data set onto the other, and it will
 
 ![DiffSync Sync](https://raw.githubusercontent.com/networktocode/diffsync/develop/docs/images/diffsync_sync.png "DiffSync Sync")
 
-# Simple Example
+## Simple Example
 
 ```python
 A = DiffSyncSystemA()
@@ -51,74 +50,43 @@ A.sync_to(B)
 
 > You may wish to peruse the `diffsync` [GitHub topic](https://github.com/topics/diffsync) for examples of projects using this library.
 
-# Documentation
+## Documentation
 
-The documentation is available [on Read The Docs](https://diffsync.readthedocs.io/en/latest/index.html).
+Full documentation for this library can be found over on the [Diffsync Docs](https://diffsync.readthedocs.io/) website:
 
-# Installation
+- [User Guide](https://diffsync.readthedocs.io/user/app_overview/) - Overview, Using the Library, Getting Started.
+- [Administrator Guide](https://diffsync.readthedocs.io/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
+- [Developer Guide](https://diffsync.readthedocs.io/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
+- [Release Notes / Changelog](https://diffsync.readthedocs.io/admin/release_notes/).
+- [Frequently Asked Questions](https://diffsync.readthedocs.io/user/faq/).
 
-### Option 1: Install from PyPI.
+## Installation
 
-```
-$ pip install diffsync
+### Option 1: Install from PyPI
+
+```shell
+pip install diffsync
 ```
 
 ### Option 2: Install from a GitHub branch, such as main as shown below.
+
+```shell
+pip install git+https://github.com/networktocode/diffsync.git@main
 ```
-$ pip install git+https://github.com/networktocode/diffsync.git@main
-```
 
-# Contributing
+## Contributing
+
 Pull requests are welcomed and automatically built and tested against multiple versions of Python through GitHub Actions.
 
 The project is following Network to Code software development guidelines and is leveraging the following:
 
-- Black, Pylint, Bandit, flake8, and pydocstyle, mypy for Python linting, formatting and type hint checking.
+- Ruff, mypy for Python linting, formatting and type hint checking.
 - pytest, coverage, and unittest for unit tests.
 
 You can ensure your contribution adheres to these checks by running `invoke tests` from the CLI.
 The command `invoke build` builds a docker container with all the necessary dependencies (including the redis backend) locally to facilitate the execution of these tests.
 
-# Questions
-Please see the [documentation](https://diffsync.readthedocs.io/en/latest/index.html) for detailed documentation on how to use `diffsync`. For any additional questions or comments, feel free to swing by the [Network to Code slack channel](https://networktocode.slack.com/) (channel #networktocode). Sign up [here](http://slack.networktocode.com/)
-=======
-# Diffsync
-
-<!--
-Developer Note - Remove Me!
-
-The README will have certain links/images broken until the PR is merged into `develop`. Update the GitHub links with whichever branch you're using (main etc.) if different.
-
-The logo of the project is a placeholder (docs/images/icon-diffsync.png) - please replace it with your app icon, making sure it's at least 200x200px and has a transparent background!
-
-To avoid extra work and temporary links, make sure that publishing docs (or merging a PR) is done at the same time as setting up the docs site on RTD, then test everything.
--->
-
-<p align="center">
-  <img src="https://raw.githubusercontent.com/networktocode/diffsync/develop/docs/images/icon-Diffsync.png" class="logo" height="200px">
-  <br>
-  <a href="https://github.com/networktocode/diffsync/actions"><img src="https://github.com/networktocode/diffsync/actions/workflows/ci.yml/badge.svg?branch=main"></a>
-  <a href="https://diffsync.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/diffsync/badge/"></a>
-  <a href="https://pypi.org/project/diffsync/"><img src="https://img.shields.io/pypi/v/diffsync"></a>
-  <a href="https://pypi.org/project/diffsync/"><img src="https://img.shields.io/pypi/dm/diffsync"></a>
-  <br>
-</p>
-
-## Overview
-
-> Developer Note: Add a long (2-3 paragraphs) description of what the library does, what problems it solves, etc.
-
-## Documentation
-
-Full documentation for this library can be found over on the [Diffsync Docs](https://diffsync.readthedocs.io/) website:
-
-- [User Guide](https://diffsync.readthedocs.io/user/app_overview/) - Overview, Using the Library, Getting Started.
-- [Administrator Guide](https://diffsync.readthedocs.io/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
-- [Developer Guide](https://diffsync.readthedocs.io/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
-- [Release Notes / Changelog](https://diffsync.readthedocs.io/admin/release_notes/).
-- [Frequently Asked Questions](https://diffsync.readthedocs.io/user/faq/).
-
-### Contributing to the Documentation
+## Contributing to the Documentation
 
 You can find all the Markdown source for the App documentation under the [`docs`](https://github.com/networktocode/diffsync/tree/develop/docs) folder in this repository. For simple edits, a Markdown capable editor is sufficient: clone the repository and edit away.
 
@@ -129,4 +97,3 @@ Any PRs with fixes or improvements are very welcome!
 ## Questions
 
 For any questions or comments, please check the [FAQ](https://diffsync.readthedocs.io/en/latest/user/faq/) first. Feel free to also swing by the [Network to Code Slack](https://networktocode.slack.com/) (channel `#networktocode`), sign up [here](http://slack.networktocode.com/) if you don't have an account.
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)