Merge branch '0.4' of https://gitlab.esrf.fr/tomotools/nxtomomill into 0.4

CHANGELOG.rst

@@ -2,7 +2,7 @@ Change Log
 ==========
 
 
-0.4.0: 2020/11/09
+0.4.0: 2020/12/15
 -----------------
 
 * requires h5py >= 3
@@ -21,7 +21,7 @@ Change Log
 
 * app:
     * add patch-nx application to modify an existing `NXTomo`
-        * add dark or flat series
+        * add dark or flat series (embed data by default)
         * modify frame type
     * tomoh52nx:
         * warning if we try to convert a file containing some `NXTomo` entry

nxtomomill/settings.py

@@ -42,6 +42,7 @@ H5_VALID_CAMERA_NAMES = None
 
 H5_ROT_ANGLE_KEYS = (
     "rotm",
+    "mhsrot",
     "hsrot",
     "mrsrot",
     "hrsrot",

nxtomomill/version.py

@@ -77,9 +77,9 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 0
 MINOR = 4
-MICRO = 0
-RELEV = "rc"  # <16
-SERIAL = 10  # <16
+MICRO = 1
+RELEV = "final"  # <16
+SERIAL = 0  # <16
 
 date = __date__
 

requirements.txt

 h5py>=3
-silx>=0.14a
+silx>=0.14
 numpy
 fabio
-tomoscan >= 0.4a
\ No newline at end of file
+tomoscan >= 0.4
\ No newline at end of file

setup.py

@@ -204,9 +204,9 @@ def get_project_configuration(dry_run):
         # for the script launcher and pkg_resources
         "setuptools",
         "numpy",
-        "silx >= 0.14a",
+        "silx >= 0.14",
         "h5py >= 3.0",
-        "tomoscan >= 0.3.2",
+        "tomoscan >= 0.4",
     ]
 
     setup_requires = [