From 0a3df94ba9ecb3d1504e2d2b1b3811f7372392c1 Mon Sep 17 00:00:00 2001
From: Michael Hanke <michael.hanke@gmail.com>
Date: Tue, 7 Feb 2023 17:15:16 +0100
Subject: [PATCH 1/2] Elevate CredentialManager to toplevel module

`datalad_next.utils.credman` -> `datalad_next.credman`

Closes #228
---
 datalad_next/commands/credentials.py                  | 2 +-
 datalad_next/credman/__init__.py                      | 1 +
 datalad_next/{utils/credman.py => credman/manager.py} | 0
 datalad_next/credman/tests/__init__.py                | 0
 datalad_next/{utils => credman}/tests/test_credman.py | 2 +-
 datalad_next/utils/__init__.py                        | 2 +-
 6 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 datalad_next/credman/__init__.py
 rename datalad_next/{utils/credman.py => credman/manager.py} (100%)
 create mode 100644 datalad_next/credman/tests/__init__.py
 rename datalad_next/{utils => credman}/tests/test_credman.py (99%)

diff --git a/datalad_next/commands/credentials.py b/datalad_next/commands/credentials.py
index ca189cab..6157322f 100644
--- a/datalad_next/commands/credentials.py
+++ b/datalad_next/commands/credentials.py
@@ -17,7 +17,7 @@
 from datalad import (
     cfg as dlcfg,
 )
-from datalad_next.utils.credman import (
+from datalad_next.credman.manager import (
     CredentialManager,
     verify_property_names,
 )
diff --git a/datalad_next/credman/__init__.py b/datalad_next/credman/__init__.py
new file mode 100644
index 00000000..5cb9ce89
--- /dev/null
+++ b/datalad_next/credman/__init__.py
@@ -0,0 +1 @@
+from .manager import CredentialManager
diff --git a/datalad_next/utils/credman.py b/datalad_next/credman/manager.py
similarity index 100%
rename from datalad_next/utils/credman.py
rename to datalad_next/credman/manager.py
diff --git a/datalad_next/credman/tests/__init__.py b/datalad_next/credman/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/datalad_next/utils/tests/test_credman.py b/datalad_next/credman/tests/test_credman.py
similarity index 99%
rename from datalad_next/utils/tests/test_credman.py
rename to datalad_next/credman/tests/test_credman.py
index 3b51e45f..1cd16615 100644
--- a/datalad_next/utils/tests/test_credman.py
+++ b/datalad_next/credman/tests/test_credman.py
@@ -13,7 +13,7 @@
 from unittest.mock import patch
 
 from datalad.config import ConfigManager
-from ..credman import (
+from ..manager import (
     CredentialManager,
     _get_cred_cfg_var,
 )
diff --git a/datalad_next/utils/__init__.py b/datalad_next/utils/__init__.py
index 990fbb96..6b9dc09d 100644
--- a/datalad_next/utils/__init__.py
+++ b/datalad_next/utils/__init__.py
@@ -27,7 +27,7 @@
 from datalad.distribution.utils import _yield_ds_w_matching_siblings
 from datalad.support.external_versions import external_versions
 
-from .credman import CredentialManager
+from datalad_next.credman import CredentialManager
 from .log import log_progress
 
 

From 46209ac55c1a6bdbdf5c9d83b08817c051ca8d88 Mon Sep 17 00:00:00 2001
From: Michael Hanke <michael.hanke@gmail.com>
Date: Tue, 7 Feb 2023 17:20:45 +0100
Subject: [PATCH 2/2] Add credman-move transition helper module

---
 datalad_next/utils/credman.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 datalad_next/utils/credman.py

diff --git a/datalad_next/utils/credman.py b/datalad_next/utils/credman.py
new file mode 100644
index 00000000..df5b18e7
--- /dev/null
+++ b/datalad_next/utils/credman.py
@@ -0,0 +1,12 @@
+import warnings
+warnings.warn(
+    "datalad_next.utils.credman was replaced by datalad_next.credman in "
+    "datalad_next 1.0. This transition helper module will be removed in "
+    "datalad_next 2.0.",
+    DeprecationWarning,
+)
+
+from datalad_next.credman.manager import (
+    CredentialManager,
+    verify_property_names,
+)