Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tomotools
nxtomomill
Commits
92ecf376
Commit
92ecf376
authored
Dec 16, 2020
by
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
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.rst
View file @
92ecf376
...
...
@@ -2,7 +2,7 @@ Change Log
==========
0.4.0: 2020/1
1/09
0.4.0: 2020/1
2/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
View file @
92ecf376
...
...
@@ -42,6 +42,7 @@ H5_VALID_CAMERA_NAMES = None
H5_ROT_ANGLE_KEYS
=
(
"rotm"
,
"mhsrot"
,
"hsrot"
,
"mrsrot"
,
"hrsrot"
,
...
...
nxtomomill/version.py
View file @
92ecf376
...
...
@@ -77,9 +77,9 @@ RELEASE_LEVEL_VALUE = {
MAJOR
=
0
MINOR
=
4
MICRO
=
0
RELEV
=
"
rc
"
# <16
SERIAL
=
1
0
# <16
MICRO
=
1
RELEV
=
"
final
"
# <16
SERIAL
=
0
# <16
date
=
__date__
...
...
requirements.txt
View file @
92ecf376
h5py
>=3
silx
>=0.14
a
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
View file @
92ecf376
...
...
@@ -204,9 +204,9 @@ def get_project_configuration(dry_run):
# for the script launcher and pkg_resources
"setuptools"
,
"numpy"
,
"silx >= 0.14
a
"
,
"silx >= 0.14"
,
"h5py >= 3.0"
,
"tomoscan >= 0.
3.2
"
,
"tomoscan >= 0.
4
"
,
]
setup_requires
=
[
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment