From 16fe7e7885b7e17bf16b4f1f8f8844b9f5d0bdfe Mon Sep 17 00:00:00 2001 From: Dov Shlachter Date: Tue, 30 Jun 2020 13:19:40 -0700 Subject: [PATCH] fix: add name and version info to fixup script name (#490) --- ...fixup_keywords.py.j2 => fixup_%name_%version_keywords.py.j2} | 0 gapic/ads-templates/setup.py.j2 | 2 +- ...fixup_keywords.py.j2 => fixup_%name_%version_keywords.py.j2} | 0 gapic/templates/setup.py.j2 | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename gapic/ads-templates/scripts/{fixup_keywords.py.j2 => fixup_%name_%version_keywords.py.j2} (100%) rename gapic/templates/scripts/{fixup_keywords.py.j2 => fixup_%name_%version_keywords.py.j2} (100%) diff --git a/gapic/ads-templates/scripts/fixup_keywords.py.j2 b/gapic/ads-templates/scripts/fixup_%name_%version_keywords.py.j2 similarity index 100% rename from gapic/ads-templates/scripts/fixup_keywords.py.j2 rename to gapic/ads-templates/scripts/fixup_%name_%version_keywords.py.j2 diff --git a/gapic/ads-templates/setup.py.j2 b/gapic/ads-templates/setup.py.j2 index 78cc078c17..5556158e70 100644 --- a/gapic/ads-templates/setup.py.j2 +++ b/gapic/ads-templates/setup.py.j2 @@ -29,7 +29,7 @@ setuptools.setup( 'libcst >= 0.2.5', ], scripts=[ - 'scripts/fixup_keywords.py', + 'scripts/fixup_{{ api.naming.versioned_module_name }}_keywords.py', ], classifiers=[ 'Development Status :: 3 - Alpha', diff --git a/gapic/templates/scripts/fixup_keywords.py.j2 b/gapic/templates/scripts/fixup_%name_%version_keywords.py.j2 similarity index 100% rename from gapic/templates/scripts/fixup_keywords.py.j2 rename to gapic/templates/scripts/fixup_%name_%version_keywords.py.j2 diff --git a/gapic/templates/setup.py.j2 b/gapic/templates/setup.py.j2 index ccfb661812..c008080ee0 100644 --- a/gapic/templates/setup.py.j2 +++ b/gapic/templates/setup.py.j2 @@ -25,7 +25,7 @@ setuptools.setup( ), python_requires='>={% if opts.lazy_import %}3.7{% else %}3.6{% endif %}',{# Lazy import requires module-level getattr #} scripts=[ - 'scripts/fixup_keywords.py', + 'scripts/fixup_{{ api.naming.versioned_module_name }}_keywords.py', ], classifiers=[ 'Development Status :: 3 - Alpha',