From f29f4a709add154191f30da23d778c324d1503de Mon Sep 17 00:00:00 2001 From: zerafachris PERSONAL Date: Sun, 28 Apr 2024 22:08:07 +0200 Subject: [PATCH] reoder contents for scatcluster package discovery --- .gitignore | 1 + {src => scatcluster}/__init__.py | 0 {src/scatcluster => scatcluster/analysis}/__init__.py | 0 {src/scatcluster => scatcluster}/analysis/crosstab.py | 0 {src/scatcluster => scatcluster}/analysis/dendrogram.py | 0 .../analysis/external_correlation.py | 0 {src/scatcluster => scatcluster}/analysis/predictions.py | 0 {src/scatcluster => scatcluster}/analysis/processing.py | 0 .../analysis/waveform_correlations.py | 0 {src/scatcluster => scatcluster}/analysis/waveforms.py | 0 .../getting_started/01_processing_01_set_config.ipynb | 0 .../01_processing_02_processing_workflow.ipynb | 0 .../02_visualisation_01_dendrograms_waveforms.ipynb | 0 .../03_analysis_01_timewindow_cluster_comparison.ipynb | 0 {src/scatcluster => scatcluster}/helper.py | 0 .../analysis => scatcluster/processing}/__init__.py | 0 {src/scatcluster => scatcluster}/processing/ica.py | 0 {src/scatcluster => scatcluster}/processing/scattering.py | 0 {src/scatcluster => scatcluster}/scatcluster.py | 0 {src/scatcluster => scatcluster}/structure.py | 0 setup.py | 4 ++-- src/scatcluster/processing/__init__.py | 0 22 files changed, 3 insertions(+), 2 deletions(-) rename {src => scatcluster}/__init__.py (100%) rename {src/scatcluster => scatcluster/analysis}/__init__.py (100%) rename {src/scatcluster => scatcluster}/analysis/crosstab.py (100%) rename {src/scatcluster => scatcluster}/analysis/dendrogram.py (100%) rename {src/scatcluster => scatcluster}/analysis/external_correlation.py (100%) rename {src/scatcluster => scatcluster}/analysis/predictions.py (100%) rename {src/scatcluster => scatcluster}/analysis/processing.py (100%) rename {src/scatcluster => scatcluster}/analysis/waveform_correlations.py (100%) rename {src/scatcluster => scatcluster}/analysis/waveforms.py (100%) rename {src => scatcluster}/getting_started/01_processing_01_set_config.ipynb (100%) rename {src => scatcluster}/getting_started/01_processing_02_processing_workflow.ipynb (100%) rename {src => scatcluster}/getting_started/02_visualisation_01_dendrograms_waveforms.ipynb (100%) rename {src => scatcluster}/getting_started/03_analysis_01_timewindow_cluster_comparison.ipynb (100%) rename {src/scatcluster => scatcluster}/helper.py (100%) rename {src/scatcluster/analysis => scatcluster/processing}/__init__.py (100%) rename {src/scatcluster => scatcluster}/processing/ica.py (100%) rename {src/scatcluster => scatcluster}/processing/scattering.py (100%) rename {src/scatcluster => scatcluster}/scatcluster.py (100%) rename {src/scatcluster => scatcluster}/structure.py (100%) delete mode 100644 src/scatcluster/processing/__init__.py diff --git a/.gitignore b/.gitignore index cf158fd..54c75ec 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ pre-commit-hooks .pypirc dist src/scatcluster.egg-info +.idea \ No newline at end of file diff --git a/src/__init__.py b/scatcluster/__init__.py similarity index 100% rename from src/__init__.py rename to scatcluster/__init__.py diff --git a/src/scatcluster/__init__.py b/scatcluster/analysis/__init__.py similarity index 100% rename from src/scatcluster/__init__.py rename to scatcluster/analysis/__init__.py diff --git a/src/scatcluster/analysis/crosstab.py b/scatcluster/analysis/crosstab.py similarity index 100% rename from src/scatcluster/analysis/crosstab.py rename to scatcluster/analysis/crosstab.py diff --git a/src/scatcluster/analysis/dendrogram.py b/scatcluster/analysis/dendrogram.py similarity index 100% rename from src/scatcluster/analysis/dendrogram.py rename to scatcluster/analysis/dendrogram.py diff --git a/src/scatcluster/analysis/external_correlation.py b/scatcluster/analysis/external_correlation.py similarity index 100% rename from src/scatcluster/analysis/external_correlation.py rename to scatcluster/analysis/external_correlation.py diff --git a/src/scatcluster/analysis/predictions.py b/scatcluster/analysis/predictions.py similarity index 100% rename from src/scatcluster/analysis/predictions.py rename to scatcluster/analysis/predictions.py diff --git a/src/scatcluster/analysis/processing.py b/scatcluster/analysis/processing.py similarity index 100% rename from src/scatcluster/analysis/processing.py rename to scatcluster/analysis/processing.py diff --git a/src/scatcluster/analysis/waveform_correlations.py b/scatcluster/analysis/waveform_correlations.py similarity index 100% rename from src/scatcluster/analysis/waveform_correlations.py rename to scatcluster/analysis/waveform_correlations.py diff --git a/src/scatcluster/analysis/waveforms.py b/scatcluster/analysis/waveforms.py similarity index 100% rename from src/scatcluster/analysis/waveforms.py rename to scatcluster/analysis/waveforms.py diff --git a/src/getting_started/01_processing_01_set_config.ipynb b/scatcluster/getting_started/01_processing_01_set_config.ipynb similarity index 100% rename from src/getting_started/01_processing_01_set_config.ipynb rename to scatcluster/getting_started/01_processing_01_set_config.ipynb diff --git a/src/getting_started/01_processing_02_processing_workflow.ipynb b/scatcluster/getting_started/01_processing_02_processing_workflow.ipynb similarity index 100% rename from src/getting_started/01_processing_02_processing_workflow.ipynb rename to scatcluster/getting_started/01_processing_02_processing_workflow.ipynb diff --git a/src/getting_started/02_visualisation_01_dendrograms_waveforms.ipynb b/scatcluster/getting_started/02_visualisation_01_dendrograms_waveforms.ipynb similarity index 100% rename from src/getting_started/02_visualisation_01_dendrograms_waveforms.ipynb rename to scatcluster/getting_started/02_visualisation_01_dendrograms_waveforms.ipynb diff --git a/src/getting_started/03_analysis_01_timewindow_cluster_comparison.ipynb b/scatcluster/getting_started/03_analysis_01_timewindow_cluster_comparison.ipynb similarity index 100% rename from src/getting_started/03_analysis_01_timewindow_cluster_comparison.ipynb rename to scatcluster/getting_started/03_analysis_01_timewindow_cluster_comparison.ipynb diff --git a/src/scatcluster/helper.py b/scatcluster/helper.py similarity index 100% rename from src/scatcluster/helper.py rename to scatcluster/helper.py diff --git a/src/scatcluster/analysis/__init__.py b/scatcluster/processing/__init__.py similarity index 100% rename from src/scatcluster/analysis/__init__.py rename to scatcluster/processing/__init__.py diff --git a/src/scatcluster/processing/ica.py b/scatcluster/processing/ica.py similarity index 100% rename from src/scatcluster/processing/ica.py rename to scatcluster/processing/ica.py diff --git a/src/scatcluster/processing/scattering.py b/scatcluster/processing/scattering.py similarity index 100% rename from src/scatcluster/processing/scattering.py rename to scatcluster/processing/scattering.py diff --git a/src/scatcluster/scatcluster.py b/scatcluster/scatcluster.py similarity index 100% rename from src/scatcluster/scatcluster.py rename to scatcluster/scatcluster.py diff --git a/src/scatcluster/structure.py b/scatcluster/structure.py similarity index 100% rename from src/scatcluster/structure.py rename to scatcluster/structure.py diff --git a/setup.py b/setup.py index eedea40..bd29ff1 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ long_description_content_type='text/markdown', python_requires=REQUIRES_PYTHON, url=URL, - packages=find_packages('.'), - package_data={NAME: ['py.typed']}, + packages=find_packages(where='.'), + package_data={NAME: ['scatcluster/*.py']}, include_package_data=True, install_requires=REQUIRED, extras_require={'gpu': [*REQUIRED, *REQUIRED_GPU]}, diff --git a/src/scatcluster/processing/__init__.py b/src/scatcluster/processing/__init__.py deleted file mode 100644 index e69de29..0000000