Skip to content

Commit

Permalink
Jaka's simplification from orange3-associate
Browse files Browse the repository at this point in the history
  • Loading branch information
markotoplak committed Feb 16, 2021
1 parent dae7a07 commit 175c636
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 175 deletions.
4 changes: 0 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[run]
parallel = 1
concurrency =
multiprocessing
thread
source =
orangecontrib.spectroscopy
omit =
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/linux_workflow.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/macos_workflow.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/miscellaneous_workflow.yml

This file was deleted.

75 changes: 75 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Test

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
python-version: [3.7, 3.8]
tox_env: [py-orange-released]
experimental: [false]
include:
- os: windows-latest
python-version: 3.7
tox_env: py-orange-oldest
experimental: false
- os: macOS-latest
python-version: 3.7
tox_env: py-orange-oldest
experimental: false
- os: ubuntu-latest
python-version: 3.7
tox_env: py-orange-oldest
experimental: false

- os: windows-latest
python-version: 3.8
tox_env: py-orange-latest
experimental: false
- os: macOS-latest
python-version: 3.8
tox_env: py-orange-latest
experimental: false
- os: ubuntu-latest
python-version: 3.8
tox_env: py-orange-latest
experimental: false

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade tox tox-pip-version
- name: Test with Tox
run: |
tox -e ${{ matrix.tox_env }}
env:
QT_QPA_PLATFORM: offscreen

- name: Upload code coverage
if: |
matrix.python-version == '3.8' &&
matrix.os == 'ubuntu-latest' &&
matrix.tox_env == 'py-orange-released'
run: |
pip install codecov
codecov
32 changes: 0 additions & 32 deletions .github/workflows/windows_workflow.yml

This file was deleted.

3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ def include_documentation(local_dir, install_dir):
'pillow',
'lmfit',
],
extras_require={
'test': ['coverage']
},
entry_points=ENTRY_POINTS,
keywords=KEYWORDS,
namespace_packages=['orangecontrib'],
Expand Down
45 changes: 16 additions & 29 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
envlist =
py{36,37,38}-orange{325,Release}
future
coverage
py{37,38}-orange-{oldest, latest, released}
pylint-ci
skip_missing_interpreters = true
isolated_build = true
minversion = 3.6.0

[testenv]
# must use latest pip (version 20.3.1 enables Big Sur support - https://github.com/pypa/pip/issues/9138)
pip_version = pip
extras = test
passenv = *
# we MUST changedir to avoid installed being shadowed by working dir
Expand All @@ -22,42 +21,30 @@ setenv =
# Need this otherwise unittest installs a warning filter that overrides
# our desire to have OrangeDeprecationWarnings raised
PYTHONWARNINGS=module
# set coverage output and project config
COVERAGE_FILE = {toxinidir}/.coverage
COVERAGE_RCFILE = {toxinidir}/.coveragerc
deps =
pyqt5==5.12.*
pyqtwebengine==5.12.*
orange325: orange3==3.25.0
orange325: orange-canvas-core==0.1.9
orange325: orange-widget-base==4.5.0
orange325: scikit-learn~=0.22.0
orangeRelease: orange3
oldest: orange3==3.25.0
# use newer canvas-core and widget-base to avoid segfaults on windows
oldest: orange-canvas-core==0.1.9 ; sys_platform != 'win32'
oldest: orange-canvas-core==0.1.15 ; sys_platform == 'win32'
oldest: orange-widget-base==4.5.0 ; sys_platform != 'win32'
oldest: orange-widget-base==4.9.0 ; sys_platform == 'win32'
oldest: scikit-learn~=0.22.0
latest: git+git://github.com/biolab/orange3.git#egg=orange3
latest: git+git://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core
latest: git+git://github.com/biolab/orange-widget-base.git#egg=orange-widget-base
opusFC

commands_pre =
# Verify installed packages have compatible dependencies
pip check
# freeze environment
pip freeze
commands =
python -m unittest orangecontrib.spectroscopy.tests

[testenv:future]
deps =
{[testenv]deps}
git+git://github.com/biolab/orange3.git#egg=orange3
git+git://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core
git+git://github.com/biolab/orange-widget-base.git#egg=orange-widget-base

[testenv:coverage]
setenv =
{[testenv]setenv}
COVERAGE_FILE = {toxinidir}/.coverage
COVERAGE_RCFILE = {toxinidir}/.coveragerc
deps =
{[testenv]deps}
coverage
commands =
coverage run -m unittest orangecontrib.spectroscopy.tests
coverage combine
coverage report

[testenv:pylint-ci]
Expand Down

0 comments on commit 175c636

Please sign in to comment.