general: switch from flat layout to src layout

this is long overdue and much friendlier to python tooling ecosystem should be backwards compatible with existing editable installs, with a warning to reinstall properly see #316
karlicoss · Jan 24, 2025 · f8a55f7 · f8a55f7
1 parent bb703c8
commit f8a55f7
Show file tree

Hide file tree

Showing 225 changed files with 99 additions and 34 deletions.
diff --git a/conftest.py b/conftest.py
@@ -10,7 +10,7 @@
 import _pytest.pathlib
 
 # we consider all dirs in repo/ to be namespace packages
-root_dir = pathlib.Path(__file__).absolute().parent.resolve()  # / 'src'
+root_dir = pathlib.Path(__file__).absolute().parent.resolve() / 'src'
 assert root_dir.exists(), root_dir
 
 # TODO assert it contains package name?? maybe get it via setuptools..
@@ -21,6 +21,10 @@
 # takes a full abs path to the test file and needs to return the path to the 'root' package on the filesystem
 resolve_pkg_path_orig = _pytest.pathlib.resolve_package_path
 def resolve_package_path(path: pathlib.Path) -> Optional[pathlib.Path]:
+    if 'tests_misc/conftest.py' in str(path):
+        # ugh. otherwise it can't resolve the path since tests_misc isn't under src/ dir..
+        return resolve_pkg_path_orig(path)
+
     result = path  # search from the test file upwards
     for parent in result.parents:
         if str(parent) in namespace_pkg_dirs:

diff --git a/demo.py b/demo.py
@@ -11,7 +11,7 @@
 
 def run() -> None:
     # uses fixed paths; worth it for the sake of demonstration
-    # assumes we're in /tmp/my_demo now
+    # assumes we're in /tmp/my_demo now (set by the context manager in main)
 
     # 1. clone [email protected]:karlicoss/my.git
     copytree(
@@ -44,15 +44,15 @@ def run() -> None:
 
     # 4. point my.config to the Hypothesis data
     mycfg_root = abspath('my_repo')
-    init_file = Path(mycfg_root) / 'my/config.py'
+    init_file = Path(mycfg_root) / 'src/my/config.py'
     init_file.write_text(init_file.read_text().replace(
         '/path/to/hypothesis/data',
         hypothesis_backups,
     ))
     #
 
     # 4. now we can use it!
-    os.chdir(my_repo)
+    os.chdir('my_repo/src')
 
     check_call([python, '-c', '''
 import my.hypothesis

diff --git a/my b/my
@@ -0,0 +1 @@
+src/my
diff --git a/my/core/internal.py b/my/core/internal.py
diff --git a/setup.py b/setup.py
@@ -15,8 +15,9 @@
 
 
 def main() -> None:
-    pkg = 'my'
-    subpackages = find_namespace_packages('.', include=('my.*',))
+    pkgs = find_namespace_packages('src')
+    pkg = min(pkgs)  # should be just 'my'
+
     setup(
         name='HPI', # NOTE: 'my' is taken for PyPi already, and makes discovering the project impossible. so we're using HPI
         use_scm_version={
@@ -30,7 +31,8 @@ def main() -> None:
 
         # eh. find_packages doesn't find anything
         # find_namespace_packages can't find single file packages (like my/common.py)
-        packages=[pkg, *subpackages],
+        packages=pkgs,
+        package_dir={'': 'src'},
         package_data={
             pkg: [
                 # for mypy

diff --git a/my/arbtt.py → src/my/arbtt.py b/my/arbtt.py → src/my/arbtt.py
diff --git a/my/bluemaestro.py → src/my/bluemaestro.py b/my/bluemaestro.py → src/my/bluemaestro.py
diff --git a/my/body/blood.py → src/my/body/blood.py b/my/body/blood.py → src/my/body/blood.py
diff --git a/my/body/exercise/all.py → src/my/body/exercise/all.py b/my/body/exercise/all.py → src/my/body/exercise/all.py
diff --git a/my/body/exercise/cardio.py → src/my/body/exercise/cardio.py b/my/body/exercise/cardio.py → src/my/body/exercise/cardio.py
diff --git a/my/body/exercise/cross_trainer.py → src/my/body/exercise/cross_trainer.py b/my/body/exercise/cross_trainer.py → src/my/body/exercise/cross_trainer.py
diff --git a/my/body/sleep/common.py → src/my/body/sleep/common.py b/my/body/sleep/common.py → src/my/body/sleep/common.py
diff --git a/my/body/sleep/main.py → src/my/body/sleep/main.py b/my/body/sleep/main.py → src/my/body/sleep/main.py
diff --git a/my/body/weight.py → src/my/body/weight.py b/my/body/weight.py → src/my/body/weight.py
diff --git a/my/books/kobo.py → src/my/books/kobo.py b/my/books/kobo.py → src/my/books/kobo.py
diff --git a/my/browser/active_browser.py → src/my/browser/active_browser.py b/my/browser/active_browser.py → src/my/browser/active_browser.py
diff --git a/my/browser/all.py → src/my/browser/all.py b/my/browser/all.py → src/my/browser/all.py
diff --git a/my/browser/common.py → src/my/browser/common.py b/my/browser/common.py → src/my/browser/common.py
diff --git a/my/browser/export.py → src/my/browser/export.py b/my/browser/export.py → src/my/browser/export.py
diff --git a/my/bumble/android.py → src/my/bumble/android.py b/my/bumble/android.py → src/my/bumble/android.py
diff --git a/my/calendar/holidays.py → src/my/calendar/holidays.py b/my/calendar/holidays.py → src/my/calendar/holidays.py
diff --git a/my/cfg.py → src/my/cfg.py b/my/cfg.py → src/my/cfg.py
diff --git a/my/codeforces.py → src/my/codeforces.py b/my/codeforces.py → src/my/codeforces.py
diff --git a/my/coding/commits.py → src/my/coding/commits.py b/my/coding/commits.py → src/my/coding/commits.py
diff --git a/my/coding/github.py → src/my/coding/github.py b/my/coding/github.py → src/my/coding/github.py
diff --git a/my/common.py → src/my/common.py b/my/common.py → src/my/common.py
diff --git a/my/config.py → src/my/config.py b/my/config.py → src/my/config.py
diff --git a/my/core/__init__.py → src/my/core/__init__.py b/my/core/__init__.py → src/my/core/__init__.py
@@ -20,14 +20,6 @@
 LazyLogger = make_logger  # TODO deprecate this in favor of make_logger
 
 
-if not TYPE_CHECKING:
-    # we used to keep these here for brevity, but feels like it only adds confusion,
-    #  e.g. suggest that we perhaps somehow modify builtin behaviour or whatever
-    #  so best to prefer explicit behaviour
-    from dataclasses import dataclass
-    from pathlib import Path
-
-
 __all__ = [
     '__NOT_HPI_MODULE__',
     'Json',
@@ -59,3 +51,16 @@
 except:
     pass
 ##
+
+
+if not TYPE_CHECKING:
+    # we used to keep these here for brevity, but feels like it only adds confusion,
+    #  e.g. suggest that we perhaps somehow modify builtin behaviour or whatever
+    #  so best to prefer explicit behaviour
+    from dataclasses import dataclass
+    from pathlib import Path
+
+
+from .internal import warn_if_not_using_src_layout
+
+warn_if_not_using_src_layout(path=__path__)
diff --git a/my/core/__main__.py → src/my/core/__main__.py b/my/core/__main__.py → src/my/core/__main__.py
diff --git a/my/core/_cpu_pool.py → src/my/core/_cpu_pool.py b/my/core/_cpu_pool.py → src/my/core/_cpu_pool.py
diff --git a/my/core/_deprecated/dataset.py → src/my/core/_deprecated/dataset.py b/my/core/_deprecated/dataset.py → src/my/core/_deprecated/dataset.py
diff --git a/my/core/_deprecated/kompress.py → src/my/core/_deprecated/kompress.py b/my/core/_deprecated/kompress.py → src/my/core/_deprecated/kompress.py
diff --git a/my/core/cachew.py → src/my/core/cachew.py b/my/core/cachew.py → src/my/core/cachew.py
diff --git a/my/core/cfg.py → src/my/core/cfg.py b/my/core/cfg.py → src/my/core/cfg.py
diff --git a/my/core/common.py → src/my/core/common.py b/my/core/common.py → src/my/core/common.py
diff --git a/my/core/compat.py → src/my/core/compat.py b/my/core/compat.py → src/my/core/compat.py
diff --git a/my/core/core_config.py → src/my/core/core_config.py b/my/core/core_config.py → src/my/core/core_config.py
diff --git a/my/core/dataset.py → src/my/core/dataset.py b/my/core/dataset.py → src/my/core/dataset.py
diff --git a/my/core/denylist.py → src/my/core/denylist.py b/my/core/denylist.py → src/my/core/denylist.py
diff --git a/my/core/discovery_pure.py → src/my/core/discovery_pure.py b/my/core/discovery_pure.py → src/my/core/discovery_pure.py
diff --git a/my/core/error.py → src/my/core/error.py b/my/core/error.py → src/my/core/error.py
diff --git a/my/core/experimental.py → src/my/core/experimental.py b/my/core/experimental.py → src/my/core/experimental.py
diff --git a/my/core/freezer.py → src/my/core/freezer.py b/my/core/freezer.py → src/my/core/freezer.py
diff --git a/my/core/hpi_compat.py → src/my/core/hpi_compat.py b/my/core/hpi_compat.py → src/my/core/hpi_compat.py
diff --git a/my/core/influxdb.py → src/my/core/influxdb.py b/my/core/influxdb.py → src/my/core/influxdb.py
diff --git a/my/core/init.py → src/my/core/init.py b/my/core/init.py → src/my/core/init.py
diff --git a/src/my/core/internal.py b/src/my/core/internal.py
@@ -0,0 +1,54 @@
+"""
+Utils specific to hpi core, shouldn't really be used by HPI modules
+"""
+from __future__ import annotations
+
+
+def assert_subpackage(name: str) -> None:
+    # can lead to some unexpected issues if you 'import cachew' which being in my/core directory.. so let's protect against it
+    # NOTE: if we use overlay, name can be smth like my.origg.my.core.cachew ...
+    assert name == '__main__' or 'my.core' in name, f'Expected module __name__ ({name}) to be __main__ or start with my.core'
+
+
+def _is_editable(package_name: str) -> bool:
+    import importlib.metadata
+
+    dist = importlib.metadata.distribution(package_name)
+    dist_files = dist.files or []
+    for path in dist_files:
+        if str(path).endswith('.pth'):
+            return True
+    return False
+
+
+def warn_if_not_using_src_layout(path: list[str]) -> None:
+    contains_src = any('/src/my/' in p for p in path)
+    if contains_src:
+        return
+
+    # __package__ won't work because it's gonna be 'my' rather than 'hpi'
+    # seems like it's quite annoying to get distribition name from within the package, so easier to hardcode..
+    distribution_name = 'hpi'
+    try:
+        editable = _is_editable(distribution_name)
+    except:
+        # it would be annoying if this somehow fails during the very first HPI import...
+        # so just make defensive
+        return
+
+    if not editable:
+        # nothing to check
+        return
+
+
+    from . import warnings
+
+    MSG = '''
+    Seems that your HPI is installed as editable and uses flat layout ( my/ directory next to .git folder).
+    This was the case in older HPI versions (pre-20250123), but now src-layout is recommended ( src/my/ directory next to .git folder).
+
+    Reinstall your HPI as editable again via 'pip install --editable /path/to/hpi'.
+    See https://github.com/karlicoss/HPI/issues/316 for more info.
+    '''
+
+    warnings.high(MSG)
diff --git a/my/core/kompress.py → src/my/core/kompress.py b/my/core/kompress.py → src/my/core/kompress.py
diff --git a/my/core/konsume.py → src/my/core/konsume.py b/my/core/konsume.py → src/my/core/konsume.py
diff --git a/my/core/logging.py → src/my/core/logging.py b/my/core/logging.py → src/my/core/logging.py
diff --git a/my/core/mime.py → src/my/core/mime.py b/my/core/mime.py → src/my/core/mime.py
diff --git a/my/core/orgmode.py → src/my/core/orgmode.py b/my/core/orgmode.py → src/my/core/orgmode.py
diff --git a/my/core/pandas.py → src/my/core/pandas.py b/my/core/pandas.py → src/my/core/pandas.py
diff --git a/my/core/preinit.py → src/my/core/preinit.py b/my/core/preinit.py → src/my/core/preinit.py
diff --git a/my/core/pytest.py → src/my/core/pytest.py b/my/core/pytest.py → src/my/core/pytest.py
diff --git a/my/core/query.py → src/my/core/query.py b/my/core/query.py → src/my/core/query.py
diff --git a/my/core/query_range.py → src/my/core/query_range.py b/my/core/query_range.py → src/my/core/query_range.py
diff --git a/my/core/serialize.py → src/my/core/serialize.py b/my/core/serialize.py → src/my/core/serialize.py
diff --git a/my/core/source.py → src/my/core/source.py b/my/core/source.py → src/my/core/source.py
diff --git a/my/core/sqlite.py → src/my/core/sqlite.py b/my/core/sqlite.py → src/my/core/sqlite.py
diff --git a/my/core/stats.py → src/my/core/stats.py b/my/core/stats.py → src/my/core/stats.py
diff --git a/my/core/structure.py → src/my/core/structure.py b/my/core/structure.py → src/my/core/structure.py
diff --git a/my/core/tests/__init__.py → src/my/core/tests/__init__.py b/my/core/tests/__init__.py → src/my/core/tests/__init__.py
diff --git a/my/core/tests/auto_stats.py → src/my/core/tests/auto_stats.py b/my/core/tests/auto_stats.py → src/my/core/tests/auto_stats.py
diff --git a/my/core/tests/common.py → src/my/core/tests/common.py b/my/core/tests/common.py → src/my/core/tests/common.py
diff --git a/my/core/tests/denylist.py → src/my/core/tests/denylist.py b/my/core/tests/denylist.py → src/my/core/tests/denylist.py
diff --git a/my/core/tests/sqlite.py → src/my/core/tests/sqlite.py b/my/core/tests/sqlite.py → src/my/core/tests/sqlite.py
diff --git a/my/core/tests/structure.py → src/my/core/tests/structure.py b/my/core/tests/structure.py → src/my/core/tests/structure.py
diff --git a/...e/tests/structure_data/gdpr_export.tar.gz → ...e/tests/structure_data/gdpr_export.tar.gz b/...e/tests/structure_data/gdpr_export.tar.gz → ...e/tests/structure_data/gdpr_export.tar.gz
diff --git a/my/core/tests/structure_data/gdpr_export.zip → ...core/tests/structure_data/gdpr_export.zip b/my/core/tests/structure_data/gdpr_export.zip → ...core/tests/structure_data/gdpr_export.zip
diff --git a/...dirs/broken_export/comments/comments.json → ...dirs/broken_export/comments/comments.json b/...dirs/broken_export/comments/comments.json → ...dirs/broken_export/comments/comments.json
diff --git a/..._subdirs/broken_export/messages/index.csv → ..._subdirs/broken_export/messages/index.csv b/..._subdirs/broken_export/messages/index.csv → ..._subdirs/broken_export/messages/index.csv
diff --git a/...ubdirs/gdpr_export/comments/comments.json → ...ubdirs/gdpr_export/comments/comments.json b/...ubdirs/gdpr_export/comments/comments.json → ...ubdirs/gdpr_export/comments/comments.json
diff --git a/...pr_subdirs/gdpr_export/messages/index.csv → ...pr_subdirs/gdpr_export/messages/index.csv b/...pr_subdirs/gdpr_export/messages/index.csv → ...pr_subdirs/gdpr_export/messages/index.csv
diff --git a/...subdirs/gdpr_export/profile/settings.json → ...subdirs/gdpr_export/profile/settings.json b/...subdirs/gdpr_export/profile/settings.json → ...subdirs/gdpr_export/profile/settings.json
diff --git a/my/core/tests/test_cachew.py → src/my/core/tests/test_cachew.py b/my/core/tests/test_cachew.py → src/my/core/tests/test_cachew.py
diff --git a/my/core/tests/test_cli.py → src/my/core/tests/test_cli.py b/my/core/tests/test_cli.py → src/my/core/tests/test_cli.py
diff --git a/my/core/tests/test_config.py → src/my/core/tests/test_config.py b/my/core/tests/test_config.py → src/my/core/tests/test_config.py
diff --git a/my/core/tests/test_get_files.py → src/my/core/tests/test_get_files.py b/my/core/tests/test_get_files.py → src/my/core/tests/test_get_files.py
diff --git a/my/core/tests/test_tmp_config.py → src/my/core/tests/test_tmp_config.py b/my/core/tests/test_tmp_config.py → src/my/core/tests/test_tmp_config.py
diff --git a/my/core/time.py → src/my/core/time.py b/my/core/time.py → src/my/core/time.py
diff --git a/my/core/types.py → src/my/core/types.py b/my/core/types.py → src/my/core/types.py
diff --git a/my/core/util.py → src/my/core/util.py b/my/core/util.py → src/my/core/util.py
diff --git a/my/core/utils/concurrent.py → src/my/core/utils/concurrent.py b/my/core/utils/concurrent.py → src/my/core/utils/concurrent.py
diff --git a/my/core/utils/imports.py → src/my/core/utils/imports.py b/my/core/utils/imports.py → src/my/core/utils/imports.py
diff --git a/my/core/utils/itertools.py → src/my/core/utils/itertools.py b/my/core/utils/itertools.py → src/my/core/utils/itertools.py
diff --git a/my/core/warnings.py → src/my/core/warnings.py b/my/core/warnings.py → src/my/core/warnings.py
diff --git a/my/demo.py → src/my/demo.py b/my/demo.py → src/my/demo.py
diff --git a/my/emfit/__init__.py → src/my/emfit/__init__.py b/my/emfit/__init__.py → src/my/emfit/__init__.py
diff --git a/my/emfit/plot.py → src/my/emfit/plot.py b/my/emfit/plot.py → src/my/emfit/plot.py
diff --git a/my/endomondo.py → src/my/endomondo.py b/my/endomondo.py → src/my/endomondo.py
diff --git a/my/error.py → src/my/error.py b/my/error.py → src/my/error.py
diff --git a/my/experimental/destructive_parsing.py → src/my/experimental/destructive_parsing.py b/my/experimental/destructive_parsing.py → src/my/experimental/destructive_parsing.py
diff --git a/my/fbmessenger/__init__.py → src/my/fbmessenger/__init__.py b/my/fbmessenger/__init__.py → src/my/fbmessenger/__init__.py
diff --git a/my/fbmessenger/all.py → src/my/fbmessenger/all.py b/my/fbmessenger/all.py → src/my/fbmessenger/all.py
diff --git a/my/fbmessenger/android.py → src/my/fbmessenger/android.py b/my/fbmessenger/android.py → src/my/fbmessenger/android.py
diff --git a/my/fbmessenger/common.py → src/my/fbmessenger/common.py b/my/fbmessenger/common.py → src/my/fbmessenger/common.py
diff --git a/my/fbmessenger/export.py → src/my/fbmessenger/export.py b/my/fbmessenger/export.py → src/my/fbmessenger/export.py
diff --git a/my/foursquare.py → src/my/foursquare.py b/my/foursquare.py → src/my/foursquare.py
diff --git a/my/github/all.py → src/my/github/all.py b/my/github/all.py → src/my/github/all.py
diff --git a/my/github/common.py → src/my/github/common.py b/my/github/common.py → src/my/github/common.py
diff --git a/my/github/gdpr.py → src/my/github/gdpr.py b/my/github/gdpr.py → src/my/github/gdpr.py
diff --git a/my/github/ghexport.py → src/my/github/ghexport.py b/my/github/ghexport.py → src/my/github/ghexport.py
diff --git a/my/goodreads.py → src/my/goodreads.py b/my/goodreads.py → src/my/goodreads.py
diff --git a/my/google/maps/_android_protobuf.py → src/my/google/maps/_android_protobuf.py b/my/google/maps/_android_protobuf.py → src/my/google/maps/_android_protobuf.py
diff --git a/my/google/maps/android.py → src/my/google/maps/android.py b/my/google/maps/android.py → src/my/google/maps/android.py
diff --git a/my/google/takeout/html.py → src/my/google/takeout/html.py b/my/google/takeout/html.py → src/my/google/takeout/html.py
diff --git a/my/google/takeout/parser.py → src/my/google/takeout/parser.py b/my/google/takeout/parser.py → src/my/google/takeout/parser.py
diff --git a/my/google/takeout/paths.py → src/my/google/takeout/paths.py b/my/google/takeout/paths.py → src/my/google/takeout/paths.py
diff --git a/my/hackernews/common.py → src/my/hackernews/common.py b/my/hackernews/common.py → src/my/hackernews/common.py
diff --git a/my/hackernews/dogsheep.py → src/my/hackernews/dogsheep.py b/my/hackernews/dogsheep.py → src/my/hackernews/dogsheep.py
diff --git a/my/hackernews/harmonic.py → src/my/hackernews/harmonic.py b/my/hackernews/harmonic.py → src/my/hackernews/harmonic.py
diff --git a/my/hackernews/materialistic.py → src/my/hackernews/materialistic.py b/my/hackernews/materialistic.py → src/my/hackernews/materialistic.py
diff --git a/my/hypothesis.py → src/my/hypothesis.py b/my/hypothesis.py → src/my/hypothesis.py
diff --git a/my/instagram/all.py → src/my/instagram/all.py b/my/instagram/all.py → src/my/instagram/all.py
diff --git a/my/instagram/android.py → src/my/instagram/android.py b/my/instagram/android.py → src/my/instagram/android.py
diff --git a/my/instagram/common.py → src/my/instagram/common.py b/my/instagram/common.py → src/my/instagram/common.py
diff --git a/my/instagram/gdpr.py → src/my/instagram/gdpr.py b/my/instagram/gdpr.py → src/my/instagram/gdpr.py
diff --git a/my/instapaper.py → src/my/instapaper.py b/my/instapaper.py → src/my/instapaper.py
diff --git a/my/ip/all.py → src/my/ip/all.py b/my/ip/all.py → src/my/ip/all.py
diff --git a/my/ip/common.py → src/my/ip/common.py b/my/ip/common.py → src/my/ip/common.py
diff --git a/my/jawbone/__init__.py → src/my/jawbone/__init__.py b/my/jawbone/__init__.py → src/my/jawbone/__init__.py
diff --git a/my/jawbone/features.csv → src/my/jawbone/features.csv b/my/jawbone/features.csv → src/my/jawbone/features.csv
diff --git a/my/jawbone/plots.py → src/my/jawbone/plots.py b/my/jawbone/plots.py → src/my/jawbone/plots.py
diff --git a/my/kobo.py → src/my/kobo.py b/my/kobo.py → src/my/kobo.py
diff --git a/my/kython/README → src/my/kython/README b/my/kython/README → src/my/kython/README
diff --git a/my/kython/kompress.py → src/my/kython/kompress.py b/my/kython/kompress.py → src/my/kython/kompress.py
diff --git a/my/lastfm.py → src/my/lastfm.py b/my/lastfm.py → src/my/lastfm.py
diff --git a/my/location/all.py → src/my/location/all.py b/my/location/all.py → src/my/location/all.py
diff --git a/my/location/common.py → src/my/location/common.py b/my/location/common.py → src/my/location/common.py
diff --git a/my/location/fallback/all.py → src/my/location/fallback/all.py b/my/location/fallback/all.py → src/my/location/fallback/all.py
diff --git a/my/location/fallback/common.py → src/my/location/fallback/common.py b/my/location/fallback/common.py → src/my/location/fallback/common.py
diff --git a/my/location/fallback/via_home.py → src/my/location/fallback/via_home.py b/my/location/fallback/via_home.py → src/my/location/fallback/via_home.py
diff --git a/my/location/fallback/via_ip.py → src/my/location/fallback/via_ip.py b/my/location/fallback/via_ip.py → src/my/location/fallback/via_ip.py
diff --git a/my/location/google.py → src/my/location/google.py b/my/location/google.py → src/my/location/google.py
diff --git a/my/location/google_takeout.py → src/my/location/google_takeout.py b/my/location/google_takeout.py → src/my/location/google_takeout.py
diff --git a/my/location/google_takeout_semantic.py → src/my/location/google_takeout_semantic.py b/my/location/google_takeout_semantic.py → src/my/location/google_takeout_semantic.py
diff --git a/my/location/gpslogger.py → src/my/location/gpslogger.py b/my/location/gpslogger.py → src/my/location/gpslogger.py
diff --git a/my/location/home.py → src/my/location/home.py b/my/location/home.py → src/my/location/home.py
diff --git a/my/location/via_ip.py → src/my/location/via_ip.py b/my/location/via_ip.py → src/my/location/via_ip.py
diff --git a/my/materialistic.py → src/my/materialistic.py b/my/materialistic.py → src/my/materialistic.py
diff --git a/my/media/imdb.py → src/my/media/imdb.py b/my/media/imdb.py → src/my/media/imdb.py
diff --git a/my/media/movies.py → src/my/media/movies.py b/my/media/movies.py → src/my/media/movies.py
diff --git a/my/media/youtube.py → src/my/media/youtube.py b/my/media/youtube.py → src/my/media/youtube.py
diff --git a/my/monzo/monzoexport.py → src/my/monzo/monzoexport.py b/my/monzo/monzoexport.py → src/my/monzo/monzoexport.py
diff --git a/my/orgmode.py → src/my/orgmode.py b/my/orgmode.py → src/my/orgmode.py
diff --git a/my/pdfs.py → src/my/pdfs.py b/my/pdfs.py → src/my/pdfs.py
diff --git a/my/photos/main.py → src/my/photos/main.py b/my/photos/main.py → src/my/photos/main.py
diff --git a/my/photos/utils.py → src/my/photos/utils.py b/my/photos/utils.py → src/my/photos/utils.py
diff --git a/my/pinboard.py → src/my/pinboard.py b/my/pinboard.py → src/my/pinboard.py
diff --git a/my/pocket.py → src/my/pocket.py b/my/pocket.py → src/my/pocket.py
diff --git a/my/polar.py → src/my/polar.py b/my/polar.py → src/my/polar.py
diff --git a/my/py.typed → src/my/py.typed b/my/py.typed → src/my/py.typed
diff --git a/my/reading/goodreads.py → src/my/reading/goodreads.py b/my/reading/goodreads.py → src/my/reading/goodreads.py
diff --git a/my/reading/polar.py → src/my/reading/polar.py b/my/reading/polar.py → src/my/reading/polar.py
diff --git a/my/reddit/__init__.py → src/my/reddit/__init__.py b/my/reddit/__init__.py → src/my/reddit/__init__.py
diff --git a/my/reddit/all.py → src/my/reddit/all.py b/my/reddit/all.py → src/my/reddit/all.py
diff --git a/my/reddit/common.py → src/my/reddit/common.py b/my/reddit/common.py → src/my/reddit/common.py
diff --git a/my/reddit/pushshift.py → src/my/reddit/pushshift.py b/my/reddit/pushshift.py → src/my/reddit/pushshift.py
diff --git a/my/reddit/rexport.py → src/my/reddit/rexport.py b/my/reddit/rexport.py → src/my/reddit/rexport.py
diff --git a/my/rescuetime.py → src/my/rescuetime.py b/my/rescuetime.py → src/my/rescuetime.py
diff --git a/my/roamresearch.py → src/my/roamresearch.py b/my/roamresearch.py → src/my/roamresearch.py
diff --git a/my/rss/all.py → src/my/rss/all.py b/my/rss/all.py → src/my/rss/all.py
diff --git a/my/rss/common.py → src/my/rss/common.py b/my/rss/common.py → src/my/rss/common.py
diff --git a/my/rss/feedbin.py → src/my/rss/feedbin.py b/my/rss/feedbin.py → src/my/rss/feedbin.py
diff --git a/my/rss/feedly.py → src/my/rss/feedly.py b/my/rss/feedly.py → src/my/rss/feedly.py
diff --git a/my/rtm.py → src/my/rtm.py b/my/rtm.py → src/my/rtm.py
diff --git a/my/runnerup.py → src/my/runnerup.py b/my/runnerup.py → src/my/runnerup.py
diff --git a/my/simple.py → src/my/simple.py b/my/simple.py → src/my/simple.py
diff --git a/my/smscalls.py → src/my/smscalls.py b/my/smscalls.py → src/my/smscalls.py
diff --git a/my/stackexchange/gdpr.py → src/my/stackexchange/gdpr.py b/my/stackexchange/gdpr.py → src/my/stackexchange/gdpr.py
diff --git a/my/stackexchange/stexport.py → src/my/stackexchange/stexport.py b/my/stackexchange/stexport.py → src/my/stackexchange/stexport.py
diff --git a/my/taplog.py → src/my/taplog.py b/my/taplog.py → src/my/taplog.py
diff --git a/my/telegram/telegram_backup.py → src/my/telegram/telegram_backup.py b/my/telegram/telegram_backup.py → src/my/telegram/telegram_backup.py
diff --git a/my/tests/__init__.py → src/my/tests/__init__.py b/my/tests/__init__.py → src/my/tests/__init__.py
diff --git a/my/tests/bluemaestro.py → src/my/tests/bluemaestro.py b/my/tests/bluemaestro.py → src/my/tests/bluemaestro.py
diff --git a/my/tests/body/weight.py → src/my/tests/body/weight.py b/my/tests/body/weight.py → src/my/tests/body/weight.py
diff --git a/my/tests/calendar.py → src/my/tests/calendar.py b/my/tests/calendar.py → src/my/tests/calendar.py
diff --git a/my/tests/commits.py → src/my/tests/commits.py b/my/tests/commits.py → src/my/tests/commits.py
@@ -7,6 +7,9 @@
 from my.coding.commits import commits
 from my.core.cfg import tmp_config
 
+from .common import hpi_repo_root
+
+
 pytestmark = pytest.mark.skipif(
     os.name == 'nt',
     reason='TODO figure out how to install fd-find on Windows',
@@ -29,14 +32,11 @@ def prepare(tmp_path: Path):
     # - bare repos
     # - canonical name
     # - caching?
-    hpi_repo_root = Path(__file__).absolute().parent.parent.parent
-    assert (hpi_repo_root / '.git').exists(), hpi_repo_root
-
     class config:
         class commits:
             emails = {'[email protected]'}
             names = {'Dima'}
-            roots = [hpi_repo_root]
+            roots = [hpi_repo_root()]
 
     with tmp_config(modules='my.coding.commits', config=config):
         yield
diff --git a/my/tests/common.py → src/my/tests/common.py b/my/tests/common.py → src/my/tests/common.py
@@ -11,8 +11,15 @@
 )
 
 
+def hpi_repo_root() -> Path:
+    root_dir = Path(__file__).absolute().parent.parent.parent.parent
+    src_dir = root_dir / 'src'
+    assert src_dir.exists(), src_dir
+    return root_dir
+
+
 def testdata() -> Path:
-    d = Path(__file__).absolute().parent.parent.parent / 'testdata'
+    d = hpi_repo_root() / 'testdata'
     assert d.exists(), d
     return d
 

diff --git a/my/tests/conftest.py → src/my/tests/conftest.py b/my/tests/conftest.py → src/my/tests/conftest.py
diff --git a/my/tests/location/fallback.py → src/my/tests/location/fallback.py b/my/tests/location/fallback.py → src/my/tests/location/fallback.py
diff --git a/my/tests/location/google.py → src/my/tests/location/google.py b/my/tests/location/google.py → src/my/tests/location/google.py
diff --git a/my/tests/pdfs.py → src/my/tests/pdfs.py b/my/tests/pdfs.py → src/my/tests/pdfs.py
diff --git a/my/tests/reddit.py → src/my/tests/reddit.py b/my/tests/reddit.py → src/my/tests/reddit.py
diff --git a/my/tests/shared_tz_config.py → src/my/tests/shared_tz_config.py b/my/tests/shared_tz_config.py → src/my/tests/shared_tz_config.py
@@ -47,10 +47,11 @@ class via_location:
 def _prepare_takeouts_dir(tmp_path: Path) -> Path:
     from .common import testdata
 
+    testdata_dir = testdata()
     try:
-        track = one(testdata().rglob('italy-slovenia-2017-07-29.json'))
+        track = one(testdata_dir.rglob('italy-slovenia-2017-07-29.json'))
     except ValueError as e:
-        raise RuntimeError('testdata not found, setup git submodules?') from e
+        raise RuntimeError(f'testdata not found in {testdata_dir}, setup git submodules?') from e
 
     # todo ugh. unnecessary zipping, but at the moment takeout provider doesn't support plain dirs
     import zipfile

diff --git a/my/tests/tz.py → src/my/tests/tz.py b/my/tests/tz.py → src/my/tests/tz.py
diff --git a/my/time/tz/common.py → src/my/time/tz/common.py b/my/time/tz/common.py → src/my/time/tz/common.py
diff --git a/my/time/tz/main.py → src/my/time/tz/main.py b/my/time/tz/main.py → src/my/time/tz/main.py
diff --git a/my/time/tz/via_location.py → src/my/time/tz/via_location.py b/my/time/tz/via_location.py → src/my/time/tz/via_location.py
diff --git a/my/tinder/android.py → src/my/tinder/android.py b/my/tinder/android.py → src/my/tinder/android.py
diff --git a/my/topcoder.py → src/my/topcoder.py b/my/topcoder.py → src/my/topcoder.py
diff --git a/my/twitter/all.py → src/my/twitter/all.py b/my/twitter/all.py → src/my/twitter/all.py
diff --git a/my/twitter/android.py → src/my/twitter/android.py b/my/twitter/android.py → src/my/twitter/android.py
diff --git a/my/twitter/archive.py → src/my/twitter/archive.py b/my/twitter/archive.py → src/my/twitter/archive.py
diff --git a/my/twitter/common.py → src/my/twitter/common.py b/my/twitter/common.py → src/my/twitter/common.py
diff --git a/my/twitter/talon.py → src/my/twitter/talon.py b/my/twitter/talon.py → src/my/twitter/talon.py
diff --git a/my/twitter/twint.py → src/my/twitter/twint.py b/my/twitter/twint.py → src/my/twitter/twint.py
diff --git a/my/util/hpi_heartbeat.py → src/my/util/hpi_heartbeat.py b/my/util/hpi_heartbeat.py → src/my/util/hpi_heartbeat.py
diff --git a/my/vk/all.py → src/my/vk/all.py b/my/vk/all.py → src/my/vk/all.py
diff --git a/my/vk/favorites.py → src/my/vk/favorites.py b/my/vk/favorites.py → src/my/vk/favorites.py
diff --git a/my/vk/vk_messages_backup.py → src/my/vk/vk_messages_backup.py b/my/vk/vk_messages_backup.py → src/my/vk/vk_messages_backup.py
diff --git a/my/whatsapp/android.py → src/my/whatsapp/android.py b/my/whatsapp/android.py → src/my/whatsapp/android.py
diff --git a/my/youtube/takeout.py → src/my/youtube/takeout.py b/my/youtube/takeout.py → src/my/youtube/takeout.py
diff --git a/my/zotero.py → src/my/zotero.py b/my/zotero.py → src/my/zotero.py
diff --git a/my/zulip/organization.py → src/my/zulip/organization.py b/my/zulip/organization.py → src/my/zulip/organization.py
diff --git a/tests/__init__.py → tests_misc/__init__.py b/tests/__init__.py → tests_misc/__init__.py
diff --git a/tests/conftest.py → tests_misc/conftest.py b/tests/conftest.py → tests_misc/conftest.py
diff --git a/tests/emfit.py → tests_misc/emfit.py b/tests/emfit.py → tests_misc/emfit.py
diff --git a/tests/extra/polar.py → tests_misc/extra/polar.py b/tests/extra/polar.py → tests_misc/extra/polar.py
diff --git a/tests/foursquare.py → tests_misc/foursquare.py b/tests/foursquare.py → tests_misc/foursquare.py
diff --git a/tests/github.py → tests_misc/github.py b/tests/github.py → tests_misc/github.py
diff --git a/tests/goodreads.py → tests_misc/goodreads.py b/tests/goodreads.py → tests_misc/goodreads.py
diff --git a/tests/hypothesis.py → tests_misc/hypothesis.py b/tests/hypothesis.py → tests_misc/hypothesis.py
diff --git a/tests/instapaper.py → tests_misc/instapaper.py b/tests/instapaper.py → tests_misc/instapaper.py
diff --git a/tests/jawbone.py → tests_misc/jawbone.py b/tests/jawbone.py → tests_misc/jawbone.py
diff --git a/tests/lastfm.py → tests_misc/lastfm.py b/tests/lastfm.py → tests_misc/lastfm.py
diff --git a/tests/orgmode.py → tests_misc/orgmode.py b/tests/orgmode.py → tests_misc/orgmode.py
diff --git a/tests/rtm.py → tests_misc/rtm.py b/tests/rtm.py → tests_misc/rtm.py
diff --git a/tests/smscalls.py → tests_misc/smscalls.py b/tests/smscalls.py → tests_misc/smscalls.py
diff --git a/tests/takeout.py → tests_misc/takeout.py b/tests/takeout.py → tests_misc/takeout.py
diff --git a/tests/test_import_warnings.sh → tests_misc/test_import_warnings.sh b/tests/test_import_warnings.sh → tests_misc/test_import_warnings.sh
diff --git a/tests/tweets.py → tests_misc/tweets.py b/tests/tweets.py → tests_misc/tweets.py
diff --git a/tests/youtube.py → tests_misc/youtube.py b/tests/youtube.py → tests_misc/youtube.py
diff --git a/tox.ini b/tox.ini
@@ -30,7 +30,7 @@ uv_seed = true  # seems necessary so uv creates separate venvs per tox env?
 deps =
     -e .[testing]
 commands =
-    {envpython} -m ruff check my/
+    {envpython} -m ruff check src/
 
 
 # just the very core tests with minimal dependencies
@@ -46,7 +46,7 @@ commands =
         # ignore orgmode because it imports orgparse
         # tbh not sure if it even belongs to core, maybe move somewhere else..
         # same with pandas?
-        --ignore my/core/orgmode.py \
+        --ignore src/my/core/orgmode.py \
         {posargs}
 
 
@@ -154,7 +154,7 @@ commands =
         {posargs}
 
     {envpython} -m mypy --no-install-types \
-        tests
+        tests_misc
 
 # note: this comment doesn't seem relevant anymore, but keeping it in case the issue happens again
 # > ugh ... need to reset HOME, otherwise user's site-packages are somehow leaking into mypy's path...