Commit 81dac616 authored by payno's avatar payno
Browse files

Merge branch 'bugfixes' into 'master'


See merge request !4
parents 6115cbd9 297db489
Pipeline #15513 passed with stages
in 1 minute and 35 seconds
......@@ -404,7 +404,8 @@ def get_project_configuration(dry_run):
# for io support
setup_requires = ["setuptools",]
......@@ -33,10 +33,10 @@ import tempfile
import numpy
import fabio.edfimage
from tomoscan.test.utils import UtilsTest
from ..mock import MockEDF
from ..edfscan import EDFTomoScan
from ...scanbase import TomoScanBase
from ...scanfactory import ScanFactory
from tomoscan.esrf.mock import MockEDF
from tomoscan.esrf.edfscan import EDFTomoScan
from tomoscan.scanbase import TomoScanBase
from tomoscan.scanfactory import ScanFactory
import collections
import json
import shutil
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment