Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable Py2.7 builds under Travis, CircleCI and AppVeyor #2601

Merged
merged 20 commits into from
Oct 10, 2019
Merged

Disable Py2.7 builds under Travis, CircleCI and AppVeyor #2601

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
904fcbf
Disable Py2.7 builds under Travis and AppVeyor
mpenkov Sep 10, 2019
9605aea
use Py3.7.4 image under CircleCI
mpenkov Sep 10, 2019
83e4d3c
tweak circleci config.yml
mpenkov Sep 10, 2019
02ebad0
patch tox.ini
mpenkov Sep 10, 2019
c57150f
more fixes to get docs building under tox
mpenkov Sep 10, 2019
ebe57e6
Merge branch 'develop' into byebyepy27
mpenkov Sep 10, 2019
d65f1dd
s/python3.7/python3/
mpenkov Sep 11, 2019
bebeef9
delay annoy ImportError until actual use
mpenkov Oct 9, 2019
756793c
bring back Pattern
mpenkov Oct 9, 2019
c079d07
simplify invokation of pip command
mpenkov Oct 9, 2019
c401c0e
Merge branch 'develop' into byebyepy27
mpenkov Oct 9, 2019
8ada06a
add install_numpy_scipy.py
mpenkov Oct 9, 2019
fed00e3
fixup
mpenkov Oct 9, 2019
88a6603
use sys.executable
mpenkov Oct 9, 2019
2c59019
adjust version in install_wheels.py
mpenkov Oct 9, 2019
2778cbe
adjust travis.yml
mpenkov Oct 9, 2019
9adb0a3
adjust version in install_wheels.py back
mpenkov Oct 9, 2019
2d4ff7c
add logging statements
mpenkov Oct 10, 2019
54784e9
use version_info instead of sys.version
mpenkov Oct 10, 2019
213f18f
fixup
mpenkov Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/python:2.7
- image: circleci/python:3.7.4

working_directory: ~/gensim

Expand All @@ -18,11 +18,12 @@ jobs:
sudo apt-get -yq update
sudo apt-get -yq remove texlive-binaries --purge
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended latexmk
sudo apt-get -yq install build-essential python3.7-dev

- run:
name: Basic installation (tox)
command: |
python -m virtualenv venv
python3.7 -m virtualenv venv
source venv/bin/activate
pip install tox

Expand Down
6 changes: 0 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,9 @@ language: python

matrix:
include:
- python: '2.7'
env: TOXENV="flake8,flake8-docs"

- python: '3.6'
env: TOXENV="flake8,flake8-docs"

- python: '2.7'
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
env: TOXENV="py27-linux"

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

Expand Down
5 changes: 0 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ environment:
secure: qXqY3dFmLOqvxa3Om2gQi/BjotTOK+EP2IPLolBNo0c61yDtNWxbmE4wH3up72Be

matrix:
- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.12"
PYTHON_ARCH: "64"
TOXENV: "py27-win"

- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.2"
PYTHON_ARCH: "64"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ def finalize_options(self):
'sphinx',
'sphinxcontrib-napoleon',
'plotly',
'pattern <= 2.6',
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
'sphinxcontrib.programoutput',
'annoy',
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
]
#
# Get Py2.7 docs to build, see https://github.com/RaRe-Technologies/gensim/pull/2552
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = {py27,py35,py36,py37}-{win,linux}, flake8, docs, docs-upload, download-wheels, upload-wheels, test-pypi
envlist = {py35,py36,py37}-{win,linux}, flake8, docs, docs-upload, download-wheels, upload-wheels, test-pypi
skipsdist = True
platform = linux: linux
win: win64
Expand Down Expand Up @@ -30,8 +30,6 @@ deps =
py37: numpy==1.14.5
py37: scipy==1.1.0

py27: numpy==1.11.3
py27: scipy==0.18.1
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
py35: numpy==1.11.3
py35: scipy==0.18.1
py36: numpy==1.11.3
Expand All @@ -49,6 +47,7 @@ setenv =
SKIP_NETWORK_TESTS={env:SKIP_NETWORK_TESTS:}
BOTO_CONFIG={env:BOTO_CONFIG:}
PYTHONHASHSEED=1
TOX_PARALLEL_NO_SPINNER=1

commands =
python --version
Expand All @@ -73,15 +72,15 @@ commands = flake8-rst gensim/ docs/ {posargs}


[testenv:compile]
basepython = python2
basepython = python3.7
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
recreate = True

deps = numpy==1.11.3
deps = numpy==1.14.5
mpenkov marked this conversation as resolved.
Show resolved Hide resolved
commands = python setup.py build_ext --inplace


[testenv:docs]
basepython = python2
basepython = python3.7
recreate = True
whitelist_externals = make
deps = .[docs]
Expand Down