Skip to content

Commit 8e675e2

Browse files
Improvements to dependency graph (Azure#22892)
1 parent 466fae9 commit 8e675e2

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Azure SDK for Python
22

3-
[![Packages](https://img.shields.io/badge/packages-latest-blue.svg)](https://azure.github.io/azure-sdk/releases/latest/python.html) [![Dependencies](https://img.shields.io/badge/dependency-report-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-python/dependencies/dependencies.html) [![DepGraph](https://img.shields.io/badge/dependency-graph-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-python/dependencies/InterdependencyGraph.html) [![Python](https://img.shields.io/pypi/pyversions/azure-core.svg?maxAge=2592000)](https://pypi.python.org/pypi/azure/) [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/python/python%20-%20core%20-%20ci?branchName=main)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=458&branchName=main)
3+
[![Packages](https://img.shields.io/badge/packages-latest-blue.svg)](https://azure.github.io/azure-sdk/releases/latest/python.html) [![Dependencies](https://img.shields.io/badge/dependency-report-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-python/dependencies/dependencies.html) [![DepGraph](https://img.shields.io/badge/dependency-graph-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-python/dependencies/dependencyGraph/index.html) [![Python](https://img.shields.io/pypi/pyversions/azure-core.svg?maxAge=2592000)](https://pypi.python.org/pypi/azure/) [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/python/python%20-%20core%20-%20ci?branchName=main)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=458&branchName=main)
44

55
This repository is for active development of the Azure SDK for Python. For consumers of the SDK we recommend visiting our [public developer docs](https://docs.microsoft.com/python/azure/) or our versioned [developer docs](https://azure.github.io/azure-sdk-for-python).
66

eng/pipelines/aggregate-reports.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,29 @@ stages:
2828
parameters:
2929
ScanPath: $(Build.SourcesDirectory)
3030

31-
- task: AzureFileCopy@2
32-
displayName: 'Upload dependency report'
31+
- task: AzureFileCopy@4
32+
displayName: 'Upload Dependency Report'
3333
condition: and(succeededOrFailed(), eq(variables['System.TeamProject'], 'internal'))
3434
inputs:
35-
sourcePath: '$(Build.ArtifactStagingDirectory)/reports'
35+
sourcePath: '$(Build.ArtifactStagingDirectory)/reports/*'
3636
azureSubscription: 'Azure SDK Artifacts'
3737
destination: AzureBlob
3838
storage: azuresdkartifacts
3939
containerName: 'azure-sdk-for-python'
4040
blobPrefix: dependencies
41+
AdditionalArgumentsForBlobCopy: '--exclude-pattern=*data.js*'
42+
43+
- task: AzureFileCopy@4
44+
displayName: 'Upload Dependency Graph'
45+
condition: and(succeededOrFailed(), eq(variables['System.TeamProject'], 'internal'))
46+
inputs:
47+
sourcePath: '$(Build.ArtifactStagingDirectory)/reports/*'
48+
azureSubscription: 'Azure SDK Artifacts'
49+
destination: AzureBlob
50+
storage: azuresdkartifacts
51+
containerName: 'azure-sdk-for-python'
52+
blobPrefix: dependencies/dependencyGraph
53+
AdditionalArgumentsForBlobCopy: '--include-pattern=*data.js*'
4154

4255
- task: PowerShell@2
4356
displayName: "Verify Repository Resource Refs"

eng/pipelines/templates/steps/analyze_dependency.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ steps:
2828
condition: succeededOrFailed()
2929
inputs:
3030
scriptPath: 'scripts/analyze_deps.py'
31-
arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports/data.js"'
31+
arguments: '--verbose --out "$(Build.ArtifactStagingDirectory)/reports/dependencies.html" --dump "$(Build.ArtifactStagingDirectory)/reports"'

scripts/analyze_deps.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,9 @@ def display_order(k):
411411
pkg_ids = [k for k in dump_data.keys()]
412412
for pkg_id in pkg_ids:
413413
resolve_lib_deps(dump_data, data_pkgs, pkg_id)
414-
with io.open(args.dump, 'w', encoding='utf-8') as dump_file:
414+
with io.open(f"{args.dump}/data.js", 'w', encoding='utf-8') as dump_file:
415415
dump_file.write('const data = ' + json.dumps(dump_data) + ';')
416+
with io.open(f"{args.dump}/arcdata.json", 'w', encoding='utf-8') as dump_file:
417+
dump_file.write(json.dumps(dump_data))
416418

417419
sys.exit(exitcode)

0 commit comments

Comments
 (0)