From aecb747a50b931ddf498ef85a1bbd3c17c9130a4 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Mon, 30 Jan 2023 19:20:12 -0500
Subject: [PATCH] dev-python/tridesclous: version bump 1.6.6

Signed-off-by: Horea Christian <chr@chymera.eu>
---
 .../tridesclous/tridesclous-1.6.6.ebuild      | 74 ++++++++++++++-----
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/dev-python/tridesclous/tridesclous-1.6.6.ebuild b/dev-python/tridesclous/tridesclous-1.6.6.ebuild
index 63e2c91..d88dd29 100644
--- a/dev-python/tridesclous/tridesclous-1.6.6.ebuild
+++ b/dev-python/tridesclous/tridesclous-1.6.6.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-1.24.0[${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