From 8c073a6cc0c1463ab5e8bbe8d7fb320a0b886001 Mon Sep 17 00:00:00 2001
From: Jadon Naas <jadon.naas@canonical.com>
Date: Tue, 18 Jul 2023 14:14:32 -0400
Subject: [PATCH] Add docs key and point at Discourse

Add the 'docs' key and point it at a Discourse topic
previously populated with the charm's README contents.

When the new charm revision is released to the Charmhub,
this Discourse-based content will be displayed there. In
the absense of the this new key, the Charmhub's default
behaviour is to display the value of the charm's
'description' key.

Change-Id: Id759ee81cea83fe9b18671ce5bc19a31db319a77
---
 metadata.yaml    |  1 +
 osci.yaml        | 28 ----------------------------
 requirements.txt |  3 +++
 tox.ini          |  2 --
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/metadata.yaml b/metadata.yaml
index 9bd72f8..7a491d9 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,6 +7,7 @@ description: |
   .
   This charm provides the RADOS HTTP gateway supporting S3 and Swift protocols
   for object storage.
+docs: https://discourse.charmhub.io/t/ceph-radosgw-docs-index/11005
 tags:
 - openstack
 - storage
diff --git a/osci.yaml b/osci.yaml
index bbaee6c..c73994a 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,7 +1,6 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
       - charm-unit-jobs-py310
     check:
       jobs:
@@ -12,7 +11,6 @@
         - jammy-zed-multisite
         - jammy-antelope-multisite:
             voting: false
-        - kinetic-zed-multisite
         - lunar-antelope-multisite:
             voting: false
         - vault-jammy-yoga_rgw
@@ -23,8 +21,6 @@
             voting: false
         - vault-jammy-antelope-namespaced:
             voting: false
-        - vault-kinetic-zed_rgw
-        - vault-kinetic-zed-namespaced
         - vault-lunar-antelope_rgw:
             voting: false
         - vault-lunar-antelope-namespaced:
@@ -41,7 +37,6 @@
       - osci-lint
       - charm-build
       - tox-py38
-      - tox-py39
       - name: tox-py310
         soft: true
     vars:
@@ -70,13 +65,6 @@
       - jammy-yoga-multisite
     vars:
       tox_extra_args: jammy-antelope-multisite
-- job:
-    name: kinetic-zed-multisite
-    parent: func-target
-    dependencies:
-      - jammy-yoga-multisite
-    vars:
-      tox_extra_args: kinetic-zed-multisite
 - job:
     name: lunar-antelope-multisite
     parent: func-target
@@ -142,22 +130,6 @@
       - vault-jammy-yoga-namespaced
     vars:
       tox_extra_args: vault:jammy-zed-namespaced
-- job:
-    name: vault-kinetic-zed_rgw
-    parent: func-target
-    dependencies:
-      - vault-jammy-yoga_rgw
-      - vault-jammy-yoga-namespaced
-    vars:
-      tox_extra_args: vault:kinetic-zed
-- job:
-    name: vault-kinetic-zed-namespaced
-    parent: func-target
-    dependencies:
-      - vault-jammy-yoga_rgw
-      - vault-jammy-yoga-namespaced
-    vars:
-      tox_extra_args: vault:kinetic-zed-namespaced
 - job:
     name: vault-jammy-antelope_rgw
     parent: func-target
diff --git a/requirements.txt b/requirements.txt
index 3b1cb7b..8f3768c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,3 +27,6 @@ six>=1.9.0
 dnspython
 
 psutil>=1.1.1,<2.0.0
+
+# newer jsonschema needs rustc and cargo
+jsonschema<4.18.0
diff --git a/tox.ini b/tox.ini
index 22d5a80..9f09da3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,9 +74,7 @@ deps = -r{toxinidir}/requirements.txt
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
-       git+https://github.com/juju/charm-tools.git
 commands = flake8 {posargs} hooks unit_tests tests actions lib files
-           charm-proof
 
 [testenv:cover]
 # Technique based heavily upon