From dbcc908525a8f95e0c9934a45d80295ee440825b Mon Sep 17 00:00:00 2001 From: Joey den Broeder Date: Thu, 22 Feb 2024 20:46:22 +0100 Subject: [PATCH 1/3] Bump dependencies Also resolves a few ruff-related deprecations --- Makefile | 6 +++--- pyproject.toml | 2 +- requirements-dev.in | 10 +++++----- requirements.in | 10 +++++----- requirements.txt | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 64a2ed87b..dfba7c789 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ TEST_FILES ?= tests/integration/test_*.py VERSION ?= $(shell git tag --list --sort=-version:refname "v*" | head -n 1) COMMIT ?= $(shell git rev-parse --short HEAD) -PIP_TOOLS_VERSION ?= 7.3.0 -PIP_VERSION ?= 23.3.1 +PIP_TOOLS_VERSION ?= 7.4.0 +PIP_VERSION ?= 24.0 PYTHON_PLATFORM ?= manylinux2014_x86_64 PYTHON_VERSION ?= 310 @@ -104,5 +104,5 @@ format: .PHONY: lint lint: - ruff check buildpack lib/m2ee/* tests/*/ --show-source + ruff check buildpack lib/m2ee/* tests/*/ --output-format=full pylint --disable=W,R,C buildpack lib/m2ee/* tests/*/ diff --git a/pyproject.toml b/pyproject.toml index e73e06c23..a9a12f25e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ exclude = [ "tests/unit/test_databroker.py" ] -[tool.ruff.mccabe] +[tool.ruff.lint.mccabe] # Unlike Flake8, default to a complexity level of 10. max-complexity = 10 diff --git a/requirements-dev.in b/requirements-dev.in index dbd7bb33a..d76475d0c 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,11 +1,11 @@ click==8.1.7 idna==3.6 -pytest==7.4.3 -pytest-timer==0.0.11 +pytest==8.0.1 +pytest-timer==1.0.0 pytest-timeout==2.2.0 -pylint==3.0.2 -pyopenssl==23.3.0 +pylint==3.0.3 +pyopenssl==24.0.0 randomname==0.2.1 requests-mock==1.11.0 -ruff==0.1.6 +ruff==0.2.2 parameterized==0.9.0 diff --git a/requirements.in b/requirements.in index 230527d90..3236c03bd 100644 --- a/requirements.in +++ b/requirements.in @@ -1,11 +1,11 @@ backoff==2.2.1 -certifi==2023.11.17 -cryptography==41.0.7 -distro==1.8.0 +certifi==2024.2.2 +cryptography==42.0.4 +distro==1.9.0 httplib2==0.22.0 -jinja2==3.1.2 +jinja2==3.1.3 omegaconf==2.3.0 psycopg2-binary==2.9.9 pyyaml==6.0.1 requests==2.31.0 -urllib3==2.1.0 \ No newline at end of file +urllib3==2.2.1 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8c9b7c45e..6d152a1b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ antlr4-python3-runtime==4.9.3 # via omegaconf backoff==2.2.1 # via -r requirements.in -certifi==2023.11.17 +certifi==2024.2.2 # via # -r requirements.in # requests @@ -16,15 +16,15 @@ cffi==1.14.4 # via cryptography charset-normalizer==2.0.3 # via requests -cryptography==41.0.7 +cryptography==42.0.4 # via -r requirements.in -distro==1.8.0 +distro==1.9.0 # via -r requirements.in httplib2==0.22.0 # via -r requirements.in idna==2.8 # via requests -jinja2==3.1.2 +jinja2==3.1.3 # via -r requirements.in markupsafe==2.0.1 # via jinja2 @@ -42,7 +42,7 @@ pyyaml==6.0.1 # omegaconf requests==2.31.0 # via -r requirements.in -urllib3==2.1.0 +urllib3==2.2.1 # via # -r requirements.in # requests From 7b9b709a993b474e4e5d7bf75889c53f14c39b6a Mon Sep 17 00:00:00 2001 From: Joey den Broeder Date: Thu, 22 Feb 2024 21:13:35 +0100 Subject: [PATCH 2/3] Test Dependabot --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..b3c537517 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: "develop" + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "weekly" + target-branch: "develop" From 628b76704c3d4ad2506e028b08aef742a7bc534a Mon Sep 17 00:00:00 2001 From: Joey den Broeder Date: Thu, 22 Feb 2024 21:53:10 +0100 Subject: [PATCH 3/3] Bump GitHub Actions Node 16 -> Node 20 --- .github/workflows/build.yml | 7 ++++--- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 8 ++++---- .github/workflows/veracodescan.yml | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82e4493f0..8c1517731 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: echo "::set-output name=current_version_tag::${CURRENT_VERSION_TAG}" - name: Auto-generate future version id: autogenerate-version - uses: paulhatch/semantic-version@v5.3.0 + uses: paulhatch/semantic-version@v5.4.0 with: tag_prefix: "v" major_pattern: "(major)" @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.6 cache: pip @@ -61,7 +61,8 @@ jobs: - name: Build run: VERSION=${{ needs.get-version.outputs.version_tag }} make build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist path: dist + overwrite: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 99522ce90..ffc23a4a8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: dist path: dist diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6ea8ed31..62f14a3b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: set-matrix name: Set up test matrix run: | @@ -59,13 +59,13 @@ jobs: TEST_MEMORY: 1G TEST_PROCESSES: 1 steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 with: name: dist path: dist - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.6 cache: pip diff --git a/.github/workflows/veracodescan.yml b/.github/workflows/veracodescan.yml index ad54e905c..83e253ed3 100644 --- a/.github/workflows/veracodescan.yml +++ b/.github/workflows/veracodescan.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: dist path: dist