Skip to content

Commit ee5a546

Browse files
Merge branch 'master' into ceng-598-create-tests-for-zipapp-build-for-the-cli-release-pipeline
2 parents cfb0c18 + 6acb58d commit ee5a546

6 files changed

Lines changed: 21 additions & 7 deletions

File tree

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.9.4
2+
current_version = 1.10.1
33
commit = True
44
tag = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<revision>\d+)

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1717

1818
### Fixed
1919

20+
- [Issue #250](https://github.com/cloudsmith-io/cloudsmith-cli/issues/250) - Updated `requests_toolbelt` dependency to `>=1.0.0` to ensure compatibility with `urllib3>=2.5` and avoid `urllib3.contrib.appengine` import errors.
21+
22+
## [1.10.1] - 2025-12-16
23+
24+
### Fixed
25+
26+
- Fixed quarantine block/add command
27+
28+
## [1.10.0] - 2025-12-16
29+
30+
### Fixed
31+
2032
- Upgraded `urllib3` from `v1.26.20` to `v2.5.0`.
2133
- Added `mock_keyring` fixture to prevent SSO token refresh attempts during individual `test_rest.py` test which runs in pipelines (full suite passes). Caused by [HTTPretty issue 484](https://github.com/gabrielfalcao/HTTPretty/issues/484).
2234
- Entitlement token list command now fixed
35+
- Drop click dependency from `v8.2.0` to `v8.1.8` to fix dependency issue for Python 3.9
2336

2437
## [1.9.4] - 2025-11-07
2538

CONTRIBUTORS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ The following contributors (in alphabetical order) are held in eternal high este
1010

1111
- Carlos Gonzalez ([@LowzG](https://github.com/LowzG))
1212
- Jamie Brynes ([@jamiebrynes7](https://github.com/jamiebrynes7))
13+
- Pablo Sanchez ([@pablogrs](https://github.com/pablogrs))
1314
- Patrick McClory ([@mcclory](https://github.com/mcclory))
1415

15-
1616
# Thanks
1717

1818
We'd also like to say thank you to the following people (in alphabetical order), for raising issues, providing suggestions or just for being awesome:
@@ -21,4 +21,5 @@ We'd also like to say thank you to the following people (in alphabetical order),
2121
- Rob Madole ([@robmadole](https://github.com/robmadole))
2222
- Sean Allen ([@SeanTAllen](https://github.com/SeanTAllen))
2323
- Jesse Rhoads ([@JesseRhoads-PD](https://github.com/JesseRhoads-PD))
24+
- Julian Pulgarín ([@jpulgarin](https://github.com/jpulgarin))
2425
- Pierre Gergondet ([@gergondet](https://github.com/gergondet))

cloudsmith_cli/cli/commands/quarantine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def quarantine(ctx, opts): # pylint: disable=unused-argument
5151
"""
5252

5353

54-
def add_quarantine(ctx, opts, owner_repo_package, page, page_size):
54+
def add_quarantine(ctx, opts, owner_repo_package, page, page_size, page_all):
5555
"""
5656
Add a package to quarantine.
5757
@@ -98,7 +98,7 @@ def add(*args, **kwargs): # pylint: disable=missing-docstring
9898
return add_quarantine(*args, **kwargs)
9999

100100

101-
def remove_quarantine(ctx, opts, owner_repo_package, page, page_size):
101+
def remove_quarantine(ctx, opts, owner_repo_package, page, page_size, page_all):
102102
"""
103103
Remove a package from quarantine.
104104

cloudsmith_cli/data/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.4
1+
1.10.1

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ def get_long_description():
4949
platforms=["any"],
5050
python_requires=">=3.10.0",
5151
install_requires=[
52-
"click>=8.2.0,!=8.3.0",
52+
"click>=8.1.8,!=8.3.0",
5353
"click-configfile>=0.2.3",
5454
"click-didyoumean>=0.0.3",
5555
"click-spinner>=0.1.7",
5656
"cloudsmith-api>=2.0.22,<3.0", # Compatible upto (but excluding) 3.0+
5757
"keyring>=25.4.1",
5858
"requests>=2.18.4",
59-
"requests_toolbelt>=0.8.0",
59+
"requests_toolbelt>=1.0.0",
6060
"semver>=2.7.9",
6161
"urllib3>=2.5",
6262
],

0 commit comments

Comments
 (0)