Commit 92ecf376 authored by payno's avatar payno
Browse files

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

parents 1c8921e4 32f9d276
Pipeline #39241 passed with stages
in 4 minutes and 57 seconds
...@@ -2,7 +2,7 @@ Change Log ...@@ -2,7 +2,7 @@ Change Log
========== ==========
0.4.0: 2020/11/09 0.4.0: 2020/12/15
----------------- -----------------
* requires h5py >= 3 * requires h5py >= 3
...@@ -21,7 +21,7 @@ Change Log ...@@ -21,7 +21,7 @@ Change Log
* app: * app:
* add patch-nx application to modify an existing `NXTomo` * 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 * modify frame type
* tomoh52nx: * tomoh52nx:
* warning if we try to convert a file containing some `NXTomo` entry * warning if we try to convert a file containing some `NXTomo` entry
......
...@@ -42,6 +42,7 @@ H5_VALID_CAMERA_NAMES = None ...@@ -42,6 +42,7 @@ H5_VALID_CAMERA_NAMES = None
H5_ROT_ANGLE_KEYS = ( H5_ROT_ANGLE_KEYS = (
"rotm", "rotm",
"mhsrot",
"hsrot", "hsrot",
"mrsrot", "mrsrot",
"hrsrot", "hrsrot",
......
...@@ -77,9 +77,9 @@ RELEASE_LEVEL_VALUE = { ...@@ -77,9 +77,9 @@ RELEASE_LEVEL_VALUE = {
MAJOR = 0 MAJOR = 0
MINOR = 4 MINOR = 4
MICRO = 0 MICRO = 1
RELEV = "rc" # <16 RELEV = "final" # <16
SERIAL = 10 # <16 SERIAL = 0 # <16
date = __date__ date = __date__
......
h5py>=3 h5py>=3
silx>=0.14a silx>=0.14
numpy numpy
fabio fabio
tomoscan >= 0.4a tomoscan >= 0.4
\ No newline at end of file \ No newline at end of file
...@@ -204,9 +204,9 @@ def get_project_configuration(dry_run): ...@@ -204,9 +204,9 @@ def get_project_configuration(dry_run):
# for the script launcher and pkg_resources # for the script launcher and pkg_resources
"setuptools", "setuptools",
"numpy", "numpy",
"silx >= 0.14a", "silx >= 0.14",
"h5py >= 3.0", "h5py >= 3.0",
"tomoscan >= 0.3.2", "tomoscan >= 0.4",
] ]
setup_requires = [ setup_requires = [
......
Supports Markdown
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