Skip to content

Fix/resolve main conflicts #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunil-lakshman merged 3 commits into from
Jun 1, 2026
Merged

Fix/resolve main conflicts #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
978411d
Added urllib version bump
sunil-lakshman May 13, 2026
b324543
Merge pull request #152 from contentstack/fix/snyk-fix
sunil-lakshman May 13, 2026
2869f36
Fixed merge conflits
sunil-lakshman Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
---
## v1.9.0

#### Date: 25 May 2026
#### Date: 01 June 2026

- Removed unused `bson` dependency so the package installs on Python 3.12+ and 3.14 (the standalone `bson` 0.5.x package fails to build on newer Python versions).

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ python-dotenv>=1.2.2
# <82: pkg_resources (used by coverage-badge and similar tools) was removed in setuptools 82+
setuptools>=80.0.0,<82.0.0
requests>=2.33.0,<3.0.0
urllib3>=2.6.3,<3.0.0
urllib3>=2.7.0,<3.0.0
pylint>=2.0.0
requests-toolbelt>=1.0.0,<2.0.0
pyotp==2.9.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_author_email(package):
install_requires=[
"requests >= 2.5.4",
"requests-toolbelt >= 0.3.1",
"urllib3 >= 2.6.3",
"urllib3 >= 2.7.0,<3.0.0",
],
extras_require={
"dev": ["pytest>=7.0", "twine>=4.0.2", "packaging>=24.0", "dotenv>=0.0.5"],
Expand Down
Loading