Skip to content

Commit

Permalink
Partial fix windows issue (#1438)
Browse files Browse the repository at this point in the history
Fix numpy/scipy version & disable nnz code from nose (temporary option)
  • Loading branch information
menshikh-iv authored Jun 21, 2017
1 parent a2b6b32 commit c14b138
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ build: false
test_script:
# Change to a non-source folder to make sure we run the tests on the
# installed library.
- "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com .[test]"
- "mkdir empty_folder"
- "cd empty_folder"
- "pip install pyemd testfixtures unittest2 sklearn Morfessor==2.0.2a4"

- "python -c \"import nose; nose.main()\" -s -v gensim"
# Use run instead of main to avoid nnz code when fail (TODO: remove this)

This comment has been minimized.

Copy link
@piskvorky

piskvorky Jun 26, 2017

Owner

What is "nnz code"? Is nnz = non-zero?

This comment has been minimized.

Copy link
@menshikh-iv

menshikh-iv Jun 26, 2017

Author Contributor

Yes, non-zero return code.

- "python -c \"import nose; nose.run()\" -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 @@ -7,7 +7,7 @@
# fix the versions of numpy to force the use of numpy and scipy to use the whl
# of the rackspace folder instead of trying to install from more recent
# source tarball published on PyPI
numpy==1.9.3
numpy==1.11.3
scipy==0.19.0
cython
six >= 1.5.0
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,11 @@ def finalize_options(self):

test_suite="gensim.test",
setup_requires=[
'numpy >= 1.3'
'numpy >= 1.11.3'
],
install_requires=[
'numpy >= 1.3',
'scipy >= 0.7.0',
'numpy >= 1.11.3',
'scipy >= 0.19.0',

This comment has been minimized.

Copy link
@piskvorky

piskvorky Jun 23, 2017

Owner

@menshikh-iv When/why/how did we lose compatibility with older scipy?

Needs a more thorough description and discussion, this is a big change.

This comment has been minimized.

Copy link
@menshikh-iv

menshikh-iv Jun 26, 2017

Author Contributor

For example this line needs scipy 0.17

I think we should check all numpy/scipy pairs and choice minimum version that works correctly in current version

This comment has been minimized.

Copy link
@piskvorky

piskvorky Jun 26, 2017

Owner

What on that line needs scipy 0.17, specifically?

This comment has been minimized.

Copy link
@menshikh-iv

menshikh-iv Jun 26, 2017

Author Contributor

scipy.sparse.diag
@macks22 can we avoid to use new scipy API here and use old version of this function (with explicit offset parameter) or replace it ?

This comment has been minimized.

Copy link
@macks22

macks22 Jun 26, 2017

Contributor

Pushed to PR #1449.

This comment has been minimized.

Copy link
@piskvorky

piskvorky Jun 27, 2017

Owner

That is false -- scipy.sparse.diag has existed since at least scipy 0.12.

'six >= 1.5.0',
'smart_open >= 1.2.1',
],
Expand Down

0 comments on commit c14b138

Please sign in to comment.