From c5e18d5d21506f33240e9978929b420309c00d66 Mon Sep 17 00:00:00 2001
From: Richard Gebhardt <richard.gebhardt@oracle.com>
Date: Fri, 10 Oct 2025 11:48:47 -0400
Subject: [PATCH] fix: install uv via pip instead of GH action and exclude
 servers

Signed-off-by: Richard Gebhardt <richard.gebhardt@oracle.com>
---
 .github/workflows/build.yml |  9 ++-------
 requirements-dev.txt        |  1 +
 tox.ini                     | 24 ++++++++++++++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd84102..3ed1f15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,13 +22,8 @@ jobs:
         with:
           python-version: '3.13'
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: "0.8.19"
-
-      - name: Install tomlq
-        run: pip install tomlq
+      - name: Install requirements
+        run: pip install -r requirements-dev.txt
 
       - name: Update __init__.py
         working-directory: src/${{ matrix.directory }}
diff --git a/requirements-dev.txt b/requirements-dev.txt
index f89b656..ac0f91d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,3 +3,4 @@ pytest
 pytest-asyncio
 tox
 tomlq
+uv
diff --git a/tox.ini b/tox.ini
index 0433090..1fa30d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,21 @@
 [tox]
 isolated_build = True
 
+[isort]
+profile = black
+extend_skip =
+    src/dbtools-mcp-server/,
+    src/mysql-mcp-server/,
+    src/oci-pricing-mcp-server
+
 [flake8]
 ; to match Black
 max-line-length = 110
+extend-exclude =
+    .venv,
+    src/dbtools-mcp-server,
+    src/mysql-mcp-server,
+    src/oci-pricing-mcp-server
 
 [testenv]
 deps =
@@ -15,12 +27,12 @@ setenv =
 
 [testenv:lint]
 commands =
-  isort -c --profile=black {posargs:{toxinidir}}
-  black --check {posargs:{toxinidir}}
-  flake8 --exclude .git,.venv,.tox,src/dbtools-mcp-server/,src/mysql-mcp-server/,src/oci-pricing-mcp-server {posargs:{toxinidir}}
+  isort -c {posargs:{toxinidir}}
+  black --force-exclude 'src/dbtools-mcp-server|mysql-mcp-server|oci-pricing-mcp-server' --check {posargs:{toxinidir}}
+  flake8 {posargs:{toxinidir}}
 
 [testenv:format]
 commands =
-  isort --profile=black {posargs:{toxinidir}}
-  black {posargs:{toxinidir}}
-  flake8 --exclude .git,.venv,.tox,src/dbtools-mcp-server/,src/mysql-mcp-server/,src/oci-pricing-mcp-server {posargs:{toxinidir}}
+  isort {posargs:{toxinidir}}
+  black --force-exclude 'src/dbtools-mcp-server|mysql-mcp-server|oci-pricing-mcp-server' {posargs:{toxinidir}}
+  flake8 {posargs:{toxinidir}}