Skip to content

Commit 26b83c5

Browse files
author
t.mestan-zade
committed
Merge branch 'develop' into 'master'
0.5.0 Develop to Master See merge request SOLO-band/python-sdk!92
2 parents 6abeac0 + f7b5ce4 commit 26b83c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5714
-6461
lines changed

.flake8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[flake8]
22
max-complexity = 20
3-
max-line-length = 119
3+
max-line-length = 120
4+
extend-ignore = E203

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: pre-commit/[email protected]
2525

2626
- name: Test with pytest
27-
run: pytest tests/test_solo_client.py
27+
run: pytest tests/main --verbosity=1
2828

2929
- name: Build package
3030
run: python -m build

.gitlab-ci.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,42 @@ default:
22
image: python:3.10
33
tags:
44
- docker
5+
- ubuntu
6+
before_script:
7+
- pip install --upgrade pip
8+
- pip install .[dev]
9+
510
stages:
6-
- pre-commit
7-
- tests
11+
- test
812
- build
913
- publish
1014

11-
before_script:
12-
- python -m pip install --upgrade pip
13-
- pip install .[dev]
14-
15-
pre-commit:
16-
stage: pre-commit
17-
script:
18-
- pre-commit run --all-files
19-
20-
tests:
21-
stage: tests
15+
test:
16+
stage: test
17+
rules:
18+
- when: manual
2219
script:
23-
- pytest tests/test_solo_client.py tests/test_data_conversion.py --verbosity=1
20+
- pre-commit run --all-files
21+
- pytest tests/main --verbosity=1
2422

2523
build:
2624
stage: build
25+
rules:
26+
- when: on_success
2727
script:
28-
- python -m build
28+
- python -m build
2929
artifacts:
3030
paths:
3131
- dist/
3232
expire_in: 1d
3333

3434
publish:
3535
stage: publish
36-
when: manual
37-
allow_failure: false
38-
only:
39-
- tags
36+
rules:
37+
- if: $CI_COMMIT_TAG
38+
when: manual
4039
variables:
4140
TWINE_USERNAME: __token__
4241
TWINE_PASSWORD: $PYPI_TOKEN
4342
script:
44-
- twine upload dist/*
43+
- twine upload dist/* --verbose

.isort.cfg

Lines changed: 0 additions & 3 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
repos:
2-
- repo: https://github.com/PyCQA/flake8
3-
rev: 5.0.4
2+
- repo: https://github.com/psf/black
3+
rev: 23.1.0
44
hooks:
5-
- id: flake8
6-
exclude: tests
5+
- id: black
6+
language_version: python3.10
77
- repo: https://github.com/timothycrosley/isort
8-
rev: 5.12.0
8+
rev: 5.11.5
99
hooks:
1010
- id: isort
11-
exclude: tests
11+
- repo: https://github.com/PyCQA/flake8
12+
rev: 5.0.4
13+
hooks:
14+
- id: flake8

0 commit comments

Comments
 (0)