Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/tools/azure-sdk-tools/changelog_generics.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This version uses a next-generation code generator that *might* introduce breaki
At a glance:

- "is" should not be used at all.
- "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be prefered.
- "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be preferred.

- New Long Running Operation:

Expand Down Expand Up @@ -59,7 +59,7 @@ This version uses a next-generation code generator that introduces important bre

## General breaking changes

- Credential system has been completly revamped:
- Credential system has been completely revamped:

- `azure.common.credentials` or `msrestazure.azure_active_directory` instances are no longer supported, use the `azure-identity` classes instead: https://pypi.org/project/azure-identity/
- `credentials` parameter has been renamed `credential`
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/azure-sdk-tools/changelog_generics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This version uses a next-generation code generator that *might* introduce breaki
At a glance:

- "is" should not be used at all.
- "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be prefered.
- "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be preferred.

- New Long Running Operation:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def create_package_and_install(
built_pkg_path = package_path

logger.info("Installing {w} from directory".format(w=built_package))
# it does't exist, so we need to error out
# it doesn't exist, so we need to error out
else:
logger.error("{w} not present in the prebuilt package directory. Exiting.".format(w=built_package))
exit(1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def remove_resource(self, name, **kwargs):
group = self._get_resource_group(**kwargs)
self.client.storage_accounts.delete(group.name, name)
except ResourceExistsError as e:
# Occassionally a storage test will try to delete the
# Occasionally a storage test will try to delete the
# resource before the previous operation has been completed
logger = logging.getLogger()
logger.warning(
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/azure-sdk-tools/packaging_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def build_packaging_by_package_name(
# Might decide to make it more generic one day
if template_name == "CHANGELOG.md" and future_filepath.exists():
_LOGGER.info("Skipping CHANGELOG.md template, since a previous one was found")
# Never overwirte the ChangeLog
# Never overwrite the ChangeLog
continue

template = env.get_template(template_name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def gen_typespec(
api_version: Optional[str] = None,
) -> Dict[str, Any]:
typespec_python = "@azure-tools/typespec-python"
# call scirpt to generate sdk
# call script to generate sdk
try:
tsp_client = "npx --no --prefix eng/common/tsp-client tsp-client"
if spec_folder:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def _get_column_count(ws: Worksheet):
return col

def sum_matrix_sheets(self):
logging.info("Adding Sum and Total to Matix")
logging.info("Adding Sum and Total to Matrix")
for sheet_name in [SHEET_PACKAGE_MATRIX, SHEET_BREAKING_MATRIX]:
ws = self.wb[sheet_name]
last_row, last_date = ReleaseStats._get_last_cell(ws)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def change_log_new(package_folder: str, lastest_pypi_version: bool) -> str:
_LOGGER.info(f"Run breaking change detector with command: {cmd}")
output = getoutput(cmd)
except CalledProcessError as e:
_LOGGER.warning(f"Error ocurred when call breaking change detector: {e.output.decode('utf-8')}")
_LOGGER.warning(f"Error occurred when call breaking change detector: {e.output.decode('utf-8')}")
raise e
_LOGGER.info(f"Breaking change detector output: {output}")
result = [l for l in output.split("\n")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_repo_tag_meta(meta_conf):
return "azure-sdk-for-node"
if "typescript" in meta_conf["autorest_options"]:
return "azure-sdk-for-js"
raise ValueError("No repotag found or infered")
raise ValueError("No repotag found or inferred")


@unique
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def move_wrapper_files_or_dirs(src_root, dst_root, global_conf, local_conf):
if file_path.is_file():
file_path_dest.parent.mkdir(parents=True, exist_ok=True)
_LOGGER.info("Moving %s to %s", str(file_path), str(file_path_dest))
# This does not work in Windows if generatd and dest are not in the same drive
# This does not work in Windows if generated and dest are not in the same drive
# file_path.replace(file_path_dest)
shutil.move(file_path, file_path_dest)

Expand Down Expand Up @@ -103,7 +103,7 @@ def move_autorest_files(client_generated_path, sdk_root, global_conf, local_conf
raise ValueError(err_msg)

shutil.rmtree(str(destination_folder))
# This does not work in Windows if generatd and dest are not in the same drive
# This does not work in Windows if generated and dest are not in the same drive
# client_generated_path.replace(destination_folder)
shutil.move(client_generated_path, destination_folder)

Expand Down Expand Up @@ -285,7 +285,7 @@ def generate_sdk_from_git_object(
) as restapi_git_folder, manage_git_folder(gh_token, clone_dir, branched_sdk_git_id) as sdk_folder:

readme_files_infered = get_readme_files_from_git_object(git_object, restapi_git_folder)
_LOGGER.info("Readmes files infered from PR: %s ", readme_files_infered)
_LOGGER.info("Readmes files inferred from PR: %s ", readme_files_infered)
if not readme_files_infered:
_LOGGER.info("No Readme in PR, quit")
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def autorest_bootstrap_version_finder():


def merge_options(global_conf, local_conf, key, *, keep_list_order=False):
"""Merge the conf using override: local conf is prioritary over global.
"""Merge the conf using override: local conf is priority over global.

If keep_list_order is True, list are merged global+local. Might have duplicate.
If false, duplication are removed.
Expand Down Expand Up @@ -125,7 +125,7 @@ def generate_code(input_file, global_conf, local_conf, output_dir=None, autorest

execute_simple_command(cmd_line, cwd=str(input_path))
# Checks that Autorest did something if output_dir is under control
# Note that this can fail if "--output-folder" was overidden by the Readme.
# Note that this can fail if "--output-folder" was overridden by the Readme.
if output_dir and (not output_dir.is_dir() or next(output_dir.iterdir(), None) is None):
raise ValueError("Autorest call ended with 0, but no files were generated")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_requirements_from_file(requirements_file: str) -> List[str]:

def test_replace_dev_reqs_specifiers(tmp_directory_create):
"""
Specifiers should always be pointed at an external source, nothing to build locally. Nontheless we need to confirm
Specifiers should always be pointed at an external source, nothing to build locally. Nonetheless we need to confirm
that we don't accidentally trip the replacement logic.
"""
target_file = os.path.join(sample_dev_reqs_folder, "specifiers_requirements.txt")
Expand Down
Loading