From b65e2f554fc0fc6b83641affd46a13aa71c4138a Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Sat, 9 Mar 2019 13:06:18 +0100 Subject: [PATCH] Update CI Only keep Travis for Python 2.7 for now until we've sorted out unicode build in Azure Pipelines --- .appveyor.yml | 21 --------------------- .travis.yml | 13 +++---------- README.md | 3 +-- azure-pipelines.yml | 16 +++++++++------- travis.sh | 22 ---------------------- 5 files changed, 13 insertions(+), 62 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 travis.sh diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index daf4c2457..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -environment: - matrix: - - PYTHON: "C:\\Python35-x64" - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python37-x64" -install: - # We need wheel installed to build wheels - - "%PYTHON%\\python.exe -m pip install wheel" - - "%PYTHON%\\python.exe -m pip install cython" - - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - - "%PYTHON%\\python.exe -m pip install -e ." -build: off -test_script: - - "%PYTHON%\\python.exe -m pytest spacy/ --no-print-logs" -after_test: - - "%PYTHON%\\python.exe setup.py bdist_wheel" -artifacts: - - path: dist\* -branches: - except: - - spacy.io diff --git a/.travis.yml b/.travis.yml index dc6cfb4d0..c517744cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,16 @@ dist: trusty group: edge python: - "2.7" - - "3.5" - - "3.6" os: - linux -env: - - VIA=compile - - VIA=flake8 install: - - "./travis.sh" - - pip install flake8 + - "pip install -r requirements.txt" + - "python setup.py build_ext --inplace" + - "pip install -e ." script: - "cat /proc/cpuinfo | grep flags | head -n 1" - "pip install pytest pytest-timeout" - if [[ "${VIA}" == "compile" ]]; then python -m pytest --tb=native spacy; fi - - if [[ "${VIA}" == "flake8" ]]; then flake8 . --count --exclude=spacy/compat.py,spacy/lang --select=E901,E999,F821,F822,F823 --show-source --statistics; fi - - if [[ "${VIA}" == "pypi_nightly" ]]; then python -m pytest --tb=native --models --en `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi - - if [[ "${VIA}" == "sdist" ]]; then python -m pytest --tb=native `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi branches: except: - spacy.io diff --git a/README.md b/README.md index a4670f6ec..1ceb36dd1 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,7 @@ released under the MIT license. 💫 **Version 2.1 out now!** [Check out the release notes here.](https://github.com/explosion/spaCy/releases) -[![Travis Build Status](https://img.shields.io/travis/explosion/spaCy/master.svg?style=flat-square&logo=travis)](https://travis-ci.org/explosion/spaCy) -[![Appveyor Build Status](https://img.shields.io/appveyor/ci/explosion/spaCy/master.svg?style=flat-square&logo=appveyor)](https://ci.appveyor.com/project/explosion/spaCy) +[![Azure Pipelines](https://img.shields.io/azure-devops/build/explosion-ai/public/8/master.svg?logo=azure-devops&style=flat-square)](https://dev.azure.com/explosion-ai/public/_build?definitionId=8) [![Current Release Version](https://img.shields.io/github/release/explosion/spacy.svg?style=flat-square)](https://github.com/explosion/spaCy/releases) [![pypi Version](https://img.shields.io/pypi/v/spacy.svg?style=flat-square)](https://pypi.python.org/pypi/spacy) [![conda Version](https://img.shields.io/conda/vn/conda-forge/spacy.svg?style=flat-square)](https://anaconda.org/conda-forge/spacy) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 47bbf8367..c5fa563be 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,12 +30,15 @@ jobs: dependsOn: 'Validate' strategy: matrix: - Python27Linux: - imageName: 'ubuntu-16.04' - python.version: '2.7' - Python27Mac: - imageName: 'macos-10.13' - python.version: '2.7' + # Python 2.7 currently doesn't work because it seems to be a narrow + # unicode build, which causes problems with the regular expressions + + # Python27Linux: + # imageName: 'ubuntu-16.04' + # python.version: '2.7' + # Python27Mac: + # imageName: 'macos-10.13' + # python.version: '2.7' Python35Linux: imageName: 'ubuntu-16.04' python.version: '3.5' @@ -76,7 +79,6 @@ jobs: # Downgrading pip is necessary to prevent a wheel version incompatiblity. # Might be fixed in the future or some other way, so investigate again. - script: | - python -c "import sys; print('UNICODE:', sys.maxunicode)" python -m pip install --upgrade pip==18.1 pip install -r requirements.txt displayName: 'Install dependencies' diff --git a/travis.sh b/travis.sh deleted file mode 100644 index b16dce8f3..000000000 --- a/travis.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ "${VIA}" == "pypi" ]; then - rm -rf * - pip install spacy-nightly - python -m spacy download en -fi - -if [[ "${VIA}" == "sdist" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then - rm -rf * - pip uninstall spacy - wget https://api.explosion.ai/build/spacy/sdist/$TRAVIS_COMMIT - mv $TRAVIS_COMMIT sdist.tgz - pip install -U sdist.tgz -fi - - -if [ "${VIA}" == "compile" ]; then - pip install -r requirements.txt - python setup.py build_ext --inplace - pip install -e . -fi