From 37579a39784f4d4116836f5fab97f3d2f45e75a3 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 3 Feb 2022 13:56:02 +0000
Subject: [PATCH] General fixes for aso update

---
 charms/nova-k8s/charmcraft.yaml                          | 7 +++++--
 charms/nova-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py | 3 +--
 charms/nova-k8s/requirements.txt                         | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charms/nova-k8s/charmcraft.yaml b/charms/nova-k8s/charmcraft.yaml
index be706d54..08ce6ba5 100644
--- a/charms/nova-k8s/charmcraft.yaml
+++ b/charms/nova-k8s/charmcraft.yaml
@@ -1,5 +1,3 @@
-# Learn more about charmcraft.yaml configuration at:
-# https://juju.is/docs/sdk/charmcraft-config
 type: "charm"
 bases:
   - build-on:
@@ -12,3 +10,8 @@ parts:
   charm:
     build-packages:
       - git
+      - libffi-dev
+      - libssl-dev
+    charm-python-packages:
+      - setuptools < 58
+      - cryptography < 3.4
diff --git a/charms/nova-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py b/charms/nova-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
index 69d4833f..10ecacb8 100644
--- a/charms/nova-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
+++ b/charms/nova-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
@@ -35,7 +35,6 @@ to get the relevant information from the relation data.
 import json
 import uuid
 import logging
-from ops.relation import ConsumerBase
 
 from ops.framework import (
     StoredState,
@@ -53,7 +52,7 @@ LIBAPI = 0
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 1
+LIBPATCH = 2
 
 logger = logging.getLogger(__name__)
 
diff --git a/charms/nova-k8s/requirements.txt b/charms/nova-k8s/requirements.txt
index 32a3d3b9..10b8e8ee 100644
--- a/charms/nova-k8s/requirements.txt
+++ b/charms/nova-k8s/requirements.txt
@@ -1,6 +1,4 @@
-# ops >= 1.2.0
 jinja2
-git+https://github.com/canonical/operator@2875e73e#egg=ops
 git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
 git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
 lightkube