From 5a2e2b9db7b3b486773e64bdf7e3dcd20194cf83 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Sat, 9 Mar 2019 02:13:34 +0100 Subject: [PATCH 1/4] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 93dd4e8c4..db51e0dcc 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ integration. It's commercial open-source software, released under the MIT licens 💫 **Version 2.0 out now!** `Check out the release notes here. `_ -.. image:: https://img.shields.io/azure-devops/build/explosion-ai/public/8.svg?logo=azure-devops&style=flat-square +.. image:: https://img.shields.io/azure-devops/build/explosion-ai/public/8/master.svg?logo=azure-devops&style=flat-square :target: https://dev.azure.com/explosion-ai/public/_build?definitionId=8 :alt: Azure Pipelines From 95312138468f9841673d23e1d2186453f6439915 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Sat, 9 Mar 2019 02:56:08 +0100 Subject: [PATCH 2/4] Remove other CI --- .appveyor.yml | 51 --------------------------------------------------- .travis.yml | 36 ------------------------------------ travis.sh | 32 -------------------------------- 3 files changed, 119 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .travis.yml delete mode 100755 travis.sh diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index c4c405531..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,51 +0,0 @@ -environment: - - matrix: - - # For Python versions available on Appveyor, see - # http://www.appveyor.com/docs/installed-software#python - - #- PYTHON: "C:\\Python27" - #- PYTHON: "C:\\Python34" - #- PYTHON: "C:\\Python35" - - PYTHON: "C:\\Python27-x64" - #- DISTUTILS_USE_SDK: "1" - #- PYTHON: "C:\\Python34-x64" - #- DISTUTILS_USE_SDK: "1" - #- PYTHON: "C:\\Python35-x64" - - PYTHON: "C:\\Python36-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: - # Put your test command here. - # If you don't need to build C extensions on 64-bit Python 3.4, - # you can remove "build.cmd" from the front of the command, as it's - # only needed to support those cases. - # Note that you must use the environment variable %PYTHON% to refer to - # the interpreter you're using - Appveyor does not do anything special - # to put the Python version you want to use on PATH. - - "%PYTHON%\\python.exe -m pytest spacy/" - -after_test: - # This step builds your wheels. - # Again, you only need build.cmd if you're building C extensions for - # 64-bit Python 3.4. And you need to use %PYTHON% to get the correct - # interpreter - - "%PYTHON%\\python.exe setup.py bdist_wheel" - -artifacts: - # bdist_wheel puts your built wheel in the dist directory - - path: dist\* - -#on_success: -# You can use this step to upload your artifacts to a public website. -# See Appveyor's documentation for more details. Or you can simply -# access your wheels from the Appveyor "artifacts" tab for your build. diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bc6cd7b87..000000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: python - -sudo: false -dist: trusty -group: edge - -python: - - "2.7" - - "3.5" - - "3.6" - -os: - - linux - -env: - - VIA=compile - - VIA=flake8 - #- VIA=pypi_nightly - -install: - - "./travis.sh" - - pip install flake8 - -script: - - "pip install 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 - -notifications: - slack: - secure: F8GvqnweSdzImuLL64TpfG0i5rYl89liyr9tmFVsHl4c0DNiDuGhZivUz0M1broS8svE3OPOllLfQbACG/4KxD890qfF9MoHzvRDlp7U+RtwMV/YAkYn8MGWjPIbRbX0HpGdY7O2Rc9Qy4Kk0T8ZgiqXYIqAz2Eva9/9BlSmsJQ= - email: false - -cache: pip diff --git a/travis.sh b/travis.sh deleted file mode 100755 index eed6a96f2..000000000 --- a/travis.sh +++ /dev/null @@ -1,32 +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 - -# mkdir -p corpora/en -# cd corpora/en -# wget --no-check-certificate http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz -# tar -xzf WordNet-3.0.tar.gz -# mv WordNet-3.0 wordnet -# cd ../../ -# mkdir models/ -# python bin/init_model.py en lang_data/ corpora/ models/en -#fi From 40def86fdf0817e7a051e8ef1cc35f676a6782a6 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Sat, 9 Mar 2019 02:56:20 +0100 Subject: [PATCH 3/4] Try running flake8 first --- azure-pipelines.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ce200cc11..822606065 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,17 @@ trigger: jobs: +# Perform basic checks for most important errors (syntax etc.) Uses the config +# defined in .flake8 and overwrites the selected codes. +- job: 'Validate' + steps: + - script: | + pip install flake8 + python -m flake8 spacy --count --select=E901,E999,F821,F822,F823 --show-source --statistics + displayName: 'flake8' + - job: 'Test' + dependsOn: 'Validate' strategy: matrix: Python27Linux: @@ -61,11 +71,6 @@ jobs: pip install -r requirements.txt displayName: 'Install dependencies' - # Perform basic checks for most important errors (syntax etc.) Uses the config - # defined in .flake8 and overwrites the selected codes. - - script: python -m flake8 spacy --count --select=E901,E999,F821,F822,F823 --show-source --statistics - displayName: 'flake8' - - script: | python setup.py build_ext --inplace pip install -e . From db0355828895a73a03a20752493aeaa066de8ce8 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Sat, 9 Mar 2019 02:59:29 +0100 Subject: [PATCH 4/4] Fix flake8 --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 822606065..3deca85ce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,12 @@ jobs: # Perform basic checks for most important errors (syntax etc.) Uses the config # defined in .flake8 and overwrites the selected codes. - job: 'Validate' + pool: + vmImage: 'ubuntu-16.04' steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.7' - script: | pip install flake8 python -m flake8 spacy --count --select=E901,E999,F821,F822,F823 --show-source --statistics