From 6cc18503c11a2ba12f5b9d3454c2585f2b9cdc06 Mon Sep 17 00:00:00 2001
From: Ben Hoyt <ben.hoyt@canonical.com>
Date: Tue, 7 Feb 2023 14:20:02 +1300
Subject: [PATCH 1/2] Add ops.lib deprecation notice

---
 ops/lib/__init__.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ops/lib/__init__.py b/ops/lib/__init__.py
index 6be441a7a..f9075bc9f 100644
--- a/ops/lib/__init__.py
+++ b/ops/lib/__init__.py
@@ -12,7 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Infrastructure for the opslib functionality."""
+"""Infrastructure for the opslib functionality.
+
+DEPRECATED: The ops.lib functionality is deprecated, and is superseded by
+charm libraries (https://juju.is/docs/sdk/library) and regular Python imports.
+We now prefer to do version selection at build (charmcraft pack) time.
+"""
 
 import logging
 import os
@@ -41,6 +46,9 @@
 def use(name: str, api: int, author: str) -> ModuleType:
     """Use a library from the ops libraries.
 
+    DEPRECATED: This function is deprecated. Prefer charm libraries instead
+    (https://juju.is/docs/sdk/library).
+
     Args:
         name: the name of the library requested.
         api: the API version of the library.
@@ -88,6 +96,9 @@ def autoimport():
     You only need to call this if you've installed a package or
     otherwise changed sys.path in the current run, and need to see the
     changes. Otherwise libraries are found on first call of `use`.
+
+    DEPRECATED: This function is deprecated. Prefer charm libraries instead
+    (https://juju.is/docs/sdk/library).
     """
     global _libraries
     _libraries = {}

From 8e27d4544274a845144c7956bfce1ed933fe6d17 Mon Sep 17 00:00:00 2001
From: Ben Hoyt <ben.hoyt@canonical.com>
Date: Tue, 7 Feb 2023 15:39:21 +1300
Subject: [PATCH 2/2] Add actual DeprecationWarning for ops.lib deprecation

---
 ops/lib/__init__.py |  5 +++++
 test/test_lib.py    | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ops/lib/__init__.py b/ops/lib/__init__.py
index f9075bc9f..a716c244a 100644
--- a/ops/lib/__init__.py
+++ b/ops/lib/__init__.py
@@ -23,6 +23,7 @@
 import os
 import re
 import sys
+import warnings
 from ast import literal_eval
 from importlib.machinery import ModuleSpec
 from importlib.util import module_from_spec
@@ -60,6 +61,8 @@ def use(name: str, api: int, author: str) -> ModuleType:
         TypeError: if the name, api, or author are the wrong type.
         ValueError: if the name, api, or author are invalid.
     """
+    warnings.warn("ops.lib is deprecated, prefer charm libraries instead",
+                  category=DeprecationWarning)
     if not isinstance(name, str):
         raise TypeError(f"invalid library name: {name!r} (must be a str)")
     if not isinstance(author, str):
@@ -100,6 +103,8 @@ def autoimport():
     DEPRECATED: This function is deprecated. Prefer charm libraries instead
     (https://juju.is/docs/sdk/library).
     """
+    warnings.warn("ops.lib is deprecated, prefer charm libraries instead",
+                  category=DeprecationWarning)
     global _libraries
     _libraries = {}
     for spec in _find_all_specs(sys.path):
diff --git a/test/test_lib.py b/test/test_lib.py
index b2205e1ee..5a23c1f8c 100644
--- a/test/test_lib.py
+++ b/test/test_lib.py
@@ -24,9 +24,13 @@
 from unittest.mock import patch
 
 import logassert
+import pytest
 
 import ops.lib
 
+# Ignore deprecation warnings for this module.
+pytestmark = pytest.mark.filterwarnings('ignore::DeprecationWarning')
+
 
 def _mklib(topdir: str, pkgname: str, libname: str) -> Path:
     """Make a for-testing library.
@@ -609,3 +613,14 @@ def test_others_found(self):
 
         with self.assertRaises(ImportError):
             ops.lib.use('baz', 2, 'bob@example.com')
+
+
+class TestDeprecationWarning(TestCase):
+    def test_autoimport_deprecated(self):
+        with self.assertWarns(DeprecationWarning):
+            ops.lib.autoimport()
+
+    def test_use_deprecated(self):
+        with self.assertWarns(DeprecationWarning):
+            with self.assertRaises(ImportError):
+                ops.lib.use('foo', 1, 'bob@example.com')