summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/conda-recipe
diff options
context:
space:
mode:
authorTomasKulhanek <tomas.kulhanek@stfc.ac.uk>2018-12-06 14:56:39 +0000
committerTomasKulhanek <tomas.kulhanek@stfc.ac.uk>2018-12-06 14:56:39 +0000
commitc04b85a6fdd8c63e3363c8072cbfe4b97409dc60 (patch)
tree0b12e391692854435319ee72199cfa57908bcff8 /Wrappers/Python/conda-recipe
parentc4d1fccb8fb4a2beaf9b9cfb8e2f38b9cfeac283 (diff)
parent3bce1f1410303a6833d1e647fba9692ea40fa878 (diff)
downloadregularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.gz
regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.bz2
regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.xz
regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'Wrappers/Python/conda-recipe')
-rwxr-xr-xWrappers/Python/conda-recipe/run_test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/conda-recipe/run_test.py b/Wrappers/Python/conda-recipe/run_test.py
index 6ffaca1..499ae7f 100755
--- a/Wrappers/Python/conda-recipe/run_test.py
+++ b/Wrappers/Python/conda-recipe/run_test.py
@@ -2,7 +2,7 @@ import unittest
import numpy as np
import os
import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, DIFF4th
from PIL import Image
class TiffReader(object):