Skip to content

Commit 4afd12b

Browse files
Merge pull request #115 from contentstack/staging
DX | 21-04-2025 | Release
2 parents 5232d31 + b798e3e commit 4afd12b

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.github/workflows/check-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Comment PR
11-
if: github.base_ref == 'master' && github.head_ref != 'next'
11+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1212
uses: thollander/actions-comment-pull-request@v2
1313
with:
1414
message: |
1515
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.
1616
- name: Check branch
17-
if: github.base_ref == 'master' && github.head_ref != 'next'
17+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1818
run: |
1919
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."
2020
exit 1

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## _v1.11.2_
4+
5+
### **Date: 21-APRIL-2025**
6+
7+
- Version bump and security fixes.
8+
39
## _v1.11.1_
410

511
### **Date: 26-MARCH-2025**

contentstack/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
__title__ = 'contentstack-delivery-python'
2323
__author__ = 'contentstack'
2424
__status__ = 'debug'
25-
__version__ = 'v1.11.1'
25+
__version__ = 'v1.11.2'
2626
__endpoint__ = 'cdn.contentstack.io'
2727
__email__ = '[email protected]'
2828
__developer_email__ = '[email protected]'

requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
twython==3.9.1
2-
setuptools~=74.0.0
2+
setuptools~=78.1.0
33
contentstack-utils==1.3.0
44
python-dateutil==2.8.2
55
requests==2.32.3
@@ -10,7 +10,7 @@ Sphinx==7.3.7
1010
sphinxcontrib-websupport==1.2.7
1111
pip==23.3.1
1212
build==0.10.0
13-
wheel==0.44.0
13+
wheel==0.45.1
1414
lxml==5.3.1
1515
utils~=1.0.2
1616
keyring==23.13.1
@@ -41,7 +41,7 @@ blinker~=1.8.2
4141
itsdangerous~=2.2.0
4242
isort==5.13.2
4343
pkginfo==1.11.1
44-
pylint==3.2.6
44+
ruff==0.11.5
4545
astroid==3.2.4
4646
mccabe==0.7.0
4747
platformdirs==3.9.1

0 commit comments

Comments
 (0)