From 2f61db10115ad113fbd53c0a34d74527ce88e6c5 Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Tue, 14 Apr 2026 10:18:15 +0530 Subject: [PATCH 1/4] chore: upgrade GitHub Actions versions --- .github/workflows/codecov.yml | 4 ++-- .github/workflows/lint-pr.yml | 2 +- .github/workflows/lint.yml | 8 ++++---- .github/workflows/publish-to-live-pypi.yml | 4 ++-- .github/workflows/publish-to-test-pypi.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index ab8f847..f17d620 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -23,7 +23,7 @@ jobs: ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: '2' @@ -38,4 +38,4 @@ jobs: coverage run setup.py test - name: Upload Coverage to Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v6 diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml index e332f1c..cacd400 100644 --- a/.github/workflows/lint-pr.yml +++ b/.github/workflows/lint-pr.yml @@ -15,6 +15,6 @@ jobs: name: Validate PR title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@v5 + - uses: amannn/action-semantic-pull-request@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5f20b92..e3a3b4c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.9 - name: Install flake8 @@ -29,9 +29,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.9 diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index 8b6b55f..9b37134 100644 --- a/.github/workflows/publish-to-live-pypi.yml +++ b/.github/workflows/publish-to-live-pypi.yml @@ -15,9 +15,9 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Python 3.12 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.12 diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 1a3d290..4c657ff 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@master - name: Set up Python 3.9 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.9 From da676a80c08d0187c5c5def85367c45d5cc2f188 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 14 Apr 2026 08:15:43 +0200 Subject: [PATCH 2/4] Update codecov.yml --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f17d620..c004087 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -19,7 +19,7 @@ jobs: dj42_cms311.txt, ] os: [ - ubuntu-20.04, + ubuntu-24.04, ] steps: From c5e52f267c81585a930fccdb3bff5187a206d309 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 1 May 2026 14:02:53 +0200 Subject: [PATCH 3/4] Merge master into pr (#178) * fix: Pin djangokcms-link dependency to < 5 (#175) * Update setup.py * Update __init__.py * Update CHANGELOG.rst * Bump virtualenv from 20.16.4 to 20.26.6 (#176) Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.16.4 to 20.26.6. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/virtualenv/compare/20.16.4...20.26.6) --- updated-dependencies: - dependency-name: virtualenv dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- CHANGELOG.rst | 5 +++++ djangocms_bootstrap4/__init__.py | 2 +- requirements.txt | 12 ++++++++---- setup.py | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0f7f424..b0a2c87 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog ========= +3.0.3 2025-12-01 +================ + +* fix: Pin djangcms-link dependency to < 5 + 3.0.2 2024-07-24 ================ diff --git a/djangocms_bootstrap4/__init__.py b/djangocms_bootstrap4/__init__.py index da4039b..d298347 100644 --- a/djangocms_bootstrap4/__init__.py +++ b/djangocms_bootstrap4/__init__.py @@ -1 +1 @@ -__version__ = '3.0.2' +__version__ = '3.0.3' diff --git a/requirements.txt b/requirements.txt index ddd458c..b08250a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,9 +12,9 @@ cfgv==3.3.1 # via pre-commit click==8.1.3 # via pip-tools -distlib==0.3.6 +distlib==0.3.9 # via virtualenv -filelock==3.8.0 +filelock==3.16.1 # via virtualenv identify==2.5.3 # via pre-commit @@ -26,7 +26,7 @@ pep517==0.13.0 # via build pip-tools==6.8.0 # via -r requirements.in -platformdirs==2.5.2 +platformdirs==4.3.6 # via virtualenv pre-commit==2.20.0 # via -r requirements.in @@ -36,7 +36,11 @@ pyyaml==6.0 # via pre-commit toml==0.10.2 # via pre-commit -virtualenv==20.16.4 +tomli==2.2.1 + # via + # build + # pep517 +virtualenv==20.26.6 # via pre-commit wheel==0.38.1 # via diff --git a/setup.py b/setup.py index 44c2572..a545a67 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 'djangocms-attributes-field>=1', 'djangocms-text-ckeditor>=3.1.0', 'djangocms-icon>=1.4.0', - 'djangocms-link>=2.5.0', + 'djangocms-link>=2.5.0,<5', 'djangocms-picture>=2.3.0', ] From b1e25149d62a6d7ad544172990b10c8e93bb1a97 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 1 May 2026 14:06:16 +0200 Subject: [PATCH 4/4] Update codecov.yml --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index c004087..9d7a08d 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -19,7 +19,7 @@ jobs: dj42_cms311.txt, ] os: [ - ubuntu-24.04, + ubuntu-latest, ] steps: