Skip to content

Commit 9e6b525

Browse files
authored
Extension names use dash instead of underscore (#18)
* Extension names use dash instead of underscore * Fix CI
1 parent af5eec7 commit 9e6b525

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

scripts/ci/test_integration.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
SRC_PATH = os.path.join(get_repo_root(), 'src')
2525

2626
# Extensions to skip dep. check. Aim to keep this list empty.
27-
SKIP_DEP_CHECK = ['azure_cli_iot_ext']
27+
SKIP_DEP_CHECK = ['azure-cli-iot-ext']
2828

2929

3030
def catch_dup_keys(pairs):
@@ -102,7 +102,7 @@ def get_ext_metadata(ext_dir, ext_file, ext_name):
102102
metadata.update(azext_metadata)
103103
for dist_info_dirname in dist_info_dirs:
104104
parsed_dist_info_dir = WHEEL_INFO_RE(dist_info_dirname)
105-
if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == ext_name:
105+
if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == ext_name.replace('-', '_'):
106106
whl_metadata_filepath = os.path.join(ext_dir, dist_info_dirname, WHL_METADATA_FILENAME)
107107
if os.path.isfile(whl_metadata_filepath):
108108
with open(whl_metadata_filepath) as f:
@@ -134,11 +134,15 @@ def test_format_extensions_value(self):
134134

135135
def test_extension_filenames(self):
136136
for ext_name, exts in self.index['extensions'].items():
137+
self.assertEqual(ext_name.find('_'), -1, "Extension names should not contain underscores. "
138+
"Found {}".format(ext_name))
137139
for item in exts:
138140
self.assertTrue(item['filename'].endswith('.whl'),
139141
"Filename {} must end with .whl".format(item['filename']))
140-
self.assertTrue(item['filename'].startswith(ext_name),
141-
"Filename {} must start with {}".format(item['filename'], ext_name))
142+
self.assertEqual(ext_name, item['metadata']['name'],
143+
"Extension name mismatch in extensions['{}']. "
144+
"Found an extension in the list with name "
145+
"{}".format(ext_name, item['metadata']['name']))
142146
parsed_filename = WHEEL_INFO_RE(item['filename'])
143147
p = parsed_filename.groupdict()
144148
self.assertTrue(p.get('name'), "Can't get name for {}".format(item['filename']))
@@ -224,6 +228,8 @@ def test_source_wheels(self):
224228
source_extensions = [os.path.join(SRC_PATH, n) for n in os.listdir(SRC_PATH)
225229
if os.path.isdir(os.path.join(SRC_PATH, n))]
226230
for s in source_extensions:
231+
if not os.path.isfile(os.path.join(s, 'setup.py')):
232+
continue
227233
try:
228234
subprocess.check_call(['python', 'setup.py', 'bdist_wheel', '-q', '-d', built_whl_dir],
229235
cwd=s, stdout=PIPE, stderr=PIPE)

src/index.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"formatVersion": "1",
33
"extensions": {
4-
"azure_batch_cli_extensions": [
4+
"azure-batch-cli-extensions": [
55
{
66
"filename": "azure_batch_cli_extensions-2.0.0-py2.py3-none-any.whl",
77
"sha256Digest": "ccdfd15a2a33e2f3298e64051f556da76d7bec6e1008fd28a6467803df8ae8cb",
@@ -35,7 +35,7 @@
3535
}
3636
}
3737
],
38-
"azure_cli_iot_ext": [
38+
"azure-cli-iot-ext": [
3939
{
4040
"filename": "azure_cli_iot_ext-0.1.1-py2.py3-none-any.whl",
4141
"sha256Digest": "28f5565fa0367da4694223bb8dfacd68be5213e6a49b3a463a10c2379c39da19",
@@ -94,7 +94,7 @@
9494
}
9595
}
9696
],
97-
"image_copy_extension": [
97+
"image-copy-extension": [
9898
{
9999
"filename": "image_copy_extension-0.0.4-py2.py3-none-any.whl",
100100
"sha256Digest": "47d0f4293e833bb16bac1abbc63f7946dd87ac8db40378a230ec376d1f128fd3",

0 commit comments

Comments
 (0)