From 2b3352980e9b1f8c715039257be414411763cdb7 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 11:09:38 -0800 Subject: [PATCH 01/11] add sbom to payload --- azure-pipelines.yml | 11 +++++------ setup.py | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20b0fbdc..373e221e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,17 +50,16 @@ stages: pip install pytest pytest-azurepipelines pytest displayName: 'pytest' - - - script: | - python setup.py sdist bdist_wheel - workingDirectory: $(baseFolder) - displayName: 'Building' - task: ManifestGeneratorTask@0 displayName: "SBOM Generation Task" inputs: BuildComponentPath: '$(baseFolder)' - BuildDropPath: dist + BuildDropPath: $(baseFolder) Verbosity: "Information" + - script: | + python setup.py sdist bdist_wheel + workingDirectory: $(baseFolder) + displayName: 'Building' - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: dist' inputs: diff --git a/setup.py b/setup.py index 705d2dd5..8520a470 100644 --- a/setup.py +++ b/setup.py @@ -65,6 +65,7 @@ def run(self, *args, **kwargs): 'pytest-asyncio==0.10.0' ], include_package_data=True, + package_data={'_manifest': ['*']} cmdclass={ 'build': BuildModule }, From 95bb221073b9ca68d03507dfc4d41a959d802765 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 11:13:27 -0800 Subject: [PATCH 02/11] add missing comma --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8520a470..350faaeb 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ def run(self, *args, **kwargs): 'pytest-asyncio==0.10.0' ], include_package_data=True, - package_data={'_manifest': ['*']} + package_data={'_manifest': ['*']}, cmdclass={ 'build': BuildModule }, From 29a8f4dea563fd3e544d8954d55858a051452071 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 11:18:54 -0800 Subject: [PATCH 03/11] add ls'es for visibility into CI --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 373e221e..622e3b49 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,10 +56,16 @@ stages: BuildComponentPath: '$(baseFolder)' BuildDropPath: $(baseFolder) Verbosity: "Information" + - script: ls + workingDirectory: $(baseFolder) + displayName: 'ls 1' - script: | python setup.py sdist bdist_wheel workingDirectory: $(baseFolder) displayName: 'Building' + - script: ls + workingDirectory: $(baseFolder) + displayName: 'ls 2' - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: dist' inputs: From 2df6cd570e42a4db0b3ebbd92a2285137fc9795d Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 11:50:38 -0800 Subject: [PATCH 04/11] add manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..769745f4 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include _manifest \ No newline at end of file From 160e1be9c4990adc0a38c71b8b3cded0e0ae89fc Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 12:17:37 -0800 Subject: [PATCH 05/11] add manifest folder to sdist --- MANIFEST.in | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 769745f4..238343da 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include _manifest \ No newline at end of file +include ./_manifest \ No newline at end of file diff --git a/setup.py b/setup.py index 350faaeb..705d2dd5 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,6 @@ def run(self, *args, **kwargs): 'pytest-asyncio==0.10.0' ], include_package_data=True, - package_data={'_manifest': ['*']}, cmdclass={ 'build': BuildModule }, From a7d79bda3a401db2571a3c4d3dfcf57cf9374222 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 13:34:05 -0800 Subject: [PATCH 06/11] fix manifest include --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 238343da..82301549 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include ./_manifest \ No newline at end of file +include ./_manifest/* \ No newline at end of file From 0dd70e0247662054314110870fd6f6d577d33d42 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 13:48:48 -0800 Subject: [PATCH 07/11] include _manifest in whl --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 705d2dd5..41d6aa39 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,8 @@ import shutil import subprocess import sys -import glob +from glob import glob from setuptools import setup, find_packages from distutils.command import build @@ -65,6 +65,9 @@ def run(self, *args, **kwargs): 'pytest-asyncio==0.10.0' ], include_package_data=True, + data_files= [ + ('_manifest',glob('_manifest/**/*', recursive=True)), + ], cmdclass={ 'build': BuildModule }, From b6ec280a57e1df0890627fcd910631a9f03f01f5 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 14:23:34 -0800 Subject: [PATCH 08/11] glob match only file-types --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 41d6aa39..fe333cc3 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def run(self, *args, **kwargs): ], include_package_data=True, data_files= [ - ('_manifest',glob('_manifest/**/*', recursive=True)), + ('_manifest',glob('_manifest/**/*.*', recursive=True)), ], cmdclass={ 'build': BuildModule From 247e15bbfa231d3b4ecc49d18e82924a46f67ad1 Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 15:07:28 -0800 Subject: [PATCH 09/11] add isfile filter to data_files --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fe333cc3..fc52b5bb 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def run(self, *args, **kwargs): ], include_package_data=True, data_files= [ - ('_manifest',glob('_manifest/**/*.*', recursive=True)), + ('_manifest', filter(os.path.isfile, glob('_manifest/**/*.*', recursive=True))), ], cmdclass={ 'build': BuildModule From dfb196a5f157792fdb652d16724a251e69ca12df Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 15:16:39 -0800 Subject: [PATCH 10/11] force-eval data-files filter --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fc52b5bb..5ca6e6b2 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def run(self, *args, **kwargs): ], include_package_data=True, data_files= [ - ('_manifest', filter(os.path.isfile, glob('_manifest/**/*.*', recursive=True))), + ('_manifest', list(filter(os.path.isfile, glob('_manifest/**/*', recursive=True)))), ], cmdclass={ 'build': BuildModule From a041ab13c3300a0caa8f4b082002afca1ea1fccc Mon Sep 17 00:00:00 2001 From: David Justo Date: Wed, 9 Feb 2022 15:19:50 -0800 Subject: [PATCH 11/11] remove ls --- azure-pipelines.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 622e3b49..373e221e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,16 +56,10 @@ stages: BuildComponentPath: '$(baseFolder)' BuildDropPath: $(baseFolder) Verbosity: "Information" - - script: ls - workingDirectory: $(baseFolder) - displayName: 'ls 1' - script: | python setup.py sdist bdist_wheel workingDirectory: $(baseFolder) displayName: 'Building' - - script: ls - workingDirectory: $(baseFolder) - displayName: 'ls 2' - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: dist' inputs: