From ba63d1fe5fabb338a377f9dce85b093c00289829 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Mon, 14 Apr 2025 18:01:32 +0530 Subject: [PATCH 1/3] Used ruff package --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cdc9aef..488c5d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,7 +41,7 @@ blinker~=1.8.2 itsdangerous~=2.2.0 isort==5.13.2 pkginfo==1.11.1 -pylint==3.2.6 +ruff==0.11.5 astroid==3.2.4 mccabe==0.7.0 platformdirs==3.9.1 From c40f4cef030ed87c65c66de9c0e3f712f2666ca2 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Tue, 15 Apr 2025 11:18:00 +0530 Subject: [PATCH 2/3] setuptools version bump --- CHANGELOG.md | 6 ++++++ contentstack/__init__.py | 2 +- requirements.txt | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea998f..f525a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## _v1.11.2_ + +### **Date: 21-APRIL-2025** + +- Version bump and security fixes. + ## _v1.11.1_ ### **Date: 26-MARCH-2025** diff --git a/contentstack/__init__.py b/contentstack/__init__.py index 64d8d26..25fd958 100644 --- a/contentstack/__init__.py +++ b/contentstack/__init__.py @@ -22,7 +22,7 @@ __title__ = 'contentstack-delivery-python' __author__ = 'contentstack' __status__ = 'debug' -__version__ = 'v1.11.1' +__version__ = 'v1.11.2' __endpoint__ = 'cdn.contentstack.io' __email__ = 'mobile@contentstack.com' __developer_email__ = 'shailesh.mishra@contentstack.com' diff --git a/requirements.txt b/requirements.txt index 488c5d2..5937fcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ twython==3.9.1 -setuptools~=74.0.0 +setuptools~=78.1.0 contentstack-utils==1.3.0 python-dateutil==2.8.2 requests==2.32.3 @@ -10,7 +10,7 @@ Sphinx==7.3.7 sphinxcontrib-websupport==1.2.7 pip==23.3.1 build==0.10.0 -wheel==0.44.0 +wheel==0.45.1 lxml==5.3.1 utils~=1.0.2 keyring==23.13.1 From 6db6c8503f6537d42d898bd6f90f55e2ffefdb05 Mon Sep 17 00:00:00 2001 From: "harshitha.d" Date: Wed, 16 Apr 2025 14:05:27 +0530 Subject: [PATCH 3/3] Update branch check conditions in workflow to restrict merges from 'staging' --- .github/workflows/check-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml index 1e2d24a..e79864e 100644 --- a/.github/workflows/check-branch.yml +++ b/.github/workflows/check-branch.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Comment PR - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' uses: thollander/actions-comment-pull-request@v2 with: message: | We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch. - name: Check branch - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' run: | echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch." exit 1 \ No newline at end of file