From f4a2dde6e8f6e1277b61c8cb8844c583c55a057e Mon Sep 17 00:00:00 2001
From: Nitin Madnani <nmadnani@ets.org>
Date: Tue, 23 Feb 2016 16:33:40 -0500
Subject: [PATCH 1/4] Modify conda.yaml

---
 conda.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/conda.yaml b/conda.yaml
index cbb3593d..c8c498f3 100644
--- a/conda.yaml
+++ b/conda.yaml
@@ -1,12 +1,14 @@
 package:
   name: skll
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}
+  version: 1.2
 
 source:
   git_url: ./
 
 build:
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  track_features:
+    - nomkl
   script:
     - cd $RECIPE_DIR
     - $PYTHON setup.py install
@@ -39,9 +41,10 @@ build:
 requirements:
   build:
     - python
+    - nomkl
     - joblib
     - setuptools
-    - scikit-learn 0.17.0
+    - scikit-learn 0.17.1
     - six
     - prettytable
     - beautiful-soup
@@ -55,8 +58,9 @@ requirements:
 
   run:
     - python
+    - nomkl
     - joblib
-    - scikit-learn 0.17.0
+    - scikit-learn 0.17.1
     - six
     - prettytable
     - beautiful-soup

From 174dc2610bf08f8820d1cb75401eab336ba0edd6 Mon Sep 17 00:00:00 2001
From: Nitin Madnani <nmadnani@ets.org>
Date: Tue, 23 Feb 2016 16:35:04 -0500
Subject: [PATCH 2/4] Update version number

---
 skll/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skll/version.py b/skll/version.py
index 3da8bdc7..36823bf1 100644
--- a/skll/version.py
+++ b/skll/version.py
@@ -7,5 +7,5 @@
 :organization: ETS
 """
 
-__version__ = '1.1.1'
+__version__ = '1.2'
 VERSION = tuple(int(x) for x in __version__.split('.'))

From 187a85b632d3dfa5e4d0ff4e4cc1fcc4205b1f22 Mon Sep 17 00:00:00 2001
From: Nitin Madnani <nmadnani@ets.org>
Date: Tue, 23 Feb 2016 18:11:58 -0500
Subject: [PATCH 3/4] Update version numbers in conda recipes.

---
 conda-recipe/unix/skll/meta.yaml    | 2 +-
 conda-recipe/windows/skll/meta.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda-recipe/unix/skll/meta.yaml b/conda-recipe/unix/skll/meta.yaml
index 5ac5dc21..e6facb81 100644
--- a/conda-recipe/unix/skll/meta.yaml
+++ b/conda-recipe/unix/skll/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: skll
-  version: 1.1.1
+  version: 1.2
 
 source:
   path: ../../../../skll
diff --git a/conda-recipe/windows/skll/meta.yaml b/conda-recipe/windows/skll/meta.yaml
index e70d6577..2cbed682 100644
--- a/conda-recipe/windows/skll/meta.yaml
+++ b/conda-recipe/windows/skll/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: skll
-  version: 1.1.1
+  version: 1.2
 
 source:
   path: ../../../../skll

From c1571d45f1e5611e89b7f07e5520fa8616390dd7 Mon Sep 17 00:00:00 2001
From: Nitin Madnani <nmadnani@ets.org>
Date: Tue, 23 Feb 2016 19:31:05 -0500
Subject: [PATCH 4/4] Remove unnecessary conda.yaml

---
 conda.yaml | 92 ------------------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 conda.yaml

diff --git a/conda.yaml b/conda.yaml
deleted file mode 100644
index c8c498f3..00000000
--- a/conda.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-package:
-  name: skll
-  version: 1.2
-
-source:
-  git_url: ./
-
-build:
-  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
-  track_features:
-    - nomkl
-  script:
-    - cd $RECIPE_DIR
-    - $PYTHON setup.py install
-  entry_points:
-    - compute_eval_from_predictions = skll.utilities.compute_eval_from_predictions:main
-    - filter_features = skll.utilities.filter_features:main
-    - generate_predictions = skll.utilities.generate_predictions:main
-    - join_features = skll.utilities.join_features:main
-    - print_model_weights = skll.utilities.print_model_weights:main
-    - run_experiment = skll.utilities.run_experiment:main
-    - skll_convert = skll.utilities.skll_convert:main
-    - summarize_results = skll.utilities.summarize_results:main
-    - compute_eval_from_predictions2 = skll.utilities.compute_eval_from_predictions:main [py2k]
-    - filter_features2 = skll.utilities.filter_features:main [py2k]
-    - generate_predictions2 = skll.utilities.generate_predictions:main [py2k]
-    - join_features2 = skll.utilities.join_features:main [py2k]
-    - print_model_weights2 = skll.utilities.print_model_weights:main [py2k]
-    - run_experiment2 = skll.utilities.run_experiment:main [py2k]
-    - skll_convert2 = skll.utilities.skll_convert:main [py2k]
-    - summarize_results2 = skll.utilities.summarize_results:main [py2k]
-    - compute_eval_from_predictions3 = skll.utilities.compute_eval_from_predictions:main [py3k]
-    - filter_features3 = skll.utilities.filter_features:main [py3k]
-    - generate_predictions3 = skll.utilities.generate_predictions:main [py3k]
-    - join_features3 = skll.utilities.join_features:main [py3k]
-    - print_model_weights3 = skll.utilities.print_model_weights:main [py3k]
-    - run_experiment3 = skll.utilities.run_experiment:main [py3k]
-    - skll_convert3 = skll.utilities.skll_convert:main [py3k]
-    - summarize_results3 = skll.utilities.summarize_results:main [py3k]
-
-requirements:
-  build:
-    - python
-    - nomkl
-    - joblib
-    - setuptools
-    - scikit-learn 0.17.1
-    - six
-    - prettytable
-    - beautiful-soup
-    - numpy
-    - scipy
-    - pyyaml
-    - configparser [py2k]
-    - futures [py2k]
-    - logutils [py2k]
-    - mock [py2k]
-
-  run:
-    - python
-    - nomkl
-    - joblib
-    - scikit-learn 0.17.1
-    - six
-    - prettytable
-    - beautiful-soup
-    - numpy
-    - scipy
-    - pyyaml
-    - configparser [py2k]
-    - futures [py2k]
-    - logutils [py2k]
-    - mock [py2k]
-
-test:
-  # Python imports
-  imports:
-    - skll
-
-  commands:
-    - compute_eval_from_predictions --help
-    - filter_features --help
-    - generate_predictions --help
-    - join_features --help
-    - print_model_weights --help
-    - run_experiment --help
-    - skll_convert --help
-    - summarize_results --help
-
-about:
-  home: http://github.com/EducationalTestingService/skll
-  license: BSD 3-clause