Skip to content

Commit ac97f76

Browse files
committed
update ci and lint
1 parent b33eed3 commit ac97f76

File tree

3 files changed

+23
-117
lines changed

3 files changed

+23
-117
lines changed

.github/workflows/test.yml

+2-88
Original file line numberDiff line numberDiff line change
@@ -9,91 +9,5 @@ on:
99
- master
1010

1111
jobs:
12-
build:
13-
runs-on: ${{ matrix.os }}
14-
continue-on-error: ${{ matrix.experimental }}
15-
timeout-minutes: 15
16-
name: ${{ matrix.name }} (${{ matrix.os }}, ${{ matrix.python-version }})
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
os: [ubuntu-18.04, macos-10.15, windows-2019]
21-
python-version: [3.7, 3.8]
22-
tox_env: [py-orange-released]
23-
experimental: [false]
24-
name: [Released]
25-
include:
26-
- os: windows-latest
27-
python-version: 3.8
28-
tox_env: py-orange-released
29-
experimental: true
30-
name: Windows10
31-
- os: macos-11.0
32-
python-version: 3.8
33-
tox_env: py-orange-released
34-
experimental: true
35-
name: Big Sur
36-
37-
- os: windows-2019
38-
python-version: 3.7
39-
tox_env: py-orange-oldest
40-
experimental: false
41-
name: Oldest
42-
- os: macos-10.15
43-
python-version: 3.7
44-
tox_env: py-orange-oldest
45-
name: Oldest
46-
experimental: false
47-
- os: ubuntu-18.04
48-
python-version: 3.7
49-
tox_env: py-orange-oldest
50-
name: Oldest
51-
experimental: false
52-
53-
- os: windows-2019
54-
python-version: 3.8
55-
tox_env: py-orange-latest
56-
experimental: false
57-
name: Latest
58-
- os: macos-10.15
59-
python-version: 3.8
60-
tox_env: py-orange-latest
61-
experimental: false
62-
name: Latest
63-
- os: ubuntu-18.04
64-
python-version: 3.8
65-
tox_env: py-orange-latest
66-
experimental: false
67-
name: Latest
68-
69-
steps:
70-
- uses: actions/checkout@v2
71-
- name: Set up Python ${{ matrix.python-version }}
72-
uses: actions/setup-python@v2
73-
with:
74-
python-version: ${{ matrix.python-version }}
75-
76-
- name: Install dependencies
77-
run: |
78-
python -m pip install --upgrade pip
79-
python -m pip install --upgrade tox tox-pip-version
80-
81-
- name: Set environment variable
82-
# this step sets QT_QPA_PLATFORM env which is mandatory on Linux and
83-
# it is skipped on Windows since it produces SEGFAULT when WebView used
84-
if: runner.os != 'Windows'
85-
run: |
86-
echo "QT_QPA_PLATFORM=offscreen" >> $GITHUB_ENV
87-
88-
- name: Test with Tox
89-
run: |
90-
tox -e ${{ matrix.tox_env }}
91-
92-
- name: Upload code coverage
93-
if: |
94-
matrix.python-version == '3.8' &&
95-
matrix.os == 'ubuntu-18.04' &&
96-
matrix.tox_env == 'py-orange-released'
97-
run: |
98-
pip install codecov
99-
codecov
12+
test:
13+
uses: biolab/orange-ci-cd/.github/workflows/test-addons.yml@master

pyproject.toml

+15-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@ build-backend = "setuptools.build_meta"
33
requires = ["setuptools", "setuptools-scm", "wheel"]
44

55
[tool.black]
6-
line-length = 119
76
skip_string_normalization = "1"
8-
target-version = ["py36", "py37", "py38"]
7+
8+
[tool.isort]
9+
profile = 'black'
10+
length_sort = 'True'
11+
multi_line_output = 3
12+
force_grid_wrap = 0
13+
use_parentheses = 'True'
14+
include_trailing_comma = 'True'
15+
known_third_party = ['numpy','scipy','pandas','requests']
16+
known_anyqt = 'AnyQt'
17+
known_orange = 'Orange'
18+
known_first_party = 'orangecontrib.bioinformatics'
19+
sections = ['FUTURE','STDLIB','THIRDPARTY','ANYQT','ORANGE','FIRSTPARTY','LOCALFOLDER']
20+
default_section = 'THIRDPARTY'
21+
not_skip = '__init__.py'

setup.cfg

+6-27
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,16 @@ orange.canvas.help =
4646

4747

4848
[flake8]
49-
max-line-length = 119
49+
# Black compatibility
50+
max-line-length = 88
51+
extend-ignore =
52+
# See https://github.com/PyCQA/pycodestyle/issues/373
53+
E203,
5054
max-complexity = 20
51-
# to ensure Black compatibility https://github.com/psf/black/issues/429
5255
ignore =
5356
# Ignore this since we use PyQt5 basically everywhere.
5457
N802,
55-
# https://github.com/psf/black#line-breaks--binary-operators
56-
W503,
57-
# https://github.com/psf/black/issues/1289
58-
E231,
59-
E203,
60-
E266,
61-
E501,
62-
F403,
63-
F401,
64-
W291
58+
6559
exclude =
6660
# Exclude some modules that were ported from legacy add-on.
6761
orangecontrib/bioinformatics/kegg/
@@ -75,18 +69,3 @@ exclude =
7569

7670
ignore-names =
7771
settingsHandler
78-
79-
[isort]
80-
line_length = 119
81-
length_sort = True
82-
multi_line_output=3
83-
force_grid_wrap=0
84-
use_parentheses=True
85-
include_trailing_comma = True
86-
known_third_party=numpy,scipy,pandas,requests
87-
known_anyqt=AnyQt
88-
known_orange=Orange
89-
known_first_party = orangecontrib.bioinformatics
90-
sections=FUTURE,STDLIB,THIRDPARTY,ANYQT,ORANGE,FIRSTPARTY,LOCALFOLDER
91-
default_section = THIRDPARTY
92-
not_skip = __init__.py

0 commit comments

Comments
 (0)