From 0039c19eb9d73ce98712730899b89fa2d661db6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:45:19 +0000 Subject: [PATCH 1/3] chore(deps): add renovate.json Signed-off-by: JP-Ellis --- .github/renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/renovate.json diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000000..41784f53e2 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,9 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:base"], + "pre-commit": { + "enabled": true + }, + "prHourlyLimit": 0, + "prConcurrentLimit": 0 +} From fd4e23df9cbb4f8741ca05c40b6e80ba24a8fc1d Mon Sep 17 00:00:00 2001 From: JP-Ellis Date: Fri, 20 Oct 2023 12:50:30 +1100 Subject: [PATCH 2/3] chore(deps): update deps and set guideline As Python dependencies are shared within a virtual environment and the latest version is installed by default (as there is no lock file), there is benefit to specifying a very broad range of compatible versions. Signed-off-by: JP-Ellis --- pyproject.toml | 52 +++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e3e13f942b..8a0878cd04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,14 +27,20 @@ classifiers = [ ] requires-python = ">=3.8,<4.0" + +# Dependencies of Pact Python should be specified using the broadest range +# compatible version unless: +# +# - A specific feature is required in a new minor release +# - A minor version address vulnerability which directly impacts Pact Python dependencies = [ - "click ~= 8.1", - "fastapi ~= 0.103", - "psutil ~= 5.9", - "requests ~= 2.31", - "six ~= 1.16", - "typing-extensions ~= 4.8 ; python_version < '3.10'", - "uvicorn ~= 0.13", + "click ~= 8.0", + "fastapi ~= 0.0", + "psutil ~= 5.0", + "requests ~= 2.0", + "six ~= 1.0", + "typing-extensions ~= 4.0 ; python_version < '3.10'", + "uvicorn ~= 0.0", ] [project.urls] @@ -48,28 +54,30 @@ dependencies = [ pact-verifier = "pact.cli.verify:main" [project.optional-dependencies] +# Linting and formatting tools use a more narrow specification to ensure +# developper consistency. All other dependencies are as above. types = [ - "mypy ~= 1.1", - "types-cffi ~= 1.15", - "types-requests ~= 2.31", + "mypy ~= 1.6.0", + "types-cffi ~= 1.0", + "types-requests ~= 2.0", ] test = [ - "aiohttp[speedups] ~= 3.8", - "coverage[toml] ~= 7.3", - "flask[async] ~= 2.3", - "httpx ~= 0.24", - "mock ~= 5.1", - "pytest ~= 7.4", - "pytest-asyncio ~= 0.21", - "pytest-cov ~= 4.1", - "testcontainers ~= 3.7", - "yarl ~= 1.9", + "aiohttp[speedups] ~= 3.0", + "coverage[toml] ~= 7.0", + "flask[async] ~= 3.0", + "httpx ~= 0.0", + "mock ~= 5.0", + "pytest ~= 7.0", + "pytest-asyncio ~= 0.0", + "pytest-cov ~= 4.0", + "testcontainers ~= 3.0", + "yarl ~= 1.0", ] dev = [ "pact-python[types]", "pact-python[test]", - "black ~= 23.7", - "ruff ~= 0.0", + "black ~= 23.10.0", + "ruff ~= 0.1.0", ] ################################################################################ From c03f67d2f05a8d779de6b15e133d5b067e8909c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:48:21 +0000 Subject: [PATCH 3/3] chore(deps): update dependencies --- .github/workflows/build.yml | 4 ++-- .github/workflows/test.yml | 2 +- .pre-commit-config.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe1c559cf0..aa05b14acf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Create wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_ARCHS: ${{ matrix.archs }} @@ -88,7 +88,7 @@ jobs: platforms: arm64 - name: Create wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_ARCHS: ${{ matrix.archs }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13ecd07be5..af425ec094 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: - name: Upload coverage # TODO: Configure code coverage monitoring if: false && matrix.python-version == env.STABLE_PYTHON_VERSION && matrix.os == 'ubuntu-latest' - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 88eb347594..f2a9f2db7d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_install_hook_types: repos: # Generic hooks that apply to a lot of files - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -38,7 +38,7 @@ repos: stages: [pre-push] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.289 + rev: v0.1.1 hooks: - id: ruff # Exclude python files in pact/** and tests/**, except for the @@ -48,7 +48,7 @@ repos: stages: [pre-push] - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.10.0 hooks: - id: black # Exclude python files in pact/** and tests/**, except for the @@ -57,7 +57,7 @@ repos: stages: [pre-push] - repo: https://github.com/commitizen-tools/commitizen - rev: 3.8.2 + rev: v3.12.0 hooks: - id: commitizen stages: [commit-msg]