Add headsq from VTK-Data as head.mha

* Add head.mha from VTK-Data

* Add head data to setup.py

* Increase to version 22.0.0

README.md

@@ -1 +1,10 @@
-# CIL-data
+# CIL-data
+
+## 24737_fd_normalised.nxs
+For the file 24737_fd_normalised.nxs we acknowledge Diamond Light Source for time on Beamline I13-2 under Proposal mt9396-1.
+The original dataset is available at https://github.com/DiamondLightSource/Savu/blob/master/test_data/data/24737_fd.nxs 
+Here it has been normalised with flat-field and dark-field.
+
+## head.mha
+The file head.mha comes from VTK-Data. The original dataset is available at: https://github.com/open-cv/VTKData/tree/master/Data/headsq.
+Please see the VTKData LICENSE.txt file for the associated license.

VTKData LICENSE.txt

@@ -0,0 +1,34 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit (Data)
+  Module:    Copyright.txt
+
+Copyright (c) 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names
+   of any contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/

recipe/bld.bat

@@ -1,2 +1,4 @@
-cd %RECIPE_DIR%\..
-%PYTHON% setup.py install
+xcopy /e "%RECIPE_DIR%\.." "%SRC_DIR%"
+
+pip install .
+if errorlevel 1 exit 1

recipe/build.sh

@@ -1,2 +1,2 @@
 cd $RECIPE_DIR/..
-$PYTHON setup.py install
+pip install .

recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: cil-data
-  version: 21.3.0
+  version: 22.0.0
 
 build:
   number: 0  

setup.py

@@ -16,16 +16,16 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-from distutils.core import setup
+from setuptools import setup
 import os
 import sys
 
 
-cil_version='21.0.0'
+version='22.0.0'
 
 setup(
     name="cil-data",
-    version=cil_version,
+    version=version,
     data_files = [('share/cil', [ '24737_fd_normalised.nxs',
                                   'boat.tiff',
                                   'camera.png',
@@ -35,7 +35,8 @@
                                   'shapes.png',
                                   'sim_volume.nxs',
                                   'sim_cone_beam.nxs',
-                                  'sim_parallel_beam.nxs'
+                                  'sim_parallel_beam.nxs',
+                                  'head.mha'
                                   ])],
 
     # metadata for upload to PyPI
@@ -47,4 +48,4 @@
     keywords="Dataset",
     url="http://www.ccpi.ac.uk/cil",   # project home page, if any
 
-)
+)