diff --git a/.travis.yml b/.travis.yml index 4d81da3..112753d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,24 +11,17 @@ env: matrix: include: - python: '3.6' - env: - - EXTRAS="all" - python: '3.7' - env: - - EXTRAS="all" - python: '3.8' - env: - - EXTRAS="pmml, cta" # no 3.8 support for onnx yet before_install: - pip install --upgrade pip - - pip install Cython install: - - pip install ".[$EXTRAS]" + - pip install ".[all]" script: - - python setup.py test + - pytest -v deploy: provider: pypi diff --git a/aict_tools/__init__.py b/aict_tools/__init__.py index 8c308d7..e11448a 100644 --- a/aict_tools/__init__.py +++ b/aict_tools/__init__.py @@ -1 +1 @@ -__version__ = '0.25.0' +__version__ = '0.25.1' diff --git a/aict_tools/scripts/fact_to_dl3.py b/aict_tools/scripts/fact_to_dl3.py index 70139af..dcab038 100644 --- a/aict_tools/scripts/fact_to_dl3.py +++ b/aict_tools/scripts/fact_to_dl3.py @@ -325,7 +325,7 @@ def main( df['disp_prediction'] = disp if source: - obstime = Time(pd.to_datetime(df['timestamp'].values).to_pydatetime()) + obstime = Time(df['timestamp'].to_numpy().astype('U')) source_altaz = concat_results_altaz(parallelize_array_computation( partial(to_altaz, source=source), obstime, @@ -338,8 +338,8 @@ def main( prediction_y, source_altaz.zen.deg, source_altaz.az.deg, - df['pointing_position_zd'].values, - df['pointing_position_az'].values, + df['pointing_position_zd'].to_numpy(), + df['pointing_position_az'].to_numpy(), obstime, n_jobs=n_jobs, ) @@ -358,13 +358,13 @@ def main( calc_source_features_sim, prediction_x, prediction_y, - df['source_position_zd'].values, - df['source_position_az'].values, - df['pointing_position_zd'].values, - df['pointing_position_az'].values, - df['cog_x'].values, - df['cog_y'].values, - df['delta'].values, + df['source_position_zd'].to_numpy(), + df['source_position_az'].to_numpy(), + df['pointing_position_zd'].to_numpy(), + df['pointing_position_az'].to_numpy(), + df['cog_x'].to_numpy(), + df['cog_y'].to_numpy(), + df['delta'].to_numpy(), project_disp=config.disp.project_disp, n_jobs=n_jobs, ) diff --git a/setup.py b/setup.py index 3a7a097..a2fb071 100644 --- a/setup.py +++ b/setup.py @@ -11,11 +11,12 @@ extras_require = { 'pmml': [ - 'sklearn2pmml<0.57', + 'sklearn2pmml>=0.66', 'jpmml_evaluator>=0.2.2', ], 'onnx': ['skl2onnx', 'onnxmltools', 'onnxruntime~=1.0'], 'cta': ['ctapipe'], + 'tests': ['pytest', 'pytest-runner'], } extras_require['all'] = list({dep for deps in extras_require.values() for dep in deps})