build: change flat-layout to src-layout (issues with editable installs)

DC-analysis · Nov 21, 2023 · 0560198 · 0560198
1 parent 085561c
commit 0560198
Show file tree

Hide file tree

Showing 37 changed files with 4 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,4 +159,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
-dcnum/_version.py
+_version.py
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,7 @@
    issue #15.
  - ref: increment DCNUM_PPID_GENERATION to 7
  - ref: several changes and deprecations in the PPID helper functions
+ - build: change flat-layout to src-layout (issues with editable installs)
 0.14.0
  - fix: protected features (e.g. time, frame) were not included in ouptut
    files when the input file was basin-based

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=46", "setuptools_scm[toml]>=6.2"]
+requires = ["setuptools>=64", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -40,9 +40,6 @@ tracker = "https://github.com/DC-Analysis/dcnum/issues"
 documentation = "https://dcnum.readthedocs.io/en/stable/"
 changelog = "https://dcnum.readthedocs.io/en/stable/sec_changelog.html"
 
-[tool.setuptools]
-packages = ["dcnum"]
-
 [tool.setuptools_scm]
-write_to = "dcnum/_version.py"
+write_to = "src/dcnum/_version.py"
 version_scheme = "post-release"
diff --git a/dcnum/__init__.py → src/dcnum/__init__.py b/dcnum/__init__.py → src/dcnum/__init__.py
diff --git a/dcnum/feat/__init__.py → src/dcnum/feat/__init__.py b/dcnum/feat/__init__.py → src/dcnum/feat/__init__.py
diff --git a/dcnum/feat/event_extractor_manager_thread.py → ...um/feat/event_extractor_manager_thread.py b/dcnum/feat/event_extractor_manager_thread.py → ...um/feat/event_extractor_manager_thread.py
diff --git a/dcnum/feat/feat_background/__init__.py → src/dcnum/feat/feat_background/__init__.py b/dcnum/feat/feat_background/__init__.py → src/dcnum/feat/feat_background/__init__.py
diff --git a/dcnum/feat/feat_background/base.py → src/dcnum/feat/feat_background/base.py b/dcnum/feat/feat_background/base.py → src/dcnum/feat/feat_background/base.py
diff --git a/dcnum/feat/feat_background/bg_roll_median.py → ...um/feat/feat_background/bg_roll_median.py b/dcnum/feat/feat_background/bg_roll_median.py → ...um/feat/feat_background/bg_roll_median.py
diff --git a/.../feat/feat_background/bg_sparse_median.py → .../feat/feat_background/bg_sparse_median.py b/.../feat/feat_background/bg_sparse_median.py → .../feat/feat_background/bg_sparse_median.py
diff --git a/dcnum/feat/feat_brightness/__init__.py → src/dcnum/feat/feat_brightness/__init__.py b/dcnum/feat/feat_brightness/__init__.py → src/dcnum/feat/feat_brightness/__init__.py
diff --git a/dcnum/feat/feat_brightness/bright_all.py → src/dcnum/feat/feat_brightness/bright_all.py b/dcnum/feat/feat_brightness/bright_all.py → src/dcnum/feat/feat_brightness/bright_all.py
diff --git a/dcnum/feat/feat_brightness/common.py → src/dcnum/feat/feat_brightness/common.py b/dcnum/feat/feat_brightness/common.py → src/dcnum/feat/feat_brightness/common.py
diff --git a/dcnum/feat/feat_moments/__init__.py → src/dcnum/feat/feat_moments/__init__.py b/dcnum/feat/feat_moments/__init__.py → src/dcnum/feat/feat_moments/__init__.py
diff --git a/dcnum/feat/feat_moments/ct_opencv.py → src/dcnum/feat/feat_moments/ct_opencv.py b/dcnum/feat/feat_moments/ct_opencv.py → src/dcnum/feat/feat_moments/ct_opencv.py
diff --git a/dcnum/feat/feat_moments/mt_legacy.py → src/dcnum/feat/feat_moments/mt_legacy.py b/dcnum/feat/feat_moments/mt_legacy.py → src/dcnum/feat/feat_moments/mt_legacy.py
diff --git a/dcnum/feat/feat_texture/__init__.py → src/dcnum/feat/feat_texture/__init__.py b/dcnum/feat/feat_texture/__init__.py → src/dcnum/feat/feat_texture/__init__.py
diff --git a/dcnum/feat/feat_texture/common.py → src/dcnum/feat/feat_texture/common.py b/dcnum/feat/feat_texture/common.py → src/dcnum/feat/feat_texture/common.py
diff --git a/dcnum/feat/feat_texture/tex_all.py → src/dcnum/feat/feat_texture/tex_all.py b/dcnum/feat/feat_texture/tex_all.py → src/dcnum/feat/feat_texture/tex_all.py
diff --git a/dcnum/feat/gate.py → src/dcnum/feat/gate.py b/dcnum/feat/gate.py → src/dcnum/feat/gate.py
diff --git a/dcnum/feat/queue_event_extractor.py → src/dcnum/feat/queue_event_extractor.py b/dcnum/feat/queue_event_extractor.py → src/dcnum/feat/queue_event_extractor.py
diff --git a/dcnum/meta/__init__.py → src/dcnum/meta/__init__.py b/dcnum/meta/__init__.py → src/dcnum/meta/__init__.py
diff --git a/dcnum/meta/ppid.py → src/dcnum/meta/ppid.py b/dcnum/meta/ppid.py → src/dcnum/meta/ppid.py
diff --git a/dcnum/read/__init__.py → src/dcnum/read/__init__.py b/dcnum/read/__init__.py → src/dcnum/read/__init__.py
diff --git a/dcnum/read/cache.py → src/dcnum/read/cache.py b/dcnum/read/cache.py → src/dcnum/read/cache.py
diff --git a/dcnum/read/const.py → src/dcnum/read/const.py b/dcnum/read/const.py → src/dcnum/read/const.py
diff --git a/dcnum/read/hdf5_data.py → src/dcnum/read/hdf5_data.py b/dcnum/read/hdf5_data.py → src/dcnum/read/hdf5_data.py
diff --git a/dcnum/segm/__init__.py → src/dcnum/segm/__init__.py b/dcnum/segm/__init__.py → src/dcnum/segm/__init__.py
diff --git a/dcnum/segm/segm_thresh.py → src/dcnum/segm/segm_thresh.py b/dcnum/segm/segm_thresh.py → src/dcnum/segm/segm_thresh.py
diff --git a/dcnum/segm/segmenter.py → src/dcnum/segm/segmenter.py b/dcnum/segm/segmenter.py → src/dcnum/segm/segmenter.py
diff --git a/dcnum/segm/segmenter_cpu.py → src/dcnum/segm/segmenter_cpu.py b/dcnum/segm/segmenter_cpu.py → src/dcnum/segm/segmenter_cpu.py
diff --git a/dcnum/segm/segmenter_gpu.py → src/dcnum/segm/segmenter_gpu.py b/dcnum/segm/segmenter_gpu.py → src/dcnum/segm/segmenter_gpu.py
diff --git a/dcnum/segm/segmenter_manager_thread.py → src/dcnum/segm/segmenter_manager_thread.py b/dcnum/segm/segmenter_manager_thread.py → src/dcnum/segm/segmenter_manager_thread.py
diff --git a/dcnum/write/__init__.py → src/dcnum/write/__init__.py b/dcnum/write/__init__.py → src/dcnum/write/__init__.py
diff --git a/dcnum/write/deque_writer_thread.py → src/dcnum/write/deque_writer_thread.py b/dcnum/write/deque_writer_thread.py → src/dcnum/write/deque_writer_thread.py
diff --git a/dcnum/write/queue_collector_thread.py → src/dcnum/write/queue_collector_thread.py b/dcnum/write/queue_collector_thread.py → src/dcnum/write/queue_collector_thread.py
diff --git a/dcnum/write/writer.py → src/dcnum/write/writer.py b/dcnum/write/writer.py → src/dcnum/write/writer.py