Skip to content

Commit 2af163d

Browse files
authored
Merge pull request #42 from PySATL/ci/update-action-version-and-migrate-to-Ruff
Ci/update action version and migrate to ruff
2 parents d7b56dd + 8106186 commit 2af163d

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

.github/workflows/main.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ jobs:
66
main:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: actions/setup-python@v3
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-python@v5
1111
with:
1212
python-version: 3.12.4
1313
cache: "pip"
14-
- name: "installation"
14+
- name: "Install dependencies"
1515
run: |
1616
pip install -r requirements.txt -r requirements.dev.txt
17-
- name: "black"
18-
run: black . --check --diff --color
19-
- name: "isort"
20-
run: isort . --check --diff
21-
- name: "mypy"
17+
- name: "Ruff checks"
18+
continue-on-error: true
19+
run: ruff check . --output-format=full --diff
20+
- name: "Format check"
21+
continue-on-error: true
22+
run: ruff format . --check --diff
23+
- name: "Mypy"
2224
run: mypy
23-
- name: "pytests"
25+
- name: "Pytest"
2426
run: python -m pytest -v -m ci

pyproject.toml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
[metadata]
2-
name = "PySATL_NMVM_Module "
2+
name = "PySATL_NMVM_Module"
33
author = "Engelsgeduld, Andreev Sergey, Sazonova Irina"
44
url = "https://github.com/Engelsgeduld/PySATL_NMVM_Module"
55

6-
[tool.isort]
7-
profile = "black"
8-
line_length = 120
9-
10-
[tool.black]
6+
[tool.ruff]
117
line-length = 120
8+
target-version = "py312"
9+
extend-include = ["*.ipynb"]
10+
format = { quote-style = "double" }
11+
12+
[tool.ruff.lint]
13+
select = [
14+
"E", "F", "W", "I",
15+
"UP", "C90",
16+
"NPY", "PD", "RUF"
17+
]
18+
ignore-init-module-imports = true
1219

1320
[tool.mypy]
1421
files = ["src"]
22+
exclude = ".*\\.ipynb"
1523
install_types = "True"
1624
non_interactive = "True"
1725
disallow_untyped_defs = "True"
@@ -27,6 +35,4 @@ no_implicit_optional = "False"
2735
[tool.pytest.ini_options]
2836
testpaths = ["tests"]
2937
addopts = ["--color=yes", "-s"]
30-
markers = [
31-
"ci: test that run on ci",
32-
]
38+
markers = ["ci: test that run on ci"]

requirements.dev.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
mypy~=1.10.0
2-
black~=24.4.2
3-
isort~=5.13.2
1+
ruff~=0.4.4
2+
jupyter~=1.0.0
43
pytest~=7.4.4
5-
scikit-learn~=1.5.1
4+
mypy~=1.10.0
5+
ipykernel~=6.29.4

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ sympy~=1.13.1
44
matplotlib~=3.8.4
55
numba~=0.59.0
66
mpmath~=1.3.0
7-
sympy~=1.13.1
7+
scikit-learn>=1.0.0

0 commit comments

Comments
 (0)