Merge pull request #575 from mih/constimport

Import constants from new/dedicated location (not utils)
datalad · Dec 16, 2023 · 55b67a5 · 55b67a5
2 parents 58cc954 + b9e2cff
commit 55b67a5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/datalad_next/annexremotes/tests/test_uncurl.py b/datalad_next/annexremotes/tests/test_uncurl.py
@@ -2,7 +2,7 @@
 import pytest
 import re
 
-from datalad_next.utils import on_windows
+from datalad_next.consts import on_windows
 from datalad_next.tests.utils import (
     create_tree,
     skip_if_on_windows,

diff --git a/datalad_next/constraints/tests/test_cmdarg_validation.py b/datalad_next/constraints/tests/test_cmdarg_validation.py
@@ -11,7 +11,7 @@
     Parameter,
     eval_results,
 )
-from datalad_next.utils import on_windows
+from datalad_next.consts import on_windows
 from .. import (
     ConstraintError,
     EnsureGeneratorFromFileLike,

diff --git a/datalad_next/constraints/tests/test_compound.py b/datalad_next/constraints/tests/test_compound.py
@@ -5,8 +5,8 @@
 from unittest.mock import patch
 from pathlib import Path
 
+from datalad_next.consts import on_windows
 from datalad_next.exceptions import CapturedException
-from datalad_next.utils import on_windows
 
 from ..base import DatasetParameter
 

diff --git a/datalad_next/gitremotes/datalad_annex.py b/datalad_next/gitremotes/datalad_annex.py
@@ -198,6 +198,10 @@
 
 from datalad.core.local.repo import repo_from_path
 
+from datalad_next.consts import (
+    PRE_INIT_COMMIT_SHA,
+    on_windows,
+)
 from datalad_next.constraints import EnsureInt
 from datalad_next.datasets import (
     LegacyAnnexRepo as AnnexRepo,
@@ -212,7 +216,6 @@
 from datalad_next.uis import ui_switcher as ui
 from datalad_next.utils import (
     external_versions,
-    on_windows,
     rmtree,
 )
 
@@ -224,7 +227,6 @@
     specialremote_credential_envmap,
     update_specialremote_credential,
 )
-from datalad_next.utils.consts import PRE_INIT_COMMIT_SHA
 
 lgr = logging.getLogger('datalad.gitremote.datalad_annex')
 

diff --git a/datalad_next/gitremotes/tests/test_datalad_annex.py b/datalad_next/gitremotes/tests/test_datalad_annex.py
@@ -27,7 +27,7 @@
     eq_,
     rmtree,
 )
-from datalad_next.utils import on_windows
+from datalad_next.consts import on_windows
 from datalad_next.exceptions import CommandError
 from ..datalad_annex import get_initremote_params_from_url