From bc46d01b23f4dd3b2b67cf782e71bfd504be3333 Mon Sep 17 00:00:00 2001 From: Yury Brukau Date: Thu, 9 Apr 2020 13:00:57 +0200 Subject: [PATCH 1/7] pin version of smart-open to py2 compatible --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 90e8212700..6ba6f274c4 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -360,7 +360,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, ' @@ -395,7 +395,7 @@ def finalize_options(self): NUMPY_STR, 'scipy >= 0.18.1', 'six >= 1.5.0', - 'smart_open >= 1.8.1', + 'smart_open >= 1.8.1, < 1.11', ], tests_require=linux_testenv, extras_require={ From dbe9ce1a2a4f3e2840292f11bf32a256f69d85da Mon Sep 17 00:00:00 2001 From: brukau Date: Thu, 9 Apr 2020 14:51:58 +0200 Subject: [PATCH 2/7] add a comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Radim Řehůřek --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6ba6f274c4..8c11d27b7a 100644 --- a/setup.py +++ b/setup.py @@ -395,7 +395,7 @@ def finalize_options(self): NUMPY_STR, 'scipy >= 0.18.1', 'six >= 1.5.0', - 'smart_open >= 1.8.1, < 1.11', + 'smart_open >= 1.8.1, < 1.11', # smart_open >= 1.11 is py3+ only. TODO: Remove once we drop py2.7 from gensim too. ], tests_require=linux_testenv, extras_require={ From 83d3a3a9901d8043a908ca570d05787b7237c953 Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Fri, 10 Apr 2020 09:25:51 +0900 Subject: [PATCH 3/7] make pin conditional (py27 only) --- setup.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 8c11d27b7a..78c9d7abbf 100644 --- a/setup.py +++ b/setup.py @@ -345,6 +345,21 @@ def finalize_options(self): extra_link_args=extra_args) ) +install_requires = [ + NUMPY_STR, + 'scipy >= 0.18.1', + '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', @@ -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, < 1.11', # smart_open >= 1.11 is py3+ only. TODO: Remove once we drop py2.7 from gensim too. - ], + install_requires=install_requires, tests_require=linux_testenv, extras_require={ 'distributed': distributed_env, From ef9d7a945b87e20faf05c36ed0efd78bb07d348b Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Fri, 10 Apr 2020 09:26:09 +0900 Subject: [PATCH 4/7] prepare version 3.8.2 --- CHANGELOG.md | 6 ++++++ docs/src/conf.py | 2 +- setup.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 305c26d72d..505dd6410b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changes ======= +## 3.8.2, 2020-04-10 + +### :red_circle: Bug fixes + +* Pin `smart_open` version for compatibility with Py2.7 + ## 3.8.1, 2019-09-23 ### :red_circle: Bug fixes diff --git a/docs/src/conf.py b/docs/src/conf.py index e00a1a6fb9..84d2722c27 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -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. diff --git a/setup.py b/setup.py index 78c9d7abbf..33de452dac 100644 --- a/setup.py +++ b/setup.py @@ -362,7 +362,7 @@ def finalize_options(self): setup( name='gensim', - version='3.8.1', + version='3.8.2', description='Python framework for fast Vector Space Modelling', long_description=LONG_DESCRIPTION, From d2123c85a2c2b33d9c74d75ecd7418c0faa4c542 Mon Sep 17 00:00:00 2001 From: Michael Penkov Date: Fri, 10 Apr 2020 09:28:23 +0900 Subject: [PATCH 5/7] add deprecations to README --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505dd6410b..cc0ce80727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,28 @@ Changes * 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 From 7d7868f0cec510f7bfb5075017b3af62a01ba3fc Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Fri, 10 Apr 2020 07:40:32 +0300 Subject: [PATCH 6/7] get rid rackcdn, bump scipy to 1.0.0 --- tox.ini | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index d537b6f983..f30bdc068d 100644 --- a/tox.ini +++ b/tox.ini @@ -22,8 +22,7 @@ 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 @@ -31,11 +30,11 @@ deps = 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] From fc6f1271d88e28325ee795a33b2a6d531f275b7e Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Fri, 10 Apr 2020 07:45:03 +0300 Subject: [PATCH 7/7] bump scipy to 1.0.0 in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 33de452dac..f80bef55eb 100644 --- a/setup.py +++ b/setup.py @@ -347,7 +347,7 @@ def finalize_options(self): install_requires = [ NUMPY_STR, - 'scipy >= 0.18.1', + 'scipy >= 1.0.0', 'six >= 1.5.0', ]