diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4af11d2..ab30080 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Install dev. dependencies run: |- apt-get update - apt-get install -y git make python3 python3-poetry --no-install-recommends + apt-get install -y git make python3 --no-install-recommends poetry install --only lint,test - name: Run linters to enforce code style run: poetry run make lint diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index d985109..a496c3c 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -17,9 +17,9 @@ jobs: with: fetch-depth: 0 - name: Install container build dependencies - run: sudo apt install pipx && pipx install poetry + run: sudo apt install pipx && pipx install uv - name: Build container image - run: python3 ./install/common/build-image.py --runtime docker --no-save + run: uv run ./install/common/build-image.py --runtime docker --no-save - name: Get image tag id: tag run: | diff --git a/pyproject.toml b/pyproject.toml index e5e80c8..ef9ca90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,6 @@ package = [ "doit", ] -[project.optional-dependencies] # Dependencies required for testing the code. test = [ "pytest", diff --git a/uv.lock b/uv.lock index 80aaf1b..1aa4574 100644 --- a/uv.lock +++ b/uv.lock @@ -293,17 +293,6 @@ dependencies = [ { name = "requests" }, ] -[package.optional-dependencies] -test = [ - { name = "pytest" }, - { name = "pytest-cov" }, - { name = "pytest-mock" }, - { name = "pytest-qt" }, - { name = "pytest-rerunfailures" }, - { name = "pytest-subprocess" }, - { name = "strip-ansi" }, -] - [package.dev-dependencies] container = [ { name = "pymupdf" }, @@ -327,6 +316,15 @@ package = [ { name = "pywin32" }, { name = "setuptools" }, ] +test = [ + { name = "pytest" }, + { name = "pytest-cov" }, + { name = "pytest-mock" }, + { name = "pytest-qt" }, + { name = "pytest-rerunfailures" }, + { name = "pytest-subprocess" }, + { name = "strip-ansi" }, +] [package.metadata] requires-dist = [ @@ -337,15 +335,8 @@ requires-dist = [ { name = "packaging" }, { name = "pymupdf", specifier = ">=1.23.3,<1.24.0" }, { name = "pyside6", specifier = ">=6.7.1,<6.8" }, - { name = "pytest", marker = "extra == 'test'" }, - { name = "pytest-cov", marker = "extra == 'test'" }, - { name = "pytest-mock", marker = "extra == 'test'" }, - { name = "pytest-qt", marker = "extra == 'test'" }, - { name = "pytest-rerunfailures", marker = "extra == 'test'" }, - { name = "pytest-subprocess", marker = "extra == 'test'" }, { name = "pyxdg", marker = "sys_platform == 'linux'" }, { name = "requests" }, - { name = "strip-ansi", marker = "extra == 'test'" }, ] [package.metadata.requires-dev] @@ -367,6 +358,15 @@ package = [ { name = "pywin32" }, { name = "setuptools" }, ] +test = [ + { name = "pytest" }, + { name = "pytest-cov" }, + { name = "pytest-mock" }, + { name = "pytest-qt" }, + { name = "pytest-rerunfailures" }, + { name = "pytest-subprocess" }, + { name = "strip-ansi" }, +] [[package]] name = "dmgbuild"