Merge branch 'master' into update-morpho

data/test_n5/0.6.5/images/s3-n5/prospr-6dpf-1-whole-AChE-MED.xml

@@ -27,7 +27,7 @@
     </Timepoints>
     <ImageLoader format="bdv.n5.s3">
       <Key>rawdata/prospr-6dpf-1-whole-AChE-MED.n5</Key>
-      <ServiceEndpoint>https://s3/embl.de</ServiceEndpoint>
+      <ServiceEndpoint>https://s3.embl.de</ServiceEndpoint>
       <BucketName>platybrowser</BucketName>
       <SigningRegion>us-west-2</SigningRegion>
     </ImageLoader>

data/test_n5/0.6.5/images/s3-n5/sbem-6dpf-1-whole-raw.xml

@@ -27,7 +27,7 @@
     </Timepoints>
     <ImageLoader format="bdv.n5.s3">
       <Key>rawdata/sbem-6dpf-1-whole-raw.n5</Key>
-      <ServiceEndpoint>https://s3/embl.de</ServiceEndpoint>
+      <ServiceEndpoint>https://s3.embl.de</ServiceEndpoint>
       <BucketName>platybrowser</BucketName>
       <SigningRegion>us-west-2</SigningRegion>
     </ImageLoader>

data/test_n5/0.6.5/segmentations/s3-n5/sbem-6dpf-1-whole-segmented-cells-labels.xml

@@ -27,7 +27,7 @@
     </Timepoints>
     <ImageLoader format="bdv.n5.s3">
       <Key>0.6.5/segmentations/s3-n5/sbem-6dpf-1-whole-segmented-cells-labels.n5</Key>
-      <ServiceEndpoint>https://s3/embl.de</ServiceEndpoint>
+      <ServiceEndpoint>https://s3.embl.de</ServiceEndpoint>
       <BucketName>platybrowser</BucketName>
       <SigningRegion>us-west-2</SigningRegion>
     </ImageLoader>

scripts/files/for_upload.py

@@ -98,7 +98,7 @@ def make_xml_s3(in_file, out_file, path_in_bucket,
 
     # TODO read this from the s3 config instead
     el = ET.SubElement(imgload, 'ServiceEndpoint')
-    el.text = 'https://s3/embl.de'
+    el.text = 'https://s3.embl.de'
     el = ET.SubElement(imgload, 'BucketName')
     el.text = 'platybrowser'
     el = ET.SubElement(imgload, 'SigningRegion')