Skip to content

Commit 7533353

Browse files
committed
revert eng changes
1 parent 5533774 commit 7533353

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

eng/tools/azure-sdk-tools/ci_tools/functions.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ def apply_compatibility_filter(package_set: List[str]) -> List[str]:
121121
running_major_version = Version(".".join([str(v[0]), str(v[1]), str(v[2])]))
122122

123123
for pkg in package_set:
124-
logging.info(f"checking package for compatibility: {pkg}")
125124
try:
126125
spec_set = SpecifierSet(ParsedSetup.from_path(pkg).python_requires)
127126
except RuntimeError as e:
@@ -135,16 +134,14 @@ def apply_compatibility_filter(package_set: List[str]) -> List[str]:
135134

136135
distro_compat = True
137136
distro_incompat = TEST_PYTHON_DISTRO_INCOMPATIBILITY_MAP.get(os.path.basename(pkg), None)
138-
logging.info(f"distro_incompat for package {pkg}: {distro_incompat}")
139137
if distro_incompat and distro_incompat in platform.python_implementation().lower():
140138
distro_compat = False
141139

142-
logging.info(f"Package {pkg}, running_major_version: {running_major_version}, spec_set: {spec_set}, distro_compat: {distro_compat}")
143140
if running_major_version in spec_set and distro_compat:
144141
collected_packages.append(pkg)
145142

146-
logging.info("Target packages after applying compatibility filter: {}".format(collected_packages))
147-
logging.info(
143+
logging.debug("Target packages after applying compatibility filter: {}".format(collected_packages))
144+
logging.debug(
148145
"Package(s) omitted by compatibility filter: {}".format(generate_difference(package_set, collected_packages))
149146
)
150147

@@ -250,25 +247,25 @@ def discover_targeted_packages(
250247

251248
# glob the starting package set
252249
collected_packages = glob_packages(glob_string, target_root_dir)
253-
logger.info(
250+
logger.debug(
254251
f'Results for glob_string "{glob_string}" and root directory "{target_root_dir}" are: {collected_packages}'
255252
)
256253

257254
# apply the additional contains filter
258255
collected_packages = [pkg for pkg in collected_packages if additional_contains_filter in pkg]
259-
logger.info(f'Results after additional contains filter: "{additional_contains_filter}" {collected_packages}')
256+
logger.debug(f'Results after additional contains filter: "{additional_contains_filter}" {collected_packages}')
260257

261258
# filter for compatibility, this means excluding a package that doesn't support py36 when we are running a py36 executable
262259
if compatibility_filter:
263260
collected_packages = apply_compatibility_filter(collected_packages)
264-
logger.info(f"Results after compatibility filter: {collected_packages}")
261+
logger.debug(f"Results after compatibility filter: {collected_packages}")
265262

266263
if not include_inactive:
267264
collected_packages = apply_inactive_filter(collected_packages)
268265

269266
# Apply filter based on filter type. for e.g. Docs, Regression, Management
270267
collected_packages = apply_business_filter(collected_packages, filter_type)
271-
logger.info(f"Results after business filter: {collected_packages}")
268+
logger.debug(f"Results after business filter: {collected_packages}")
272269

273270
return sorted(collected_packages)
274271

eng/tox/run_sphinx_apidoc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def sphinx_apidoc(working_directory: str, namespace: str) -> None:
6666
while namespace:
6767
rst_file_to_delete = base_path / f"{namespace}.rst"
6868
logging.info(f"Removing {rst_file_to_delete}")
69-
rst_file_to_delete.unlink(missing_ok=True)
69+
rst_file_to_delete.unlink()
7070
namespace = namespace.rpartition('.')[0]
7171
except CalledProcessError as e:
7272
logging.error(

0 commit comments

Comments
 (0)