Skip to content

Commit

Permalink
drop py35, add py38 (travis), update explicit dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gojomo committed Jan 27, 2020
1 parent d05259a commit b8346c1
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 19 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ matrix:
- python: '3.6'
env: TOXENV="flake8,flake8-docs"

- python: '3.5'
env: TOXENV="py35-linux"

- python: '3.6'
env: TOXENV="py36-linux"
- python: '3.8'
env:
- TOXENV="py38-linux"
dist: bionic

- python: '3.7'
env:
Expand All @@ -30,6 +29,9 @@ matrix:
dist: xenial
sudo: true

- python: '3.6'
env: TOXENV="py36-linux"


install:
- pip install tox
Expand Down
30 changes: 19 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,23 @@ environment:
TOX_PARALLEL_NO_SPINNER: 1

matrix:
- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.2"
# Python 3.8 builds on Appveyor/Windows failing; commented-out for now pending resolution
# see comment at <https://github.com/RaRe-Technologies/gensim/pull/2715#issuecomment-569457589>
# - PYTHON: "C:\\Python38-x64"
# PYTHON_VERSION: "3.8.1"
# PYTHON_ARCH: "64"
# TOXENV: "py38-win"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.6"
PYTHON_ARCH: "64"
TOXENV: "py35-win"
TOXENV: "py37-win"

- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.0"
PYTHON_VERSION: "3.6.10"
PYTHON_ARCH: "64"
TOXENV: "py36-win"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.0"
PYTHON_ARCH: "64"
TOXENV: "py37-win"

init:
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
- "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\""
Expand All @@ -50,9 +52,15 @@ install:
- "powershell ./continuous_integration/appveyor/install.ps1"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "python -m pip install -U pip tox"
- "pip --version"

# Check that we have the expected version and architecture for Python
# next line only to demo that py3.8-on-Appveyor *could* install Cython from wheel just fine,
# despite mysterious following attempt/failure to build-and-use Cython on that one Appveyor config
# delete when py3.8-on-Appveyor starts working normally
# see comment at <https://github.com/RaRe-Technologies/gensim/pull/2715#issuecomment-569457589>
- "python -m pip install Cython==0.29.14 numpy==1.18.0"

# Check that we have the expected versions and architecture
- "pip --version"
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def run(self):
# to build with any sane version of Cython, so we should update this pin
# periodically.
#
CYTHON_STR = 'Cython==0.29.3'
CYTHON_STR = 'Cython==0.29.14'

install_requires = [
NUMPY_STR,
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = {py35,py36,py37}-{win,linux}, flake8, docs, docs-upload, download-wheels, upload-wheels, test-pypi
envlist = {py36,py37,py38}-{win,linux}, flake8, docs, docs-upload, download-wheels, upload-wheels, test-pypi
skipsdist = True
platform = linux: linux
win: win64
Expand Down Expand Up @@ -64,7 +64,7 @@ commands = flake8-rst gensim/ docs/ {posargs}
basepython = python3
recreate = True

deps = numpy==1.14.5
deps = numpy
commands = python setup.py build_ext --inplace


Expand Down

0 comments on commit b8346c1

Please sign in to comment.