From 0fb35a2624c415b61d7375c3a221c8eda6b5057a Mon Sep 17 00:00:00 2001 From: Barklee sanders Date: Sun, 11 May 2025 20:16:54 -0700 Subject: [PATCH] Fix workflow issues: resolve pydantic dependency conflict, fix ruff config, and improve dependency installation --- .github/workflows/python-app.yml | 2 +- .ruff.toml | 2 +- requirements.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 62cf96f..b1976f1 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt || true + pip install -r requirements.txt pip install pytest pip install pytest-cov pip install ruff diff --git a/.ruff.toml b/.ruff.toml index 918378c..01950a1 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -1,4 +1,4 @@ -[tool.ruff] +[ruff] all = true select = ["E", "F", "I", "B", "C", "Q", "UP"] ignore = ["E501"] diff --git a/requirements.txt b/requirements.txt index 4650dc9..ca2f716 100644 --- a/requirements.txt +++ b/requirements.txt @@ -178,8 +178,8 @@ pyasn1==0.6.1 pyasn1_modules==0.4.2 pycodestyle==2.13.0 pycparser==2.22 -pydantic==2.5.3 -pydantic_core==2.10.1 +pydantic>=2.5.3,<3.0.0 +pydantic_core>=2.10,<3.0.0 pyflakes==3.3.2 Pygments==2.19.1 pylint==3.3.6