Skip to content

DLPX-98863 dependency-bump: batch update 16 dependencies (consolidates 26 PRs) #705

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
SumoSourabh merged 1 commit into from
Sep 10, 2026
Merged

DLPX-98863 dependency-bump: batch update 16 dependencies (consolidates 26 PRs) #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions common/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ dependencies = [
[project.optional-dependencies]
dev = [
"bump2version == 1.0.1",
"packaging == 26.0",
"packaging == 26.3",
"pluggy == 1.6.0",
"pyparsing == 3.3.2",
"pytest == 9.0.3",
"pytest == 9.1.1",
"six == 1.17.0",
"zipp == 3.23.0",
"zipp == 4.1.0",
Comment thread
delphix-devops-bot marked this conversation as resolved.
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion docs/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "pypi"

[packages]
mkdocs = "==1.6.1"
mkdocs-material = "==9.7.6"
mkdocs-material = "==9.7.7"
markdown-include = "==0.8.1"
mkdocs-awesome-pages-plugin = "==2.10.1"

Expand Down
420 changes: 231 additions & 189 deletions docs/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dvp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ dependencies = [
[project.optional-dependencies]
dev = [
"bump2version == 1.0.1",
"packaging == 26.0",
"packaging == 26.3",
"pluggy == 1.6.0",
"pyparsing == 3.3.2",
"pytest == 9.0.3",
"pytest == 9.1.1",
"six == 1.17.0",
"zipp == 3.23.0",
"zipp == 4.1.0",
]

[project.urls]
Expand Down
6 changes: 3 additions & 3 deletions libs/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ dependencies = [
dev = [
"bump2version == 1.0.1",
"mock == 5.2.0",
"packaging == 26.0",
"packaging == 26.3",
"pluggy == 1.6.0",
"pyparsing == 3.3.2",
"pytest == 9.0.3",
"pytest == 9.1.1",
"six == 1.17.0",
"zipp == 3.23.0",
"zipp == 4.1.0",
]

[project.urls]
Expand Down
6 changes: 3 additions & 3 deletions platform/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ dependencies = [
dev = [
"bump2version == 1.0.1",
"mock == 5.2.0",
"packaging == 26.0",
"packaging == 26.3",
"pluggy == 1.6.0",
"pyparsing == 3.3.2",
"pytest == 9.0.3",
"pytest == 9.1.1",
"six == 1.17.0",
"zipp == 3.23.0",
"zipp == 4.1.0",
]

[project.urls]
Expand Down
26 changes: 13 additions & 13 deletions tools/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,47 @@ classifiers = [
]
# Sibling-package pins (dvp-libs, dvp-platform) are kept in sync via .bumpversion.cfg.
dependencies = [
"attrs >= 25.3, < 25.4",
"certifi >= 2024, < 2025",
"attrs >= 25.3, < 26.2",
"certifi >= 2024, < 2027",
"click == 7.1.2",
"click-configfile == 0.2.3",
"configparser >= 7.2, < 7.3",
"dvp-libs == 5.2.0",
"dvp-platform == 5.2.0",
"flake8 >= 7.3, < 7.4",
"httpretty >= 1.0, < 1.1",
"importlib-resources >= 6.5, < 6.6",
"httpretty >= 1.0, < 1.2",
"importlib-resources >= 6.5, < 7.2",
Comment thread
Copilot marked this conversation as resolved.
"jinja2 >= 3.1, < 3.2",
"jsonschema >= 4.25, < 4.26",
"jsonschema >= 4.25, < 4.27",
"MarkupSafe >= 3.0, < 3.1",
"pkgutil_resolve_name == 1.3.10",
"pyyaml >= 6, < 7",
"requests >= 2.32, < 2.33",
"requests >= 2.32, < 2.35",
"six >= 1.17, < 1.18",
"zipp >= 3.23, < 3.24",
"zipp >= 3.23, < 4.2",
]

[project.optional-dependencies]
dev = [
"bump2version == 1.0.1",
"coverage == 7.13.5",
"coverage == 7.16.0",
"entrypoints == 0.4",
"flake8 == 7.3.0",
"httpretty == 1.0.5",
"httpretty == 1.1.4",
"isort == 8.0.1",
"mccabe == 0.7.0",
"mock == 5.2.0",
"more-itertools == 10.8.0",
"packaging == 26.0",
"more-itertools == 11.1.0",
"packaging == 26.3",
"pluggy == 1.6.0",
"pycodestyle == 2.14.0",
"pyflakes == 3.4.0",
"pyparsing == 3.3.2",
"pytest == 9.0.3",
"pytest == 9.1.1",
"pytest-cov == 7.1.0",
"six == 1.17.0",
"yapf == 0.43.0",
"zipp == 3.23.0",
"zipp == 4.1.0",
]

[project.urls]
Expand Down
33 changes: 23 additions & 10 deletions tools/src/test/python/dlpx/virtualization/_internal/commands/test_delphix_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@ def httpretty_enabled():
yield
httpretty.disable()

@staticmethod
def _request_history():
"""Return deduplicated request history.

httpretty 1.1.x records some requests twice due to urllib3
connection-pool behavior. Deduplicate consecutive duplicates so tests
verify the logical sequence of requests, not connection-pool recording
duplicates.
"""
reqs = httpretty.HTTPretty.latest_requests
return [r for i, r in enumerate(reqs)
if i == 0 or r.path != reqs[i - 1].path]

SES_RESP_SUCCESS = ((
'{"type":"OKResult","status":"OK","result":{'
'"type":"APISession","version":{'
Expand Down Expand Up @@ -317,7 +330,7 @@ def test_delphix_client_upload_success(engine_api, artifact_content):
dc.login(engine_api, 'admin', 'delphix')
dc.upload_plugin('plugin name', artifact_content, False)

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/data/upload'
assert (history[-2].path ==
u'/resources/json/delphix/toolkit/requestUploadToken')
Expand Down Expand Up @@ -384,7 +397,7 @@ def test_delphix_client_wrong_api(engine_api):
' Delphix Engine version to determine which'
' API version is supported.')

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/session'

@staticmethod
Expand All @@ -409,7 +422,7 @@ def test_delphix_client_unknown_error(engine_api):
assert err_info.value.message == (
'Received an unexpected error with HTTP Status 404,\nDumping full'
' response:\n{\n "blob": "Unknown",\n "status": "UNKNOWN"\n}')
history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/session'

@staticmethod
Expand Down Expand Up @@ -444,7 +457,7 @@ def test_delphix_client_wrong_login(engine_api):
'\nDetails: Invalid username or password.'
'\nAction: Try with a different set of credentials.')

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/login'
assert history[-2].path == u'/resources/json/delphix/session'

Expand Down Expand Up @@ -485,7 +498,7 @@ def test_delphix_client_wrong_login_no_detail(engine_api):
'\n}')
assert message == expected_message

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/login'
assert history[-2].path == u'/resources/json/delphix/session'

Expand Down Expand Up @@ -525,7 +538,7 @@ def test_delphix_client_get_token_fail(engine_api, artifact_content):
'Received an unexpected error with HTTP Status 403,\nDumping full'
' response:\n{}'.format(token_body))

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert (history[-1].path ==
u'/resources/json/delphix/toolkit/requestUploadToken')
assert history[-2].path == u'/resources/json/delphix/login'
Expand Down Expand Up @@ -586,7 +599,7 @@ def test_delphix_client_upload_fail(engine_api, artifact_content):
' again: db_centos75_157_2,db_centos75_157_1,'
'db_centos75_157_0')

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert history[-1].path == u'/resources/json/delphix/data/upload'
assert (history[-2].path ==
u'/resources/json/delphix/toolkit/requestUploadToken')
Expand Down Expand Up @@ -633,7 +646,7 @@ def test_delphix_client_wait_for_job_to_complete_job_failed(
assert err_info.value.message == ('Failed trying to upload plugin '
'nix_direct_python.')

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert (history[-1].path ==
u'/resources/json/delphix/action/ACTION-161/getJob')
assert history[-2].path == u'/resources/json/delphix/login'
Expand Down Expand Up @@ -680,7 +693,7 @@ def test_delphix_client_wait_for_job_to_complete_timed_out(
'plugin nix_direct_python to '
'complete.')

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
assert (history[-1].path ==
u'/resources/json/delphix/action/ACTION-161/getJob')
assert history[-2].path == u'/resources/json/delphix/login'
Expand Down Expand Up @@ -727,7 +740,7 @@ def test_delphix_client_download_success(engine_api, src_dir,
dc.login(engine_api, 'admin', 'delphix')
dc.download_plugin_logs(src_dir, plugin_config_file)

history = httpretty.HTTPretty.latest_requests
history = TestDelphixClient._request_history()
to_str(history[-1].__dict__)

assert (to_str(history[-1].path) ==
Expand Down