Fri, 17 Feb 2017 13:19:22 +0200
Removed color output from command line.
--- a/.hgignore Thu Feb 16 17:21:25 2017 +0200 +++ b/.hgignore Fri Feb 17 13:19:22 2017 +0200 @@ -8,3 +8,4 @@ re:^atmospheric_lidar\.egg-info/ *.nc re:^atmospheric_lidar_reader\.egg-info/ +re:^build/
--- a/atmospheric_lidar/__init__.py Thu Feb 16 17:21:25 2017 +0200 +++ b/atmospheric_lidar/__init__.py Fri Feb 17 13:19:22 2017 +0200 @@ -1,1 +1,1 @@ -__version__ = '0.2.1' \ No newline at end of file +__version__ = '0.2.7' \ No newline at end of file
--- a/atmospheric_lidar/rali_netcdf_parameters.py Thu Feb 16 17:21:25 2017 +0200 +++ b/atmospheric_lidar/rali_netcdf_parameters.py Fri Feb 17 13:19:22 2017 +0200 @@ -4,7 +4,8 @@ 'Molecular_Calc': 0, 'Latitude_degrees_north': 44.348, 'Longitude_degrees_east': 26.029, - 'Altitude_meter_asl': 93.0} # This should be float + 'Altitude_meter_asl': 93.0, + 'Call sign': 'bu', } # This should be float channel_parameters = \ {'01064.o_an': {'channel_ID': 89,
--- a/atmospheric_lidar/scripts/licel2scc.py Thu Feb 16 17:21:25 2017 +0200 +++ b/atmospheric_lidar/scripts/licel2scc.py Fri Feb 17 13:19:22 2017 +0200 @@ -7,7 +7,6 @@ import os import sys -import coloredlogs from ..licel import LicelLidarMeasurement @@ -59,7 +58,8 @@ The file should contain python code.""" if not os.path.isfile(settings_path): - raise IOError("The provided settings path does not correspond to a file.") + logging.error("The provided settings path does not correspond to a file.") + sys.exit(1) dirname, basename = os.path.split(settings_path) sys.path.append(dirname) @@ -100,10 +100,10 @@ args = parser.parse_args() # Get the logger with the appropriate level - #logging.basicConfig(format='%(levelname)s: %(message)s', level=args.loglevel) + logging.basicConfig(format='%(levelname)s: %(message)s', level=args.loglevel) logger = logging.getLogger(__name__) - coloredlogs.install(fmt='%(levelname)s: %(message)s', level=args.loglevel) + #coloredlogs.install(fmt='%(levelname)s: %(message)s', level=args.loglevel) # Get a list of files to convert search_str = os.path.join(args.directory, args.search_string)
--- a/readme.rst Thu Feb 16 17:21:25 2017 +0200 +++ b/readme.rst Fri Feb 17 13:19:22 2017 +0200 @@ -119,7 +119,6 @@ You can specify the standard values by overriding your system's ``get_PT`` method: .. code-block:: python - :caption: cf_lidar.py from licel import LicelLidarMeasurement import cf_netcdf_parameters
--- a/setup.py Thu Feb 16 17:21:25 2017 +0200 +++ b/setup.py Fri Feb 17 13:19:22 2017 +0200 @@ -48,12 +48,10 @@ ], keywords='lidar aerosol licel SCC', install_requires=[ + "netCDF4", "numpy", "matplotlib", "sphinx", - "pytest", - "netcdf4", - "coloredlogs", ], entry_points={ 'console_scripts': ['licel2scc = atmospheric_lidar.scripts.licel2scc:main'],