Skip to content
This repository has been archived by the owner on Sep 7, 2023. It is now read-only.

Updating envrionment to new standards & dependency updates #25

Merged
merged 2 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9"]
nautobot-version: ["1.0.1"]
python-version: ["3.7", "3.8", "3.9"]
nautobot-version: ["1.2.0"]
runs-on: "ubuntu-20.04"
env:
INVOKE_NAUTOBOT_CHATOPS_ARISTA_CLOUDVISION_PYTHON_VER: "${{ matrix.python-version }}"
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## v1.2.0 - 2021-08-31

### Changed

- #25 Update environment to newer standards
- #20 Dependency Updates

### Removed

- #25 Dropped support for Nautobot <1.2.0

## v1.0.2 - 2021-09-30

### Added
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ The development environment can be used in 2 ways. First, with a local poetry en

The [PyInvoke](http://www.pyinvoke.org/) library is used to provide some helper commands based on the environment. There are a few configuration parameters which can be passed to PyInvoke to override the default configuration:

* `nautobot_ver`: the version of Nautobot to use as a base for any built docker containers (default: 1.0.1)
* `nautobot_ver`: the version of Nautobot to use as a base for any built docker containers (default: 1.2.0)
* `project_name`: the default docker compose project name (default: nautobot_chatops_arista_cloudvision)
* `python_ver`: the version of Python to use as a base for any built docker containers (default: 3.6)
* `python_ver`: the version of Python to use as a base for any built docker containers (default: 3.8)
* `local`: a boolean flag indicating if invoke tasks should be run on the host or inside the docker containers (default: False, commands will be run in docker containers)
* `compose_dir`: the full path to a directory containing the project compose files
* `compose_files`: a list of compose files applied in order (see [Multiple Compose files](https://docs.docker.com/compose/extends/#multiple-compose-files) for more information)
Expand Down
2 changes: 1 addition & 1 deletion development/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NAUTOBOT_VER="1.0.1"
ARG NAUTOBOT_VER="1.2.0"
ARG PYTHON_VER=3.8
FROM ghcr.io/nautobot/nautobot-dev:${NAUTOBOT_VER}-py${PYTHON_VER}

Expand Down
12 changes: 9 additions & 3 deletions nautobot_chatops_arista_cloudvision/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
"""Plugin declaration for nautobot_chatops_arista_cloudvision."""

__version__ = "1.0.2"
# Metadata is inherited from Nautobot. If not including Nautobot in the environment, this should be added
try:
from importlib import metadata
except ImportError:
# Python version < 3.8
import importlib_metadata as metadata

from nautobot.extras.plugins import PluginConfig

__version__ = metadata.version(__name__)


class NautobotChatopsExtensionAristaConfig(PluginConfig):
"""Plugin configuration for the nautobot_chatops_arista_cloudvision plugin."""
Expand All @@ -15,7 +21,7 @@ class NautobotChatopsExtensionAristaConfig(PluginConfig):
description = "Nautobot Chatops Arista Cloudvision Integration."
base_url = "nautobot_chatops_arista_cloudvision"
required_settings = []
min_version = "1.0.0"
min_version = "1.2.0"
max_version = "1.9999"
default_settings = {}
caching_config = {}
Expand Down
4 changes: 2 additions & 2 deletions nautobot_chatops_arista_cloudvision/cvpgrpcutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def connect_cv(settings):

def disconnect_cv():
"""Close the shared gRPC channel."""
global _channel # pylint: disable=C0103,W0601
global _channel # pylint: disable=global-variable-not-assigned,invalid-name
_channel.close()


Expand All @@ -57,7 +57,7 @@ def get_device_tags(device_id: str, settings):
partial_eq_filter=[
tag.models.DeviceTagAssignmentConfig(
key=tag.models.DeviceTagAssignmentKey(
device_id=wrappers.StringValue(value=device_id),
device_id=wrappers.StringValue(value=device_id), # pylint: disable=no-member
)
)
]
Expand Down
2 changes: 1 addition & 1 deletion nautobot_chatops_arista_cloudvision/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ssl
from datetime import datetime
import requests
from google.protobuf.timestamp_pb2 import Timestamp
from google.protobuf.timestamp_pb2 import Timestamp # pylint: disable=no-name-in-module
from cloudvision.Connector.grpc_client import GRPCClient, create_query
from cvprac.cvp_client import CvpClient
from django.conf import settings
Expand Down
Loading