Skip to content

Commit

Permalink
Replace azure-identity in mindependency checks (#37461)
Browse files Browse the repository at this point in the history
* replace azure-identity during minimum dependency checks.
  • Loading branch information
scbedd authored Sep 19, 2024
1 parent adc02f1 commit bddc491
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions eng/tox/install_depend_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
from pypi_tools.pypi import PyPIClient
from packaging.specifiers import SpecifierSet
from packaging.version import Version, parse
import pdb

from ci_tools.parsing import ParsedSetup, parse_require
from ci_tools.functions import compare_python_version


from typing import List

DEV_REQ_FILE = "dev_requirements.txt"
Expand Down Expand Up @@ -104,7 +102,7 @@ def install_dependent_packages(setup_py_file_path, dependency_type, temp_dir):

logging.info("%s released packages: %s", dependency_type, released_packages)
# filter released packages from dev_requirements and create a new file "new_dev_requirements.txt"
dev_req_file_path = filter_dev_requirements(setup_py_file_path, released_packages, temp_dir)
dev_req_file_path = filter_dev_requirements(setup_py_file_path, released_packages, temp_dir, dependency_type)

if override_added_packages:
logging.info(f"Expanding the requirement set by the packages {override_added_packages}.")
Expand Down Expand Up @@ -303,8 +301,17 @@ def check_req_against_exclusion(req, req_to_exclude):

return req_id == req_to_exclude

# todo: remove when merging #37450
def replace_identity(dev_requirement_line) -> str:
regex = r"azure[-_]identity"

if re.search(regex, dev_requirement_line):
return "azure-identity==1.17.0\n"
else:
return dev_requirement_line

def filter_dev_requirements(setup_py_path, released_packages, temp_dir):

def filter_dev_requirements(setup_py_path, released_packages, temp_dir, dependency_type):
# This method returns list of requirements from dev_requirements by filtering out packages in given list
dev_req_path = os.path.join(os.path.dirname(setup_py_path), DEV_REQ_FILE)
requirements = []
Expand All @@ -327,6 +334,10 @@ def filter_dev_requirements(setup_py_path, released_packages, temp_dir):
and not any([check_req_against_exclusion(req, i) for i in req_to_exclude])
]

if dependency_type == "Minimum":
# replace identity with the minimum version of the package
filtered_req = [replace_identity(req) for req in filtered_req]

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

new_dev_req_path = ""
Expand Down

0 comments on commit bddc491

Please sign in to comment.