Merge pull request lda-project#66 from ariddell/feature/appveyor-fixes

ci: use numpy and scipy wheels from alternate repository

Author: ariddell

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
@@ -16,10 +15,12 @@ before_install:
   # Update conda itself
   - conda update --yes conda
 install:
-  - conda create --yes -n testenv python=$TRAVIS_PYTHON_VERSION pip numpy scipy nose Cython
+  - conda create --yes -n testenv python=$TRAVIS_PYTHON_VERSION pip numpy scipy Cython
   - source activate testenv
   - pip install --pre oslotest  # needed until final release of oslotest?
   - make cython
   - python setup.py install
 
-script: nosetests -w /tmp lda.tests
+script:
+  - cd /tmp
+  - python -m unittest discover lda

appveyor.yml

@@ -23,14 +23,6 @@ environment:
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "64"
-
     - PYTHON: "C:\\Python34"
       PYTHON_VERSION: "3.4.x"
       PYTHON_ARCH: "32"
@@ -99,7 +91,7 @@ test_script:
   # installed library.
   - "mkdir empty_folder"
   - "cd empty_folder"
-  - "python -c \"import nose; nose.main()\" -s lda"
+  - "python -m unittest discover lda"
   # Move back to the project folder
   - "cd .."
 

continuous_integration/appveyor/requirements.txt

@@ -1,13 +1,7 @@
-# Fetch numpy wheels from the lda rackspace wheelhouse.  These wheels were
-# generated by @ariddell by calling `wheel convert` on the binaries from
-# http://www.lfd.uci.edu/~gohlke/pythonlibs/
-# This is a temporary solution. As soon as numpy provides official
-# wheel for windows we can delete this --find-links line.
---find-links https://d36102825770f036e7f0-25e1da3ee193e97cce4726db07962f5d.ssl.cf5.rackcdn.com/
-
-# fix the versions of numpy to force the use the whl in the rackspace folder
-# instead of trying to install from more recent source tarball published on PyPI
-numpy==1.9.3
-scipy==0.16.1
-nose
+# Fetch scipy wheels from alternate wheelhouse.
+# This is a temporary solution. The problem is described here https://github.com/scipy/scipy/issues/5461
+# As soon as scipy provides official wheel for windows we can delete this --find-links line.
+--find-links https://d76ced9435a16aebcbcc-088ff5b231b56aeba240f4afdcc790f4.ssl.cf5.rackcdn.com/
+numpy==1.11.3
+scipy==0.19.0
 wheel

setup.cfg

@@ -17,9 +17,9 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
     Operating System :: MacOS
     Operating System :: Microsoft :: Windows
     Operating System :: POSIX