Skip to content

Commit

Permalink
Downgrade scipy/numpy requirements. Fix #1450 (#1470)
Browse files Browse the repository at this point in the history
* downgrade scipy to 0.14.0

* fix version in travis

* up scipy to 0.16 (because we have no wheels for lower versions)

* min version for 3.6

* show packages before tests
  • Loading branch information
menshikh-iv committed Jul 7, 2017
1 parent e9e223e commit faefe9d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ before_install:
- export PATH=/home/travis/miniconda2/bin:$PATH
- conda update --yes conda
install:
- conda create --yes -n gensim-test python=$TRAVIS_PYTHON_VERSION pip atlas numpy scipy
- conda create --yes -n gensim-test python=$TRAVIS_PYTHON_VERSION pip atlas numpy==1.11.3 scipy==0.18.1
- source activate gensim-test
- python setup.py install
- pip install .[test]
script:
- pip freeze
- python setup.py test
- pip install flake8
- continuous_integration/travis/flake8_diff.sh
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ test_script:
- "mkdir empty_folder"
- "cd empty_folder"
- "pip install pyemd testfixtures unittest2 sklearn Morfessor==2.0.2a4"

- "pip freeze"
- "python -c \"import nose; nose.main()\" -s -v gensim"
# Move back to the project folder
- "cd .."
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/appveyor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# of the rackspace folder instead of trying to install from more recent
# source tarball published on PyPI
numpy==1.11.3
scipy==0.19.0
scipy==0.18.1
cython
six >= 1.5.0
smart_open >= 1.2.1
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def finalize_options(self):
test_env = [
'testfixtures',
'unittest2',
'Morfessor==2.0.2a4',
'Morfessor == 2.0.2a4',
'scikit-learn',
'pyemd',
'annoy',
Expand Down Expand Up @@ -289,7 +289,7 @@ def finalize_options(self):
],
install_requires=[
'numpy >= 1.11.3',
'scipy >= 0.19.0',
'scipy >= 0.18.1',
'six >= 1.5.0',
'smart_open >= 1.2.1',
],
Expand Down

0 comments on commit faefe9d

Please sign in to comment.