From 87e847266f33de39b119c20a883723fcf81d401b Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 19:50:44 +0300 Subject: [PATCH 01/25] upload artifacts in any case (not depends on test success) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82e05de..a2860b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ install: script: - install_run $PLAT -after_success: +after_script: - pip install wheelhouse-uploader - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ From ddc81b8a788dd6cb37d3f29d5c67ea0b46e1a48e Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 19:51:08 +0300 Subject: [PATCH 02/25] same behavior for appveyor --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b0c2d3c..9cb006d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -92,11 +92,8 @@ test_script: # - "SET PYTHONHASHSEED=1" # - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" - -artifacts: - # Archive the generated wheel package in the ci.appveyor.com build report. - - path: "gensim\\dist\\*" - +on_finish: + - appveyor PushArtifact "gensim\\dist\\*" notifications: - provider: Email From bdf25d0b0ffabc76ffebe2cbd81f7f804febdd99 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 19:54:06 +0300 Subject: [PATCH 03/25] enable win tests back --- appveyor.yml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9cb006d..60c4437 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,29 +68,14 @@ build: false test_script: - # Upload the generated wheel package to Rackspace - # - # We do this _before_ we run tests to prevent test failures from blocking a - # release. This is a good idea because at this stage, because we have - # already done sufficient testing prior to making the release. Furthermore, - # failures at this point may be caused by AppVeyor weirdness like running out - # of memory. Finally, even if the failures are caused by a bug in the new - # release, we've already committed to making the release, and it's too late - # to turn back. Even if the release is broken, we're better off building - # wheels for it and dealing with the problem in a subsequent bugfix release. - # - # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we - # disable the ssl checks. - - "cd dist" + - "cd .." + - "mkdir empty_folder" + - "cd empty_folder" + - "SET PYTHONHASHSEED=1" + - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" + - "cd ../gensim/dist" - "ls" - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" - # Change to a non-source folder to make sure we run the tests on the - # installed library. - # - "cd .." - # - "mkdir empty_folder" - # - "cd empty_folder" - # - "SET PYTHONHASHSEED=1" - # - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" on_finish: - appveyor PushArtifact "gensim\\dist\\*" From 476ad8a803165181cd4ec1da263f765c22ef54b8 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 19:57:41 +0300 Subject: [PATCH 04/25] try to build my fork --- .travis.yml | 2 +- appveyor.yml | 2 +- gensim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2860b0..8f8fc9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ env: global: - REPO_DIR=gensim - - BUILD_COMMIT=3.8.2 + - BUILD_COMMIT=c573fe356a29d35dd416666f4e18a6159366cacf - UNICODE_WIDTH=32 - GLOBAL_DEPENDS="six smart_open" - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn" diff --git a/appveyor.yml b/appveyor.yml index 60c4437..a008cad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: global: - BUILD_COMMIT: 3.8.2 + BUILD_COMMIT: c573fe356a29d35dd416666f4e18a6159366cacf # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # /E:ON and /V:ON options are not enabled in the batch script intepreter # See: http://stackoverflow.com/a/13751649/163740 diff --git a/gensim b/gensim index 8b1ea6a..c573fe3 160000 --- a/gensim +++ b/gensim @@ -1 +1 @@ -Subproject commit 8b1ea6a07a2d6010d4af6d2491f6cb008fa1e01a +Subproject commit c573fe356a29d35dd416666f4e18a6159366cacf From 195fa94f2fdd897268f2caa44e3b9204e872bc65 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 20:31:48 +0300 Subject: [PATCH 05/25] upload wheels immediately after wheel are ready --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f8fc9a..10246e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,18 +91,16 @@ install: - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT -script: - - install_run $PLAT - -after_script: +before_script: + # Upload wheels immediately after build - pip install wheelhouse-uploader - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - # This uploads the wheels to a Rackspace container owned by the - # scikit-learn team, available at http://wheels.scipy.org. See above - # for information on using this account or choosing another. - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 +script: + - install_run $PLAT + notifications: email: - penkov+gensimwheels@pm.me From f2f37e29ce8019ddde31a3ba93ae4063884d5ebd Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 20:35:11 +0300 Subject: [PATCH 06/25] fix travis warnings --- .travis.yml | 126 ++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10246e3..2aa5472 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,73 +13,71 @@ language: python # The travis Python version is unrelated to the version we build and test # with. This is set with the MB_PYTHON_VERSION variable. python: 3.5 -sudo: required +os: linux dist: trusty services: docker -matrix: - include: - - # Linux - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=x86_64 - - SKIP_NETWORK_TESTS=1 - - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - SKIP_NETWORK_TESTS=1 - - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=x86_64 - - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - - SKIP_NETWORK_TESTS=1 - - - os: linux - env: - - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" - - MB_PYTHON_VERSION=3.7 - - PLAT=x86_64 - - SKIP_NETWORK_TESTS=1 - - - os: linux - env: - - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - - SKIP_NETWORK_TESTS=1 - - # MacOS - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.5 - - SKIP_NETWORK_TESTS=1 - - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.6 - - SKIP_NETWORK_TESTS=1 - - - os: osx - language: generic - env: - - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" - - MB_PYTHON_VERSION=3.7 - - SKIP_NETWORK_TESTS=1 +jobs: + # Linux + - os: linux + env: + - MB_PYTHON_VERSION=3.5 + - PLAT=x86_64 + - SKIP_NETWORK_TESTS=1 + + - os: linux + env: + - MB_PYTHON_VERSION=3.5 + - PLAT=i686 + - SKIP_NETWORK_TESTS=1 + + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=x86_64 + + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=i686 + - SKIP_NETWORK_TESTS=1 + + - os: linux + env: + - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - MB_PYTHON_VERSION=3.7 + - PLAT=x86_64 + - SKIP_NETWORK_TESTS=1 + + - os: linux + env: + - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - SKIP_NETWORK_TESTS=1 + + # MacOS + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.5 + - SKIP_NETWORK_TESTS=1 + + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.6 + - SKIP_NETWORK_TESTS=1 + + - os: osx + language: generic + env: + - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - MB_PYTHON_VERSION=3.7 + - SKIP_NETWORK_TESTS=1 before_install: From 023f8966b8179ae15206f2a1a61fba0e2e26d24a Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:08:41 +0300 Subject: [PATCH 07/25] upd --- .travis.yml | 2 +- appveyor.yml | 2 +- gensim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2aa5472..2e0bf79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ env: global: - REPO_DIR=gensim - - BUILD_COMMIT=c573fe356a29d35dd416666f4e18a6159366cacf + - BUILD_COMMIT=d145377f994e0f8cbc8bfa421342da2c52b16291 - UNICODE_WIDTH=32 - GLOBAL_DEPENDS="six smart_open" - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn" diff --git a/appveyor.yml b/appveyor.yml index a008cad..4e21a20 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: global: - BUILD_COMMIT: c573fe356a29d35dd416666f4e18a6159366cacf + BUILD_COMMIT: d145377f994e0f8cbc8bfa421342da2c52b16291 # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # /E:ON and /V:ON options are not enabled in the batch script intepreter # See: http://stackoverflow.com/a/13751649/163740 diff --git a/gensim b/gensim index c573fe3..d145377 160000 --- a/gensim +++ b/gensim @@ -1 +1 @@ -Subproject commit c573fe356a29d35dd416666f4e18a6159366cacf +Subproject commit d145377f994e0f8cbc8bfa421342da2c52b16291 From 33331ef989cde6c430836852bb6763f6c4770899 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:13:24 +0300 Subject: [PATCH 08/25] get back deps to osx build --- .travis.yml | 2 +- config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e0bf79..3bbb521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: - BUILD_COMMIT=d145377f994e0f8cbc8bfa421342da2c52b16291 - UNICODE_WIDTH=32 - GLOBAL_DEPENDS="six smart_open" - - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn" + - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" - BUILD_DEPENDS="numpy==1.11.3 scipy==1.0.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON}" - MACOSX_DEPLOYMENT_TARGET=10.7 diff --git a/config.sh b/config.sh index e869835..ae51156 100755 --- a/config.sh +++ b/config.sh @@ -15,7 +15,7 @@ function run_tests { fi if [[ "$IS_OSX" -eq 0 ]]; then - pip install annoy python-Levenshtein>=0.10.2 Morfessor==2.0.2a4 + pip install annoy fi python -c 'import gensim; print(gensim.__file__, gensim.models.word2vec.FAST_VERSION)' From 8a3e68b547ea4dcfe76d8a7c1bc371eee8f1bdf3 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:38:07 +0300 Subject: [PATCH 09/25] disable wheel pushing (don't forget to get them back when ready) --- .travis.yml | 11 +++++++---- appveyor.yml | 13 +++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bbb521..28b1b85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,11 +90,14 @@ install: - build_wheel $REPO_DIR $PLAT before_script: - # Upload wheels immediately after build - - pip install wheelhouse-uploader - - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ + # Upload wheels after we build them + # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 + # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) + # - pip install wheelhouse-uploader + # - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ + # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ + # - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 script: - install_run $PLAT diff --git a/appveyor.yml b/appveyor.yml index 4e21a20..938785d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,7 +64,13 @@ install: - "pip install --pre --no-index --no-dependencies --force-reinstall --find-links dist/ gensim" -build: false +build: + # Upload wheels after we build them + # + - "ls -laht dist/" + # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) + # - "cd dst/" + # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" test_script: @@ -73,12 +79,7 @@ test_script: - "cd empty_folder" - "SET PYTHONHASHSEED=1" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" - - "cd ../gensim/dist" - - "ls" - - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" -on_finish: - - appveyor PushArtifact "gensim\\dist\\*" notifications: - provider: Email From f6b8fcdb67dd009cc0bee65a33d25b2441c6b4e6 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:40:50 +0300 Subject: [PATCH 10/25] meh --- appveyor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 938785d..43b7fea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,14 +64,7 @@ install: - "pip install --pre --no-index --no-dependencies --force-reinstall --find-links dist/ gensim" -build: - # Upload wheels after we build them - # - - "ls -laht dist/" - # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) - # - "cd dst/" - # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" - +build: false test_script: - "cd .." @@ -80,6 +73,13 @@ test_script: - "SET PYTHONHASHSEED=1" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" +on_finish: + # Upload wheels after we build them + # + - "ls -laht dist/" + # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) + # - "cd dst/" + # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" notifications: - provider: Email From f0c264864ff87ca27f7a520c0dc23fbdf4db3502 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:57:01 +0300 Subject: [PATCH 11/25] workaround --- .travis.yml | 19 ++++++++++++++----- appveyor.yml | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28b1b85..7384f35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,9 +89,20 @@ install: - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT -before_script: - # Upload wheels after we build them - # +script: + - install_run $PLAT + + +# Upload wheels at the end of process (no matters, success or fail) +after_success: + - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ + # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) + # - pip install wheelhouse-uploader + # - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ + # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ + # - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 + +after_failure: - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) # - pip install wheelhouse-uploader @@ -99,8 +110,6 @@ before_script: # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ # - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 -script: - - install_run $PLAT notifications: email: diff --git a/appveyor.yml b/appveyor.yml index 43b7fea..e5f2cc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,9 +73,9 @@ test_script: - "SET PYTHONHASHSEED=1" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" + +# Upload wheels at the end of process (no matters, success or fail) on_finish: - # Upload wheels after we build them - # - "ls -laht dist/" # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) # - "cd dst/" From abd3c40d65598dbf261acd67e5c9ced3e7a53d92 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 21:58:21 +0300 Subject: [PATCH 12/25] upd --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e5f2cc1..6c3fcac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,7 +76,8 @@ test_script: # Upload wheels at the end of process (no matters, success or fail) on_finish: - - "ls -laht dist/" + - "pwd" + - "ls -laht ../gensim/dist/" # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) # - "cd dst/" # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" From a0bca01906553363476dad26e9076d75058ca97c Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 22:04:54 +0300 Subject: [PATCH 13/25] update osx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7384f35..c86da03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" - BUILD_DEPENDS="numpy==1.11.3 scipy==1.0.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON}" - - MACOSX_DEPLOYMENT_TARGET=10.7 + - MACOSX_DEPLOYMENT_TARGET=10.9 language: python # The travis Python version is unrelated to the version we build and test From 5016ae1c861996bbe7ddc3dbe163e8bf05aa58da Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 22:33:37 +0300 Subject: [PATCH 14/25] upd --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6c3fcac..829376c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,10 +76,9 @@ test_script: # Upload wheels at the end of process (no matters, success or fail) on_finish: - - "pwd" - "ls -laht ../gensim/dist/" # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) - # - "cd dst/" + # - "cd ../gensim/dist/" # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" notifications: From de3d9a18a39a52a771e1a04190de60680d9235c5 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Sun, 12 Apr 2020 22:34:26 +0300 Subject: [PATCH 15/25] mimic to numpy-wheels --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index c86da03..0f2266f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ env: - BUILD_DEPENDS="numpy==1.11.3 scipy==1.0.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON}" - MACOSX_DEPLOYMENT_TARGET=10.9 + - MB_PYTHON_OSX_VER=10.9 language: python # The travis Python version is unrelated to the version we build and test @@ -61,18 +62,21 @@ jobs: # MacOS - os: osx language: generic + osx_image: xcode10.1 env: - MB_PYTHON_VERSION=3.5 - SKIP_NETWORK_TESTS=1 - os: osx language: generic + osx_image: xcode10.1 env: - MB_PYTHON_VERSION=3.6 - SKIP_NETWORK_TESTS=1 - os: osx language: generic + osx_image: xcode10.1 env: - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" From a3e27ee55190e02d52b99e8450c25e7d96ef1167 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Mon, 13 Apr 2020 07:10:42 +0300 Subject: [PATCH 16/25] attempt to fix osx --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f2266f..d65e5ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ env: - BUILD_DEPENDS="numpy==1.11.3 scipy==1.0.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON}" - MACOSX_DEPLOYMENT_TARGET=10.9 - - MB_PYTHON_OSX_VER=10.9 language: python # The travis Python version is unrelated to the version we build and test @@ -62,7 +61,6 @@ jobs: # MacOS - os: osx language: generic - osx_image: xcode10.1 env: - MB_PYTHON_VERSION=3.5 - SKIP_NETWORK_TESTS=1 @@ -76,7 +74,6 @@ jobs: - os: osx language: generic - osx_image: xcode10.1 env: - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" From ecdc4ffe0e248286fedd0de2871922ed27111e00 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Mon, 13 Apr 2020 09:55:39 +0300 Subject: [PATCH 17/25] go back to gensim origin --- .travis.yml | 2 +- appveyor.yml | 2 +- gensim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d65e5ff..406ae72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ env: global: - REPO_DIR=gensim - - BUILD_COMMIT=d145377f994e0f8cbc8bfa421342da2c52b16291 + - BUILD_COMMIT=a2ec4c3417717f65c6d7eae5c1fcdc6db8a54159 - UNICODE_WIDTH=32 - GLOBAL_DEPENDS="six smart_open" - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" diff --git a/appveyor.yml b/appveyor.yml index 829376c..0dae435 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: global: - BUILD_COMMIT: d145377f994e0f8cbc8bfa421342da2c52b16291 + BUILD_COMMIT: a2ec4c3417717f65c6d7eae5c1fcdc6db8a54159 # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # /E:ON and /V:ON options are not enabled in the batch script intepreter # See: http://stackoverflow.com/a/13751649/163740 diff --git a/gensim b/gensim index d145377..a2ec4c3 160000 --- a/gensim +++ b/gensim @@ -1 +1 @@ -Subproject commit d145377f994e0f8cbc8bfa421342da2c52b16291 +Subproject commit a2ec4c3417717f65c6d7eae5c1fcdc6db8a54159 From 03b04d12531e601cf6c0a406069116aeb770fbbe Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Mon, 13 Apr 2020 10:00:33 +0300 Subject: [PATCH 18/25] return back 'pushing wheels' --- .travis.yml | 14 ++++---------- appveyor.yml | 4 +--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 406ae72..751c121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,19 +97,13 @@ script: # Upload wheels at the end of process (no matters, success or fail) after_success: - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) - # - pip install wheelhouse-uploader - # - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ - # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - # - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 + - pip install wheelhouse-uploader + - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 after_failure: - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) - # - pip install wheelhouse-uploader - # - echo ${TRAVIS_BUILD_DIR}/wheelhouse/ - # - ls -laht ${TRAVIS_BUILD_DIR}/wheelhouse/ - # - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 + - pip install wheelhouse-uploader + - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ --no-ssl-check gensim-wheels --provider S3 notifications: diff --git a/appveyor.yml b/appveyor.yml index 0dae435..ec1157b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -77,9 +77,7 @@ test_script: # Upload wheels at the end of process (no matters, success or fail) on_finish: - "ls -laht ../gensim/dist/" - # TODO: uncomment me back before merge ('wheelhouse_uploader' takes too much time for upload, meh) - # - "cd ../gensim/dist/" - # - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=. gensim-wheels --provider S3" + - "python -m wheelhouse_uploader upload --no-ssl-check --local-folder=../gensim/dist/ gensim-wheels --provider S3" notifications: - provider: Email From 3e8927213be84c8044bc1d496e976d28d4076791 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 04:41:20 +0500 Subject: [PATCH 19/25] add fast version checks --- appveyor.yml | 1 + config.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ec1157b..762252b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,6 +71,7 @@ test_script: - "mkdir empty_folder" - "cd empty_folder" - "SET PYTHONHASHSEED=1" + - "python -c 'from gensim.models.word2vec import FAST_VERSION as FV_W2V; from gensim.models.fasttext import FAST_VERSION as FV_FT; print(\"FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}\".format(FV_W2V, FV_FT)); assert FV_W2V > 0, FV_W2V; assert FV_FT > 0, FV_FT'" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" diff --git a/config.sh b/config.sh index ae51156..38f7633 100755 --- a/config.sh +++ b/config.sh @@ -18,7 +18,15 @@ function run_tests { pip install annoy fi - python -c 'import gensim; print(gensim.__file__, gensim.models.word2vec.FAST_VERSION)' + python -c \ + """ + from gensim.models.word2vec import FAST_VERSION as FV_W2V + from gensim.models.fasttext import FAST_VERSION as FV_FT + print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)) + + assert FV_W2V > 0, FV_W2V + assert FV_FT > 0, FV_FT + """ pip freeze pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim } From 25cdc07ac4d8095f0524fae862198e795f7acdce Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 04:58:13 +0500 Subject: [PATCH 20/25] fix? --- appveyor.yml | 2 +- config.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 762252b..a655d9f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,7 +71,7 @@ test_script: - "mkdir empty_folder" - "cd empty_folder" - "SET PYTHONHASHSEED=1" - - "python -c 'from gensim.models.word2vec import FAST_VERSION as FV_W2V; from gensim.models.fasttext import FAST_VERSION as FV_FT; print(\"FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}\".format(FV_W2V, FV_FT)); assert FV_W2V > 0, FV_W2V; assert FV_FT > 0, FV_FT'" + - "python -c \"from gensim.models.word2vec import FAST_VERSION as FV_W2V; from gensim.models.fasttext import FAST_VERSION as FV_FT; print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)); assert FV_W2V > 0, FV_W2V; assert FV_FT > 0, FV_FT\"" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" diff --git a/config.sh b/config.sh index 38f7633..8b5d134 100755 --- a/config.sh +++ b/config.sh @@ -19,14 +19,14 @@ function run_tests { fi python -c \ - """ - from gensim.models.word2vec import FAST_VERSION as FV_W2V - from gensim.models.fasttext import FAST_VERSION as FV_FT - print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)) +""" +from gensim.models.word2vec import FAST_VERSION as FV_W2V +from gensim.models.fasttext import FAST_VERSION as FV_FT +print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)) - assert FV_W2V > 0, FV_W2V - assert FV_FT > 0, FV_FT - """ +assert FV_W2V > 0, FV_W2V +assert FV_FT > 0, FV_FT +""" pip freeze pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim } From fecf433a2028dce25ad22e56b7377046e056db17 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 05:02:56 +0500 Subject: [PATCH 21/25] fix?? --- appveyor.yml | 2 +- config.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a655d9f..5047ae8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,7 +71,7 @@ test_script: - "mkdir empty_folder" - "cd empty_folder" - "SET PYTHONHASHSEED=1" - - "python -c \"from gensim.models.word2vec import FAST_VERSION as FV_W2V; from gensim.models.fasttext import FAST_VERSION as FV_FT; print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)); assert FV_W2V > 0, FV_W2V; assert FV_FT > 0, FV_FT\"" + - "python -c \"from gensim.models.word2vec import FAST_VERSION as FV_W2V; from gensim.models.fasttext import FAST_VERSION as FV_FT; print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)); assert FV_W2V >= 0, FV_W2V; assert FV_FT >= 0, FV_FT\"" - "pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim" diff --git a/config.sh b/config.sh index 8b5d134..19f3e19 100755 --- a/config.sh +++ b/config.sh @@ -24,8 +24,8 @@ from gensim.models.word2vec import FAST_VERSION as FV_W2V from gensim.models.fasttext import FAST_VERSION as FV_FT print('FAST_VERSION (word2vec): {}, FAST_VERSION (fasttext): {}'.format(FV_W2V, FV_FT)) -assert FV_W2V > 0, FV_W2V -assert FV_FT > 0, FV_FT +assert FV_W2V >= 0, FV_W2V +assert FV_FT >= 0, FV_FT """ pip freeze pytest -rfxEXs --durations=20 --disable-warnings --showlocals --reruns 3 --reruns-delay 1 --pyargs gensim From b815f1f46e6772358478f641ba148f4d4ecb9535 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 07:04:19 +0500 Subject: [PATCH 22/25] attempt to fix osx3.6 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 751c121..9a67c59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,8 @@ jobs: env: - MB_PYTHON_VERSION=3.6 - SKIP_NETWORK_TESTS=1 + # Attempt to fix 'incompatibility' between sklearn & our base numpy (by pinning sklearn to older version) + - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn<0.22 python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" - os: osx language: generic From ff9d03f2ad9962d462bead52e6593cf39fd7efb3 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 08:10:03 +0500 Subject: [PATCH 23/25] meh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a67c59..588d80c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ jobs: - MB_PYTHON_VERSION=3.6 - SKIP_NETWORK_TESTS=1 # Attempt to fix 'incompatibility' between sklearn & our base numpy (by pinning sklearn to older version) - - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn<0.22 python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" + - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn==0.21.3 python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" - os: osx language: generic From 3023002351ea64ff6b263e27b51ecbc4fd6a83bd Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 11:32:21 +0500 Subject: [PATCH 24/25] travis, please --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 588d80c..a9d7c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ env: - BUILD_COMMIT=a2ec4c3417717f65c6d7eae5c1fcdc6db8a54159 - UNICODE_WIDTH=32 - GLOBAL_DEPENDS="six smart_open" - - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" + - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" - BUILD_DEPENDS="numpy==1.11.3 scipy==1.0.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON}" + - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON} scikit-learn" - MACOSX_DEPLOYMENT_TARGET=10.9 language: python @@ -72,7 +72,7 @@ jobs: - MB_PYTHON_VERSION=3.6 - SKIP_NETWORK_TESTS=1 # Attempt to fix 'incompatibility' between sklearn & our base numpy (by pinning sklearn to older version) - - TEST_COMMON="pytest pytest-rerunfailures mock cython testfixtures scikit-learn==0.21.3 python-Levenshtein>=0.10.2 Morfessor==2.0.2a4" + - TEST_DEPENDS="${BUILD_DEPENDS} ${TEST_COMMON} scikit-learn==0.21.3" - os: osx language: generic From 655b811e3083752ffe6956a4c47d1697ff02ec27 Mon Sep 17 00:00:00 2001 From: Ivan Menshikh Date: Thu, 16 Apr 2020 13:30:06 +0500 Subject: [PATCH 25/25] and again, travis, please ... --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9d7c00..d1a9f1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ jobs: - os: linux env: - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON} scikit-learn" - MB_PYTHON_VERSION=3.7 - PLAT=x86_64 - SKIP_NETWORK_TESTS=1 @@ -53,7 +53,7 @@ jobs: - os: linux env: - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON} scikit-learn" - MB_PYTHON_VERSION=3.7 - PLAT=i686 - SKIP_NETWORK_TESTS=1 @@ -78,7 +78,7 @@ jobs: language: generic env: - BUILD_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS}" - - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON}" + - TEST_DEPENDS="numpy==1.14.5 scipy==1.1.0 ${GLOBAL_DEPENDS} ${TEST_COMMON} scikit-learn" - MB_PYTHON_VERSION=3.7 - SKIP_NETWORK_TESTS=1