From 98c0d4d817ae6d879042e5c29060b9122f279aa5 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:33:43 +0200 Subject: [PATCH 1/8] [appveyor] Use pytest --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9ae63d2..e4b6939 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,8 @@ init: build: false install: - - python -m pip install odml xmltodict + - python -m pip install odml xmltodict pytest test_script: - python --version - - python setup.py test + - pytest From f854497ba8c5681783385611944e9da19a36471b Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:33:56 +0200 Subject: [PATCH 2/8] [appveyor] Add python 3.9 --- appveyor.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index e4b6939..1e081c1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,6 +13,9 @@ environment: - PYTHON: "C:\\Python38" PYVER: 3 BITS: 32 + - PYTHON: "C:\\Python39" + PYVER: 3 + BITS: 32 - PYTHON: "C:\\Python36-x64" PYVER: 3 BITS: 64 @@ -22,6 +25,9 @@ environment: - PYTHON: "C:\\Python38-x64" PYVER: 3 BITS: 64 + - PYTHON: "C:\\Python39-x64" + PYVER: 3 + BITS: 64 init: - "ECHO %PYTHON% %vcvars% (%bits%)" From 63efdc1d577154ae027cc75abf3720caf1b5d15f Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:39:02 +0200 Subject: [PATCH 3/8] [gh-actions] Add workflow --- .github/workflows/run-tests.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml new file mode 100644 index 0000000..e89c3cb --- /dev/null +++ b/.github/workflows/run-tests.yml @@ -0,0 +1,30 @@ +name: run-tests +on: + push: + branches: + - master + - dev + pull_request: + branches: + - master +jobs: + tests: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: [3.6, 3.7, 3.8, 3.9] + steps: + - uses: actions/checkout@v2 + - name: Setup Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Display Python version + run: python -c "import sys; print(sys.version)" + - name: Install dependencies + run: | + python setup.py install + pip install pytest + - name: Run tests + run: pytest From 1a9780c4cf072bd53f2b09e3eb971a8b07f31f5e Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:52:32 +0200 Subject: [PATCH 4/8] [appveyor] Use pytest via python module --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1e081c1..6c33e0e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,4 +41,4 @@ install: test_script: - python --version - - pytest + - python -m pytest From 021e0bc964af224fc2101ea3e5fc8a2cd8062fd5 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:53:14 +0200 Subject: [PATCH 5/8] [README] Replace CI badges Replace travis with gh-actions badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ceb08f5..ff12eda 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Travis build](https://travis-ci.org/G-Node/odmltools.svg?branch=master) +[![gh actions tests](https://github.com/G-Node/odmltools/workflows/run-tests/badge.svg?branch=master)](https://github.com/G-Node/odmltools/actions) [![Build status](https://ci.appveyor.com/api/projects/status/oo5lxr6h4pfc9ly7/branch/master?svg=true)](https://ci.appveyor.com/project/G-Node/odmltools/branch/master) ![Test coverage](https://coveralls.io/repos/github/G-Node/odmltools/badge.svg?branch=master) [![PyPI version](https://img.shields.io/pypi/v/odmltools.svg)](https://pypi.org/project/odmltools/) From 4260e2e1f9ba9b27f754d2a3333354c2dd5976e0 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 16:54:44 +0200 Subject: [PATCH 6/8] [CI] Thank you and goodbye travis --- .travis.yml | 71 ----------------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 31bc32f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -sudo: required -dist: trusty - -language: python - -matrix: - include: - - os: linux - python: "3.5" - - os: linux - python: "3.6" - env: COVERALLS=1 - - os: linux - python: "3.7" - dist: xenial - - os: linux - python: "3.8" - dist: xenial - - - os: osx - language: generic - env: - - OSXENV=3.6.0 - - os: osx - language: generic - env: - - OSXENV=3.7.0 - - os: osx - language: generic - env: - - OSXENV=3.8.0 - -install: - - export PYVER=${TRAVIS_PYTHON_VERSION:0:1} - - export PYCMD=python3; - - export PIPCMD=pip3; - - - if [ $COVERALLS = 1 ]; then - $PIPCMD install --upgrade coveralls; - fi; - - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew update; - brew install pyenv; - brew upgrade pyenv; - brew install pyenv-virtualenv; - eval "$(pyenv init -)"; - eval "$(pyenv virtualenv-init -)"; - pyenv install $OSXENV; - pyenv virtualenv $OSXENV venv; - pyenv activate venv; - which python; - python --version; - which pip; - export PYCMD=python; - export PIPCMD=pip; - fi; - - - $PIPCMD install xmltodict - -script: - - which $PYCMD - - $PYCMD setup.py build - - if [ $COVERALLS = 1 ]; then - coverage${PYVER} run --source=odmltools setup.py test && coverage${PYVER} report -m; - else - $PYCMD setup.py test; - fi; - -after_success: -- if [ $COVERALLS = 1 ]; then coveralls; fi; From e2946ffe24bca74524c2b6f9403ffaa502466959 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 17:00:28 +0200 Subject: [PATCH 7/8] [README] Add coveralls link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff12eda..2bfa1e0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![gh actions tests](https://github.com/G-Node/odmltools/workflows/run-tests/badge.svg?branch=master)](https://github.com/G-Node/odmltools/actions) [![Build status](https://ci.appveyor.com/api/projects/status/oo5lxr6h4pfc9ly7/branch/master?svg=true)](https://ci.appveyor.com/project/G-Node/odmltools/branch/master) -![Test coverage](https://coveralls.io/repos/github/G-Node/odmltools/badge.svg?branch=master) +[![Test coverage](https://coveralls.io/repos/github/G-Node/odmltools/badge.svg?branch=master)](https://coveralls.io/github/G-Node/odmltools) [![PyPI version](https://img.shields.io/pypi/v/odmltools.svg)](https://pypi.org/project/odmltools/) # odmltools From 8977de711317d835a7fd7b75e92de5f0f0250240 Mon Sep 17 00:00:00 2001 From: "M. Sonntag" Date: Mon, 21 Jun 2021 17:09:57 +0200 Subject: [PATCH 8/8] [appveyor] Remove py 3.9 --- appveyor.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6c33e0e..6adb64b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,9 +13,6 @@ environment: - PYTHON: "C:\\Python38" PYVER: 3 BITS: 32 - - PYTHON: "C:\\Python39" - PYVER: 3 - BITS: 32 - PYTHON: "C:\\Python36-x64" PYVER: 3 BITS: 64 @@ -25,9 +22,6 @@ environment: - PYTHON: "C:\\Python38-x64" PYVER: 3 BITS: 64 - - PYTHON: "C:\\Python39-x64" - PYVER: 3 - BITS: 64 init: - "ECHO %PYTHON% %vcvars% (%bits%)"