Skip to content

Improvements to mindependency dev_requirement conflict resolution #37669

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
scbedd merged 20 commits into from
Oct 4, 2024
Merged

Improvements to mindependency dev_requirement conflict resolution #37669

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87bc0b9
working on a true solution to incompatible requirements on dev_req
scbedd Sep 19, 2024
0338ac9
commit progress, I'm not super happy with the results so far its not …
scbedd Sep 19, 2024
b27a374
update from upstream and merge main
scbedd Sep 30, 2024
455d484
commenting the new function
scbedd Sep 30, 2024
b1a60b7
we now are recognizing when we have a incompatible dev req, working o…
scbedd Oct 1, 2024
a860e46
we've very close now.
scbedd Oct 1, 2024
e26e83f
handle incompatible dev requirements
scbedd Oct 1, 2024
c1164c9
move new functions to some place that can be more easily tested
scbedd Oct 1, 2024
6c6cc93
ensure we don't accidentally manipulate the standard requirements
scbedd Oct 1, 2024
150b282
add a couple tests
scbedd Oct 2, 2024
e5621fa
Update eng/tox/install_depend_packages.py
scbedd Oct 2, 2024
a6d75ef
save reformatted functions.py
scbedd Oct 2, 2024
c0406bd
repair test in resolve_compatible_package
scbedd Oct 2, 2024
80abb01
Update tools/azure-sdk-tools/ci_tools/functions.py
scbedd Oct 2, 2024
782311c
didn't rename a parametrized argument on a test to match with the def…
scbedd Oct 3, 2024
b33a965
fully rename function
scbedd Oct 3, 2024
746036d
handle when there is no specifier in the dev req
scbedd Oct 3, 2024
2e41797
Update eng/tox/install_depend_packages.py
scbedd Oct 3, 2024
3f52835
additionalFilterFn -> additional_filter_fn
scbedd Oct 3, 2024
bff0d7d
resolve conflicts and apply black
scbedd Oct 3, 2024
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
Prev Previous commit
Next Next commit
commenting the new function
  • Loading branch information
@scbedd
scbedd committed Sep 30, 2024
commit 455d484a71de6575778b4a4175a1dd6c8e68604d
6 changes: 2 additions & 4 deletions eng/tox/install_depend_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ def resolve_compatible_package(dev_req_pkg_name: str, dev_req_pkg_version: str,
available_versions.reverse()

if not required_pkg_version in dev_req_dependency.specifier:
breakpoint()

pypi.get_ordered_versions(dev_req_dependency.key, True)


Expand Down Expand Up @@ -437,8 +435,8 @@ def filter_dev_requirements(setup_py_path, released_packages, temp_dir, addition
and not any([check_req_against_exclusion(req, i) for i in req_to_exclude])
]

if additionalFilterFn:
filtered_req = additionalFilterFn(setup_py_path, filtered_req, released_packages)
# if additionalFilterFn:
# filtered_req = additionalFilterFn(setup_py_path, filtered_req, released_packages)

logging.info("Filtered dev requirements: %s", filtered_req)

Expand Down