Skip to content

Commit

Permalink
Merge pull request #337 from EducationalTestingService/release/1.3
Browse files Browse the repository at this point in the history
v1.3 release
  • Loading branch information
desilinguist committed Feb 13, 2017
2 parents f1dff5d + 59101aa commit df60bfa
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conda-recipe/skll/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: skll
version: 1.2.1
version: 1.3

source:
path: ../../../skll
Expand Down
6 changes: 3 additions & 3 deletions doc/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Installation
============
SKLL can easily be installed via pip::
SKLL can be installed via ``pip`` for any Python version::

pip install skll

or via conda::
or via ``conda`` (only for Python 3.4)::

conda install -c desilinguist skll
conda install -c desilinguist python=3.4 skll

It can also be downloaded directly from
`GitHub <http://github.com/EducationalTestingService/skll>`_.
Expand Down
2 changes: 1 addition & 1 deletion doc/run_experiment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ SVC
.. code-block:: python
[{'C': [0.01, 0.1, 1.0, 10.0, 100.0],
'gamma': [0.01, 0.1, 1.0, 10.0, 100.0]}]
'gamma': ['auto', 0.01, 0.1, 1.0, 10.0, 100.0]}]
SVR
.. code-block:: python
Expand Down
4 changes: 4 additions & 0 deletions skll/experiments.py
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,10 @@ def run_configuration(config_file, local=False, overwrite=True, queue='all.q',
_generate_learning_curve_plots(experiment_name,
results_path,
output_file_path)
else:
logger.warning("Raw data for the learning curve saved in "
"{}. No plots were generated since pandas and "
"seaborn are not installed. ".format(output_file_path))

return result_json_paths

Expand Down
2 changes: 1 addition & 1 deletion skll/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
:organization: ETS
"""

__version__ = '1.2.1'
__version__ = '1.3'
VERSION = tuple(int(x) for x in __version__.split('.'))

0 comments on commit df60bfa

Please sign in to comment.