Merge branch 'release-4.1.2'

piskvorky · Sep 16, 2021 · b76108e · b76108e
2 parents 3d72896 + 85f7caf
commit b76108e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -79,13 +79,13 @@ jobs:
           travis-os-name: osx
           manylinux-version: 1
           python-version: 3.8
-          build-depends: numpy==1.21.0
+          build-depends: numpy==1.17.3
 
         - os: macos-latest
           travis-os-name: osx
           manylinux-version: 1
           python-version: 3.9
-          build-depends: numpy==1.21.0
+          build-depends: numpy==1.19.3
 
         - os: windows-latest
           manylinux-version: 2010

diff --git a/.travis.yml b/.travis.yml
@@ -20,13 +20,6 @@ env:
       - MB_ML_VER=2014
       - SKIP_NETWORK_TESTS=1
       - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
-        #
-        # Build wheels with the oldest possible numpy version to avoid
-        # the problem encountered by:
-        #
-        # https://github.com/RaRe-Technologies/gensim/issues/3085
-        #
-      - BUILD_DEPENDS="oldest-supported-numpy scipy==1.7.0"
         #
         # The contents of this file mirror the linux_testenv list
         # in gensim's setup.py.  I can't think of a better way to include
@@ -36,23 +29,35 @@ env:
       - TEST_DEPENDS="pytest mock cython nmslib pyemd testfixtures Morfessor==2.0.2a4 python-levenshtein==0.12.0 visdom==0.1.8.9 scikit-learn"
 
 matrix:
+      #
+      # See .github/workflows/build-wheels.yml for a discussion of why we
+      # handle numpy versions explicitly.
+      #
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
         #
         # scipy 1.7.0 wheels not available for Py3.6, so we have to build using
         # an older version.
         #
-        - BUILD_DEPENDS="oldest-supported-numpy scipy==1.5.3"
+        - BUILD_DEPENDS="numpy==1.19.2 scipy==1.5.3"
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
+        - BUILD_DEPENDS="numpy==1.19.2 scipy==1.7.0"
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8
+        - BUILD_DEPENDS="numpy==1.19.2 scipy==1.7.0"
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.9
+        #
+        # oldest-supported-numpy does not seem to handle this particular case
+        # (aarch64, Py3.9) explicitly, but I've double-checked that wheels for
+        # this numpy release are available via PyPI.
+        #
+        - BUILD_DEPENDS="numpy==1.19.3 scipy==1.7.0"
 
 before_install:
     - source multibuild/common_utils.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ Changes
 
 ## Unreleased
 
+## 4.1.2, 2021-09-17
+
+This is a bugfix release that addresses left over compatibility issues with older versions of numpy and MacOS.
+
 ## 4.1.1, 2021-09-14
 
 This is a bugfix release that addresses compatibility issues with older versions of numpy.

diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.1'
+release = '4.1.2'
 
 # 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.1.1'
+__version__ = '4.1.2'
 
 import logging
 

diff --git a/setup.py b/setup.py
@@ -338,7 +338,7 @@ def run(self):
 
 setup(
     name='gensim',
-    version='4.1.1',
+    version='4.1.2',
     description='Python framework for fast Vector Space Modelling',
     long_description=LONG_DESCRIPTION,