murrayrm · Dec 22, 2017 · Dec 22, 2017 · Dec 23, 2017 · Dec 23, 2017 · Dec 23, 2017
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,6 @@ examples/.ipynb_checkpoints/
 .project
 Untitled*.ipynb
 *.idea/
+
+# Extraneous files created by local editors, operting systems, etc
+*~
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,19 @@ cache:
 
 python:
   - "2.7"
-  - "3.3"
-  - "3.4"
   - "3.5"
+  - "3.6"
+
+# Test against multiple version of SciPy, with and without slycot
+#
+# Because there were significant changes in SciPy between v0 and v1, we 
+# test against both of these using the Travis CI environment capability
+#
+# We also want to test with and without slycot
+env:
+  - SCIPY=0.19.1 SLYCOT=
+  - SCIPY=0.19.1 SLYCOT=slycot
+  - SCIPY=1.0.0 SLYCOT=
 
 # install required system libraries
 before_install:
@@ -40,16 +50,15 @@ before_install:
 
 # Install packages
 install:
-  - conda build --python "$TRAVIS_PYTHON_VERSION" conda-recipe
-  - conda install control --use-local
+  # Install the desired version of SciPy first, w/ or w/out slycot
+  - conda install scipy==$SCIPY $SLYCOT
+  - conda install matplotlib
+  # Don't use conda for installation of control library [preserves scipy]
+  - python setup.py install
 
 # command to run tests
 script:
-  # Before installing Slycot
-  - python setup.py test
-
-  # Now, get and use Slycot
-  - conda install slycot
+  - 'if [ $SLYCOT != "" ]; then python -c "import slycot"; fi'
   - coverage run setup.py test
 
 after_success:

diff --git a/conda-recipe/README b/conda-recipe/README
@@ -0,0 +1 @@
+Information on how Conda recipe is set up.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,10 +1,14 @@
 package:
   name: control
+  version: {{ GIT_DESCRIBE_TAG }}
+
+source:
+  git_url: ../
 
 build:
+  number: {{ GIT_DESCRIBE_NUMBER }}
   script:
     - cd $RECIPE_DIR/..
-    - $PYTHON make_version.py
     - $PYTHON setup.py install --single-version-externally-managed --record=record.txt
 
 requirements:

diff --git a/make_version.py b/make_version.py