Move template project to new repo structure (Azure#4564)

Update scripts to understand new sdk\<service>\<package> naming convention.
howard-d3 · Mar 19, 2019 · 6d838d3 · 6d838d3
1 parent ab6639b
commit 6d838d3
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/azure-template/dev_requirements.txt b/azure-template/dev_requirements.txt
diff --git a/scripts/analyze_deps.py b/scripts/analyze_deps.py
@@ -20,7 +20,7 @@ def should_skip_lib(lib_name):
     return lib_name in skip_pkgs or lib_name.endswith('-nspkg')
 
 def locate_libs(base_dir):
-    packages = [os.path.dirname(p) for p in glob.glob(os.path.join(base_dir, 'azure*', 'setup.py'))]
+    packages = [os.path.dirname(p) for p in (glob.glob(os.path.join(base_dir, 'azure*', 'setup.py')) + glob.glob(os.path.join(base_dir, 'sdk/*/azure*', 'setup.py')))]
     return sorted(packages)
 
 def locate_wheels(base_dir):

diff --git a/scripts/dev_setup.py b/scripts/dev_setup.py
@@ -28,19 +28,19 @@ def pip_command(command, additionalDir='.', error_ok=False):
 
 # optional argument in a situation where we want to build a variable subset of packages
 parser = argparse.ArgumentParser(description='Set up the dev environment for selected packages.')
-parser.add_argument('--packageList', '-p', 
-    dest='packageList', 
-    default='', 
+parser.add_argument('--packageList', '-p',
+    dest='packageList',
+    default='',
     help='Comma separated list of targeted packages. Used to limit the number of packages that dependencies will be installed for.')
 args = parser.parse_args()
 
-packages = [os.path.dirname(p) for p in glob.glob('azure*/setup.py')]
+packages = [os.path.dirname(p) for p in (glob.glob('azure*/setup.py') + glob.glob('sdk/*/azure*/setup.py'))]
 
 # keep targeted packages separate. python2 needs the nspkgs to work properly.
 if not args.packageList:
-    targeted_packages = [os.path.dirname(p) for p in glob.glob('azure*/setup.py')]
+    targeted_packages = packages
 else:
-    targeted_packages = [x.strip() for x in args.packageList.split(',')]
+    targeted_packages = [os.path.relpath(x.strip()) for x in args.packageList.split(',')]
 
 # Extract nspkg and sort nspkg by number of "-"
 nspkg_packages = [p for p in packages if 'nspkg' in p]
@@ -77,7 +77,7 @@ def pip_command(command, additionalDir='.', error_ok=False):
 # install packages
 for package_name in content_packages:
     # if we are running dev_setup with no arguments. going after dev_requirements will be a pointless exercise
-    # and waste of cycles as all the dependencies will be installed regardless. 
+    # and waste of cycles as all the dependencies will be installed regardless.
     if os.path.isfile('{}/dev_requirements.txt'.format(package_name)):
         pip_command('install -r dev_requirements.txt', package_name)
     pip_command('install --ignore-requires-python -e {}'.format(package_name))

diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py
@@ -5,7 +5,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-# Below are common methods for the devops build steps. This is the common location that will be updated with 
+# Below are common methods for the devops build steps. This is the common location that will be updated with
 # package targeting during release.
 
 import glob
@@ -14,10 +14,10 @@
 import os
 import sys
 
-DEFAULT_BUILD_PACKAGES = ['azure-keyvault', 'azure-servicebus'] 
+DEFAULT_BUILD_PACKAGES = ['azure-keyvault', 'azure-servicebus']
 
 # this function is where a glob string gets translated to a list of packages
-# It is called by both BUILD (package) and TEST. In the future, this function will be the central location 
+# It is called by both BUILD (package) and TEST. In the future, this function will be the central location
 # for handling targeting of release packages
 def process_glob_string(glob_string, target_root_dir):
     if glob_string:
@@ -27,7 +27,7 @@ def process_glob_string(glob_string, target_root_dir):
     collected_top_level_directories = []
 
     for glob_string in individual_globs:
-        globbed = glob.glob(os.path.join(target_root_dir, glob_string, 'setup.py'))
+        globbed = glob.glob(os.path.join(target_root_dir, glob_string, 'setup.py')) + glob.glob(os.path.join(target_root_dir, "sdk/*/", glob_string, 'setup.py'))
         collected_top_level_directories.extend([os.path.dirname(p) for p in globbed])
 
     # dedup, in case we have double coverage from the glob strings. Example: "azure-mgmt-keyvault,azure-mgmt-*"

diff --git a/scripts/devops_tasks/setup_execute_tests.py b/scripts/devops_tasks/setup_execute_tests.py
@@ -20,11 +20,11 @@
 
 # a return code of 5 from pytest == no tests run
 # evaluating whether we want this or not.
-ALLOWED_RETURN_CODES = [] 
+ALLOWED_RETURN_CODES = []
 
 def prep_and_run_tests(targeted_packages, python_version, test_res):
     print('running test setup for {}'.format(targeted_packages))
-    run_check_call([python_version, dev_setup_script_location, '-p', ','.join([os.path.basename(package_path) for package_path in targeted_packages])], root_dir)
+    run_check_call([python_version, dev_setup_script_location, '-p', ','.join(targeted_packages)], root_dir)
 
     print('Setup complete. Running pytest for {}'.format(targeted_packages))
     command_array = [python_version, '-m', 'pytest']

diff --git a/azure-template/MANIFEST.in → sdk/template/azure-template/MANIFEST.in b/azure-template/MANIFEST.in → sdk/template/azure-template/MANIFEST.in
diff --git a/azure-template/README.md → sdk/template/azure-template/README.md b/azure-template/README.md → sdk/template/azure-template/README.md
@@ -32,4 +32,4 @@ More sample code should go here, along with links out to the appropriate example
 
 If you encounter any bugs or have suggestions, please file an issue in the [Issues](<https://github.com/Azure/azure-sdk-for-python/issues>) section of the project.
 
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-template%2FREADME.png)
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fsdk%2Ftemplate%2Fazure-template%2FREADME.png)
diff --git a/azure-template/azure/__init__.py → ...template/azure-template/azure/__init__.py b/azure-template/azure/__init__.py → ...template/azure-template/azure/__init__.py
diff --git a/azure-template/azure/template/__init__.py → ...azure-template/azure/template/__init__.py b/azure-template/azure/template/__init__.py → ...azure-template/azure/template/__init__.py
diff --git a/...-template/azure/template/template_code.py → ...-template/azure/template/template_code.py b/...-template/azure/template/template_code.py → ...-template/azure/template/template_code.py
diff --git a/azure-template/azure/template/version.py → .../azure-template/azure/template/version.py b/azure-template/azure/template/version.py → .../azure-template/azure/template/version.py
diff --git a/sdk/template/azure-template/dev_requirements.txt b/sdk/template/azure-template/dev_requirements.txt
@@ -0,0 +1 @@
+-e ../../../azure-sdk-tools
diff --git a/azure-template/sdk_packaging.toml → ...emplate/azure-template/sdk_packaging.toml b/azure-template/sdk_packaging.toml → ...emplate/azure-template/sdk_packaging.toml
diff --git a/azure-template/setup.cfg → sdk/template/azure-template/setup.cfg b/azure-template/setup.cfg → sdk/template/azure-template/setup.cfg
diff --git a/azure-template/setup.py → sdk/template/azure-template/setup.py b/azure-template/setup.py → sdk/template/azure-template/setup.py
diff --git a/azure-template/tests/test_simple.py → ...plate/azure-template/tests/test_simple.py b/azure-template/tests/test_simple.py → ...plate/azure-template/tests/test_simple.py
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 root_folder = os.path.abspath(os.path.dirname(__file__))
 
-packages = [os.path.dirname(p) for p in glob.glob('azure*/setup.py')]
+packages = [os.path.dirname(p) for p in (glob.glob('azure*/setup.py') + glob.glob('sdk/*/azure*/setup.py'))]
 
 # "install" is used by ReadTheDocs, do not install "nspkg"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ More sample code should go here, along with links out to the appropriate example

		If you encounter any bugs or have suggestions, please file an issue in the [Issues](<https://github.com/Azure/azure-sdk-for-python/issues>) section of the project.

		![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-template%2FREADME.png)
		![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fsdk%2Ftemplate%2Fazure-template%2FREADME.png)