From 3b09dd062e44d32bda9ee1468a89a8ff7f73b99b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 11 Aug 2024 09:53:11 -0400 Subject: [PATCH 1/2] Try to enable the windows tests again --- ci/build_windows.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/build_windows.bat b/ci/build_windows.bat index 612571a5a..115ae78cc 100644 --- a/ci/build_windows.bat +++ b/ci/build_windows.bat @@ -14,7 +14,7 @@ call conda create ^ --name vigra ^ python=%PYTHON_VERSION% pytest c-compiler cxx-compiler ^ zlib libjpeg-turbo libpng libtiff hdf5 fftw cmake ninja ^ - boost=1.78 boost-cpp=1.78 numpy h5py sphinx ^ + boost boost-cpp numpy h5py sphinx ^ openexr lemon if errorlevel 1 exit 1 @@ -44,8 +44,8 @@ if errorlevel 1 exit 1 nmake if errorlevel 1 exit 1 -:REM nmake check -:REM if errorlevel 1 exit 1 -:REM -:REM ctest -V -:REM if errorlevel 1 exit 1 +nmake check +if errorlevel 1 exit 1 + +ctest -V +if errorlevel 1 exit 1 From c279cdca573a739caf47921e0dfdbfe3d25edfab Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 28 Aug 2024 21:57:52 -0400 Subject: [PATCH 2/2] lint --- vigranumpy/examples/VigraGraphs.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vigranumpy/examples/VigraGraphs.ipynb b/vigranumpy/examples/VigraGraphs.ipynb index 3dab89873..b6d81c391 100644 --- a/vigranumpy/examples/VigraGraphs.ipynb +++ b/vigranumpy/examples/VigraGraphs.ipynb @@ -103,7 +103,7 @@ ], "source": [ "# compute gradient on interpolated image\n", - "sigmaGradMag = 2.0 \n", + "sigmaGradMag = 2.0\n", "imgLabBig = vigra.resize(imgLab, [imgLab.shape[0]*2-1, imgLab.shape[1]*2-1])\n", "gradMag = vigra.filters.gaussianGradientMagnitude(imgLabBig, sigmaGradMag)\n", "vigra.imshow(gradMag,show=False)\n", @@ -326,7 +326,7 @@ "labels = graphs.agglomerativeClustering(graph=rag, edgeWeights=edgeWeights,\n", " beta=beta, nodeFeatures=nodeFeatures,\n", " nodeNumStop=nodeNumStop)\n", - "# show result \n", + "# show result\n", "imgLabels =rag.projectLabelsToBaseGraph(labels)\n", "cmap = matplotlib.colors.ListedColormap ( numpy.random.rand ( 256,3))\n", "pylab.imshow ( imgLabels.squeeze().swapaxes(0,1), cmap = cmap)\n",