Skip to content

Commit b1b8c60

Browse files
authored
Merge pull request #22 from oracle/rigebha/fix-build
fix: install uv via pip instead of GH action
2 parents 95da59a + c5e18d5 commit b1b8c60

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,8 @@ jobs:
2222
with:
2323
python-version: '3.13'
2424

25-
- name: Install uv
26-
uses: astral-sh/setup-uv@v6
27-
with:
28-
version: "0.8.19"
29-
30-
- name: Install tomlq
31-
run: pip install tomlq
25+
- name: Install requirements
26+
run: pip install -r requirements-dev.txt
3227

3328
- name: Update __init__.py
3429
working-directory: src/${{ matrix.directory }}

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ pytest
33
pytest-asyncio
44
tox
55
tomlq
6+
uv

tox.ini

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
[tox]
22
isolated_build = True
33

4+
[isort]
5+
profile = black
6+
extend_skip =
7+
src/dbtools-mcp-server/,
8+
src/mysql-mcp-server/,
9+
src/oci-pricing-mcp-server
10+
411
[flake8]
512
; to match Black
613
max-line-length = 110
14+
extend-exclude =
15+
.venv,
16+
src/dbtools-mcp-server,
17+
src/mysql-mcp-server,
18+
src/oci-pricing-mcp-server
719

820
[testenv]
921
deps =
@@ -15,12 +27,12 @@ setenv =
1527

1628
[testenv:lint]
1729
commands =
18-
isort -c --profile=black {posargs:{toxinidir}}
19-
black --check {posargs:{toxinidir}}
20-
flake8 --exclude .git,.venv,.tox,src/dbtools-mcp-server/,src/mysql-mcp-server/,src/oci-pricing-mcp-server {posargs:{toxinidir}}
30+
isort -c {posargs:{toxinidir}}
31+
black --force-exclude 'src/dbtools-mcp-server|mysql-mcp-server|oci-pricing-mcp-server' --check {posargs:{toxinidir}}
32+
flake8 {posargs:{toxinidir}}
2133

2234
[testenv:format]
2335
commands =
24-
isort --profile=black {posargs:{toxinidir}}
25-
black {posargs:{toxinidir}}
26-
flake8 --exclude .git,.venv,.tox,src/dbtools-mcp-server/,src/mysql-mcp-server/,src/oci-pricing-mcp-server {posargs:{toxinidir}}
36+
isort {posargs:{toxinidir}}
37+
black --force-exclude 'src/dbtools-mcp-server|mysql-mcp-server|oci-pricing-mcp-server' {posargs:{toxinidir}}
38+
flake8 {posargs:{toxinidir}}

0 commit comments

Comments
 (0)