From 1fc0a4069d6f5e84069ec7270f26200250c5c42f Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Mon, 30 Jan 2023 19:56:57 -0500
Subject: [PATCH] dev-python/tridesclous: updated tests and dependencies

Signed-off-by: Horea Christian <chr@chymera.eu>
---
 dev-python/tridesclous/Manifest               |  4 +-
 .../tridesclous/tridesclous-1.6.4.ebuild      | 74 ++++++++++++++-----
 2 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/dev-python/tridesclous/Manifest b/dev-python/tridesclous/Manifest
index 6dcdb8e..42d7c86 100644
--- a/dev-python/tridesclous/Manifest
+++ b/dev-python/tridesclous/Manifest
@@ -1,2 +1,2 @@
-DIST tridesclous-1.6.4.tar.gz 11798060 BLAKE2B 05603bc789ea53eed8bf5a40674975b754c9375cd1b80a470c07089c988b9c3d8822747a0c73d3c4a375c6663190d15492e4e59c0fdeaac48beee66ee2b4fabf SHA512 afb50bbbe51fa57fbe7479576c8bebefbd56d8bc135ec38362cdf8b9e51cb4da990d7262e653a9636b1a7b8e45d4f9c4700a37884a235958978b75b968be2a19
-DIST tridesclous-1.6.6.tar.gz 11798502 BLAKE2B af9eb4d4e899f2a065d37e6daaae9ad04209b3d10c250957985ef3603e5d5727947dafff75adf5bb892a4ccbbf2f575f682bd601afcf36bda48f5f7a2af6ab26 SHA512 b101a8a8c2e95b7eb51b7d24d2708a30421be63d48d5a7047dfa2be3ce0f15ce02ce518d5516d5fae3d040cb0d2037a49afd34fdbd03bc641dc42014d8861d0d
+DIST tridesclous-1.6.4.tar.gz 11796133 BLAKE2B a720cf574f4eea2ee0750e6b752aeb8ebc35eea978e5c1d5eabbe6f8e6a6e3cd287ec9005767f6466b648f349c3838e211dd377b4f8ca4034d48009ff97ca102 SHA512 13740c26f3f99ecd3eb3b4888e5bc03a2686458128d1f29c53ac8b771ffe8d9e110a5f55b2937279caf2bb9ab053ff30b56c8a0480539a7335cd2a215a42c5bc
+DIST tridesclous-1.6.6.tar.gz 11796524 BLAKE2B 1dfacb6824e2cc7e209ad43e14964f0aa885580944e38f160df2b38896f2573209728de3128c1d60b2ace1d1b72929937d6fb48e1670b8659b18d7fbdbbbd665 SHA512 71691eef6da07d7847054b11fbd7dc283e71f03d2e75645d30890900225060efdcabf671168311aa967d5fc2cb79285c69e2052cdf744085dc9e0fac0318fa30
diff --git a/dev-python/tridesclous/tridesclous-1.6.4.ebuild b/dev-python/tridesclous/tridesclous-1.6.4.ebuild
index 0e18ed5..d88dd29 100644
--- a/dev-python/tridesclous/tridesclous-1.6.4.ebuild
+++ b/dev-python/tridesclous/tridesclous-1.6.4.ebuild
@@ -14,29 +14,25 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gui test"
-RESTRICT="test"
-# Tests fail, reported upstream
-# https://github.com/tridesclous/tridesclous/issues/175
 
 RDEPEND="
+	<dev-python/numpy-1.24.0[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/hdbscan[${PYTHON_USEDEP}]
 	dev-python/loky[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/neo[${PYTHON_USEDEP}]
 	dev-python/numba
-	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/openpyxl[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/seaborn[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	sci-libs/scikit-learn[${PYTHON_USEDEP}]
 	gui? (
 		dev-python/PyQt5[${PYTHON_USEDEP}]
 	)
 "
-# Technically also seaborn:
-# dev-python/seaborn[${PYTHON_USEDEP}]
 DEPEND="
 	test? (
 		${RDEPEND}
@@ -45,22 +41,64 @@ DEPEND="
 
 distutils_enable_tests pytest
 
+# Network sandboxing, this is sadly more than half the test suite :(
+EPYTEST_DESELECT=(
+	tridesclous/tests/test_cleancluster.py::test_auto_split
+	tridesclous/tests/test_cleancluster.py::test_trash_not_aligned
+	tridesclous/tests/test_cleancluster.py::test_auto_merge
+	tridesclous/tests/test_cleancluster.py::test_trash_low_extremum
+	tridesclous/tests/test_cleancluster.py::test_trash_small_cluster
+	tridesclous/tests/test_cluster.py::test_sawchaincut
+	tridesclous/tests/test_cluster.py::test_pruningshears
+	tridesclous/tests/test_decomposition.py::test_all_decomposition
+	tridesclous/tests/test_export.py::test_export
+	tridesclous/tests/test_export.py::test_export_catalogue_spikes
+	tridesclous/tests/test_jobtools.py::test_run_parallel_signalprocessor
+	tridesclous/tests/test_matplotlibplot.py::test_plot_probe_geometry
+	tridesclous/tests/test_matplotlibplot.py::test_plot_signals
+	tridesclous/tests/test_matplotlibplot.py::test_plot_waveforms_with_geometry
+	tridesclous/tests/test_matplotlibplot.py::test_plot_waveforms
+	tridesclous/tests/test_matplotlibplot.py::test_plot_features_scatter_2d
+	tridesclous/tests/test_metrics.py::test_all_metrics
+	tridesclous/tests/test_metrics.py::test_cluster_ratio
+	tridesclous/tests/test_peeler.py::test_peeler_geometry
+	tridesclous/tests/test_peeler.py::test_peeler_geometry_cl
+	tridesclous/tests/test_peeler.py::test_peeler_empty_catalogue
+	tridesclous/tests/test_peeler.py::test_peeler_several_chunksize
+	tridesclous/tests/test_peeler.py::test_peeler_with_and_without_preprocessor
+	tridesclous/tests/test_peeler.py::test_export_spikes
+	tridesclous/tests/test_report.py::test_summary_catalogue_clusters
+	tridesclous/tests/test_report.py::test_summary_noise
+	tridesclous/tests/test_report.py::test_summary_after_peeler_clusters
+	tridesclous/tests/test_report.py::test_generate_report
+	tridesclous/tests/test_autoparams.py::test_get_auto_params
+	tridesclous/tests/test_catalogueconstructor.py::test_catalogue_constructor
+	tridesclous/tests/test_catalogueconstructor.py::test_make_catalogue
+	tridesclous/tests/test_catalogueconstructor.py::test_ratio_amplitude
+	tridesclous/tests/test_catalogueconstructor.py::test_create_savepoint_catalogue_constructor
+	tridesclous/tests/test_catalogueconstructor.py::test_feature_with_lda_selection
+	tridesclous/tests/test_cataloguetools.py::test_apply_all_catalogue_steps
+	tridesclous/tests/test_dataio.py::test_DataIO
+	tridesclous/tests/test_dataio.py::test_DataIO_probes
+	tridesclous/tests/test_datasets.py::test_download_dataset
+	tridesclous/tests/test_datasets.py::test_get_dataset
+	tridesclous/tests/test_datasource.py::test_RawDataSource
+	tridesclous/tests/test_datasource.py::test_NeoRawIOAggregator
+	tridesclous/tests/test_peakdetector.py::test_compare_offline_online_engines
+	tridesclous/tests/test_peakdetector.py::test_detect_geometrical_peaks
+	tridesclous/tests/test_peakdetector.py::test_peak_sign_symetry
+	tridesclous/tests/test_signalpreprocessor.py::test_compare_offline_online_engines
+	tridesclous/tests/test_signalpreprocessor.py::test_auto_pad_width
+	tridesclous/tests/test_tools.py::test_fix_prb_file_py2
+)
+
 python_test() {
 	local EPYTEST_IGNORE=(
-		tridesclous/online/tests/test_launcher.py
-		tridesclous/online/tests/test_onlinepeeler.py
-		tridesclous/online/tests/test_onlinewindow.py
+		tridesclous/online/tests/*
 	)
 	if use !gui ; then
-		EPYTEST_IGNORE+=(
-			tridesclous/gui/test_gpuselector.py
-			tridesclous/gui/icons/test_ressources.py
-			tridesclous/gui/tests/test_cataloguewindow.py
-			tridesclous/gui/tests/test_gui_tools.py
-			tridesclous/gui/tests/test_initializedatasetwindow.py
-			tridesclous/gui/tests/test_mainwindow.py
-			tridesclous/gui/tests/test_peelerwindow.py
-			tridesclous/gui/tests/test_probegeometryview.py
+		local EPYTEST_IGNORE+=(
+			tridesclous/gui/*
 		)
 	fi
 	epytest