Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare gensim v3.8.2 to pin smart_open for Py2.7 compatibility #2787

Merged
merged 7 commits into from
Apr 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
Changes
=======

## 3.8.2, 2020-04-10

### :red_circle: Bug fixes

* Pin `smart_open` version for compatibility with Py2.7

### :warning: Deprecations (will be removed in the next major release)

* Remove
- `gensim.models.FastText.load_fasttext_format`: use load_facebook_vectors to load embeddings only (faster, less CPU/memory usage, does not support training continuation) and load_facebook_model to load full model (slower, more CPU/memory intensive, supports training continuation)
- `gensim.models.wrappers.fasttext` (obsoleted by the new native `gensim.models.fasttext` implementation)
- `gensim.examples`
- `gensim.nosy`
- `gensim.scripts.word2vec_standalone`
- `gensim.scripts.make_wiki_lemma`
- `gensim.scripts.make_wiki_online`
- `gensim.scripts.make_wiki_online_lemma`
- `gensim.scripts.make_wiki_online_nodebug`
- `gensim.scripts.make_wiki` (all of these obsoleted by the new native `gensim.scripts.segment_wiki` implementation)
- "deprecated" functions and attributes

* Move
- `gensim.scripts.make_wikicorpus` ➡ `gensim.scripts.make_wiki.py`
- `gensim.summarization` ➡ `gensim.models.summarization`
- `gensim.topic_coherence` ➡ `gensim.models._coherence`
- `gensim.utils` ➡ `gensim.utils.utils` (old imports will continue to work)
- `gensim.parsing.*` ➡ `gensim.utils.text_utils`

## 3.8.1, 2019-09-23

### :red_circle: Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# The short X.Y version.
version = '3.8'
# The full version, including alpha/beta/rc tags.
release = '3.8.1'
release = '3.8.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
30 changes: 20 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ def finalize_options(self):
])

if (3, 0) < sys.version_info < (3, 7):
linux_testenv.extend(['nmslib'])
linux_testenv.extend(['nmslib'])

docs_testenv = linux_testenv + distributed_env + [
'sphinx',
'sphinxcontrib-napoleon',
Expand Down Expand Up @@ -345,9 +345,24 @@ def finalize_options(self):
extra_link_args=extra_args)
)

install_requires = [
NUMPY_STR,
'scipy >= 1.0.0',
'six >= 1.5.0',
]

#
# smart_open >= 1.11 is py3+ only.
# TODO: Remove the pin once we drop py2.7 from gensim too.
#
if PY2:
install_requires.append('smart_open >= 1.8.1, < 1.11')
else:
install_requires.append('smart_open >= 1.8.1')

setup(
name='gensim',
version='3.8.1',
version='3.8.2',
description='Python framework for fast Vector Space Modelling',
long_description=LONG_DESCRIPTION,

Expand All @@ -360,7 +375,7 @@ def finalize_options(self):

url='http://radimrehurek.com/gensim',
download_url='http://pypi.python.org/pypi/gensim',

license='LGPLv2.1',

keywords='Singular Value Decomposition, SVD, Latent Semantic Indexing, '
Expand Down Expand Up @@ -391,12 +406,7 @@ def finalize_options(self):
setup_requires=[
NUMPY_STR,
],
install_requires=[
NUMPY_STR,
'scipy >= 0.18.1',
'six >= 1.5.0',
'smart_open >= 1.8.1',
],
install_requires=install_requires,
tests_require=linux_testenv,
extras_require={
'distributed': distributed_env,
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@ addopts = -rfxEXs --durations=20 --showlocals --reruns 3 --reruns-delay 1
[testenv]
recreate = True

; rackcdn host only for windows wheels (numpy, scipy)
install_command = python most_recent_pip_install.py --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com --find-links http://28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com/ {env:TOX_PIP_OPTS:} {opts} {packages}
install_command = python most_recent_pip_install.py {env:TOX_PIP_OPTS:} {opts} {packages}

deps =
pip>=19.1.1
py37: numpy==1.14.5
py37: scipy==1.1.0

py27: numpy==1.11.3
py27: scipy==0.18.1
py27: scipy==1.0.0
py35: numpy==1.11.3
py35: scipy==0.18.1
py35: scipy==1.0.0
py36: numpy==1.11.3
py36: scipy==0.18.1
py36: scipy==1.0.0

linux: .[test]
win: .[test-win]
Expand Down