Merge branch 'piskvorky:develop' into develop

LINE-PESC · Jul 20, 2024 · c964f92 · c964f92
2 parents e913124 + 54dfec9
commit c964f92
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 21 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-11]
+        os: [ubuntu-20.04, windows-2019, macos-12]
     steps:
 
       - name: Checkout
@@ -61,11 +61,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {python: '3.8', os: macos-11}
-          - {python: '3.9', os: macos-11}
-          - {python: '3.10', os: macos-11}
-          - {python: '3.11', os: macos-11}
-          - {python: '3.12', os: macos-11}
+          - {python: '3.8', os: macos-12}
+          - {python: '3.9', os: macos-12}
+          - {python: '3.10', os: macos-12}
+          - {python: '3.11', os: macos-12}
+          - {python: '3.12', os: macos-12}
 
           - {python: '3.8', os: ubuntu-20.04}
           - {python: '3.9', os: ubuntu-20.04}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 Changes
 =======
+
+## 4.3.3, 2024-07-19
+
+### :star2: New Features
+
+### :red_circle: Bug fixes
+
+* Correct file argument name in KeyedVectors.save docstring (__[hammad7](https://github.com/hammad7)__, [#3532](https://github.com/piskvorky/gensim/pull/3532))
+* Import deprecated scipy.linalg.triu from numpy.triu instead (__[Luffy610](https://github.com/Luffy610)__, [#3524](https://github.com/piskvorky/gensim/pull/3524))
+
+### :books: Tutorial and doc improvements
+
+* Updated the broken Documentation Link on the README.md (__[wittyicon29](https://github.com/wittyicon29)__, [#3505](https://github.com/piskvorky/gensim/pull/3505))
+
+### :+1: Improvements
+
+* Add support for python3.12 wheels (__[YoungMind1](https://github.com/YoungMind1)__, [#3531](https://github.com/piskvorky/gensim/pull/3531))
+* Removed scipy from build-only dependencies (__[filip-komarzyniec](https://github.com/filip-komarzyniec)__, [#3538](https://github.com/piskvorky/gensim/pull/3538))
+* Use newer unittest.mock everwhere (__[a-detiste](https://github.com/a-detiste)__, [#3529](https://github.com/piskvorky/gensim/pull/3529))
+* Handle optional parameters without implicit bool cast (__[nk-fouque](https://github.com/nk-fouque)__, [#3502](https://github.com/piskvorky/gensim/pull/3502))
+
 ## 4.3.2, 2023-08-23
 
 ### :red_circle: Bug fixes

diff --git a/README.md b/README.md
@@ -49,13 +49,12 @@ on Wikipedia.
 Installation
 ------------
 
-This software depends on [NumPy and Scipy], two Python packages for
-scientific computing. You must have them installed prior to installing
-gensim.
-
-It is also recommended you install a fast BLAS library before installing
-NumPy. This is optional, but using an optimized BLAS such as MKL, [ATLAS] or
-[OpenBLAS] is known to improve performance by as much as an order of
+This software depends on [NumPy], a Python package for
+scientific computing. Please bear in mind that building NumPy from source
+(e.g. by installing gensim on a platform which lacks NumPy .whl distribution)
+is a non-trivial task involving [linking NumPy to a BLAS library].  
+It is recommended to provide a fast one (such as MKL, [ATLAS] or
+[OpenBLAS]) which can improve performance by as much as an order of
 magnitude. On OSX, NumPy picks up its vecLib BLAS automatically,
 so you don’t need to do anything special.
 
@@ -69,7 +68,9 @@ Or, if you have instead downloaded and unzipped the [source tar.gz]
 package:
 
 ```bash
-    python setup.py install
+    tar -xvzf gensim-X.X.X.tar.gz
+    cd gensim-X.X.X/
+    pip install .
 ```
 
 For alternative modes of installation, see the [documentation].
@@ -172,7 +173,8 @@ BibTeX entry:
   [documentation and Jupyter Notebook tutorials]: https://github.com/RaRe-Technologies/gensim/#documentation
   [Vector Space Model]: https://en.wikipedia.org/wiki/Vector_space_model
   [unsupervised document analysis]: https://en.wikipedia.org/wiki/Latent_semantic_indexing
-  [NumPy and Scipy]: https://scipy.org/install/
+  [NumPy]: https://numpy.org/install/
+  [linking NumPy to a BLAS library]: https://numpy.org/devdocs/building/blas_lapack.html
   [ATLAS]: https://math-atlas.sourceforge.net/
   [OpenBLAS]: https://xianyi.github.io/OpenBLAS/
   [source tar.gz]: https://pypi.org/project/gensim/

diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.3'
+version = '4.3.3'
 # The full version, including alpha/beta/rc tags.
-release = '4.3.2.dev0'
+release = '4.3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/gensim/__init__.py b/gensim/__init__.py
@@ -4,7 +4,7 @@
 
 """
 
-__version__ = '4.3.2.dev0'
+__version__ = '4.3.3'
 
 import logging
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,6 @@ requires = [
     # is 1.18.5, remove the line when they increase oldest supported Numpy for this platform
     "numpy==1.18.5; python_version=='3.8' and platform_machine not in 'arm64|aarch64'",
     "oldest-supported-numpy; python_version>'3.8' or platform_machine in 'arm64|aarch64'",
-    "scipy",
     "setuptools",
     "wheel",
 ]
diff --git a/setup.py b/setup.py
@@ -331,13 +331,16 @@ def run(self):
 
 install_requires = [
     NUMPY_STR,
-    'scipy >= 1.7.0',
+    #
+    # scipy 1.14.0 and onwards removes deprecated sparsetools submodule
+    #
+    'scipy >= 1.7.0, <1.14.0',
     'smart_open >= 1.8.1',
 ]
 
 setup(
     name='gensim',
-    version='4.3.2.dev0',
+    version='4.3.3',
     description='Python framework for fast Vector Space Modelling',
     long_description=LONG_DESCRIPTION,
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     """
-    __version__ = '4.3.2.dev0'
+    __version__ = '4.3.3'
     import logging
@@ Expand Down @@