Tidy up

Former-commit-id: 3360efaa

.gitlab-ci.yml

@@ -35,8 +35,6 @@ download_data:
     - wget -q www.astron.nl/citt/ci_data/prefactor/$TEST_HBA_DATASET_NAME -O $TEST_HBA_DATASET_NAME && tar xfz $TEST_HBA_DATASET_NAME && rm -f $TEST_HBA_DATASET_NAME
     - wget -q www.astron.nl/citt/ci_data/prefactor/$CALIBRATOR_HBA_RESULTS_NAME -O $CALIBRATOR_HBA_RESULTS_NAME && tar xfz $CALIBRATOR_HBA_RESULTS_NAME && rm -f $CALIBRATOR_HBA_RESULTS_NAME
     - wget -q www.astron.nl/citt/ci_data/prefactor/$TARGET_HBA_RESULTS_NAME -O $TARGET_HBA_RESULTS_NAME && tar xfz $TARGET_HBA_RESULTS_NAME && rm -f $TARGET_HBA_RESULTS_NAME
-    - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/example.h5 -O example.h5
-    - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/A-Team_lowres.sourcedb -O A-Team_lowres.sourcedb
   artifacts:
     paths:
     - data

Docker/Dockerfile

@@ -86,7 +86,7 @@ RUN \
 # currently a bug in the solver in the master branch. Once this is
 # solved we should again use master, and the clone cmd should be changed
 # back to:
-#  git clone https://git.astron.nl/RD/DP3.git --depth 1 && \
+#  git clone https://git.astron.nl/RD/DP3.git --depth 1 && 
 RUN \
   git clone https://git.astron.nl/RD/DP3.git && \
   cd DP3 && git checkout 1eadf43fee5ac76f48611fdd1fd464ebda8c0b6d && cd .. && \
@@ -209,7 +209,7 @@ RUN \
   python3 -m pip install cwltool cwl-runner && \
   \
 # Install Prefactor
-  git clone https://github.com/lofar-astron/prefactor.git ${PREFACTOR_NAME} --branch ${PREFACTOR_VERSION} --depth 1 && \
+  git clone https://git.astron.nl/eosc/prefactor3-cwl.git ${PREFACTOR_NAME} --branch ${PREFACTOR_VERSION} --depth 1 && \
   cd ${PREFACTOR_NAME} && \
   pip3 install --upgrade $PWD && \
   cd .. && \

Docker/losoto.patch

----  /src/losoto/losoto/operations/__init__.py      2019-11-07 12:43:46.220577945 +0000
-+++  /src/losoto/losoto/operations/__init__.py      2019-11-07 12:43:34.401765786 +0000
-@@ -2,8 +2,7 @@
- 
- __all__ = [ os.path.basename(f)[:-3] for f in glob.glob(os.path.dirname(__file__)+"/*.py") if f[0] != '_']
- 
--for x in __all__:
--    __import__(x, locals(), globals())
-+from . import *
- 
- class Timer(object):
-     """
-

Docker/test_data/L570745_SB001_uv_CORRECTED_DATA.MS/ANTENNA/table.info

-Type = 
-SubType = 
-

Docker/test_data/L570745_SB001_uv_CORRECTED_DATA.MS/DATA_DESCRIPTION/table.info

-Type = 
-SubType = 
-

Docker/test_data/L570745_SB001_uv_CORRECTED_DATA.MS/FEED/table.info

-Type = 
-SubType = 
-