diff options
| author | Picca Frédéric-Emmanuel <picca@debian.org> | 2017-10-07 07:59:01 +0200 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2017-10-07 07:59:01 +0200 |
| commit | bfa4dba15485b4192f8bbe13345e9658c97ecf76 (patch) | |
| tree | fb9c6e5860881fbde902f7cbdbd41dc4a3a9fb5d /silx/__main__.py | |
| parent | f7bdc2acff3c13a6d632c28c4569690ab106eed7 (diff) | |
New upstream version 0.6.0+dfsg
Diffstat (limited to 'silx/__main__.py')
| -rw-r--r-- | silx/__main__.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/silx/__main__.py b/silx/__main__.py index 4c05ef3..8323b03 100644 --- a/silx/__main__.py +++ b/silx/__main__.py @@ -2,7 +2,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2004-2016 European Synchrotron Radiation Facility +# Copyright (c) 2017 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -30,9 +30,9 @@ Your environment should provide a command `silx`. You can reach help with `silx --help`, and check the version with `silx --version`. """ -__authors__ = ["V. Valls"] +__authors__ = ["V. Valls", "P. Knobel"] __license__ = "MIT" -__date__ = "18/04/2017" +__date__ = "29/06/2017" import logging @@ -46,8 +46,8 @@ import silx._version def main(): """Main function of the launcher - This function is referenced in the setup.py file. - Thisfor it is executed by a launcher script generated by setuptools. + This function is referenced in the setup.py file, to create a + launcher script generated by setuptools. :rtype: int :returns: The execution status @@ -56,6 +56,12 @@ def main(): launcher.add_command("view", module_name="silx.app.view", description="Browse a data file with a GUI") + launcher.add_command("convert", + module_name="silx.app.convert", + description="Convert and concatenate files into a HDF5 file") + launcher.add_command("test", + module_name="silx.app.test_", + description="Launch silx unittest") status = launcher.execute(sys.argv) return status |