From 84010d461788216621067fa48fb5ae862615c0b7 Mon Sep 17 00:00:00 2001 From: Axel Suarez Martinez Date: Sun, 9 Mar 2025 17:37:28 -0700 Subject: [PATCH 01/18] Testing with setuptools-git-versioning in file mode --- VERSION | 1 + libraries/Core/microsoft-agents-core/pyproject.toml | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..6c6aa7cb --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.0 \ No newline at end of file diff --git a/libraries/Core/microsoft-agents-core/pyproject.toml b/libraries/Core/microsoft-agents-core/pyproject.toml index 83b4f67f..a7e60a5f 100644 --- a/libraries/Core/microsoft-agents-core/pyproject.toml +++ b/libraries/Core/microsoft-agents-core/pyproject.toml @@ -1,10 +1,14 @@ [build-system] -requires = ["setuptools"] +requires = ["setuptools>=41", "wheel", "setuptools-git-versioning>=2.0,<3", ] build-backend = "setuptools.build_meta" +[tool.setuptools-git-versioning] +enabled = true +version_file = "./../../../VERSION" + [project] name = "microsoft-agents-core" -version = "0.0.0a1" +dynamic = ["version"] description = "A protocol library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" From ab00042e94b54badba54c991170e441c504f1377 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 10 Mar 2025 13:00:30 -0700 Subject: [PATCH 02/18] test for versioning helper --- versioning-helper/TARGET-VERSION | 1 + versioning-helper/helper/__init__.py | 3 +++ versioning-helper/helper/placeholder.py | 2 ++ versioning-helper/pyproject.toml | 21 +++++++++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 versioning-helper/TARGET-VERSION create mode 100644 versioning-helper/helper/__init__.py create mode 100644 versioning-helper/helper/placeholder.py create mode 100644 versioning-helper/pyproject.toml diff --git a/versioning-helper/TARGET-VERSION b/versioning-helper/TARGET-VERSION new file mode 100644 index 00000000..ceab6e11 --- /dev/null +++ b/versioning-helper/TARGET-VERSION @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/versioning-helper/helper/__init__.py b/versioning-helper/helper/__init__.py new file mode 100644 index 00000000..c3da04f5 --- /dev/null +++ b/versioning-helper/helper/__init__.py @@ -0,0 +1,3 @@ +from .placeholder import placeholder + +__all__ = ["placeholder"] \ No newline at end of file diff --git a/versioning-helper/helper/placeholder.py b/versioning-helper/helper/placeholder.py new file mode 100644 index 00000000..5dce59dc --- /dev/null +++ b/versioning-helper/helper/placeholder.py @@ -0,0 +1,2 @@ +def placeholder(): + pass \ No newline at end of file diff --git a/versioning-helper/pyproject.toml b/versioning-helper/pyproject.toml new file mode 100644 index 00000000..4fd9aa66 --- /dev/null +++ b/versioning-helper/pyproject.toml @@ -0,0 +1,21 @@ +[build-system] +requires = ["setuptools>=41", "wheel", "setuptools-git-versioning>=2.0,<3", ] +build-backend = "setuptools.build_meta" + +[tool.setuptools-git-versioning] +enabled = true +version_file = "TARGET-VERSION" +count_commits_from_version_file = true +dev_template = "{tag}{env:MYVAR:.0.dev value}{ccount}" +dirty_template = "{tag}{env:MYVAR:.0.dev value}{ccount}" + +[project] +name = "helper" +dynamic = ["version"] +description = "Helper project to calculate verison" +authors = [{name = "Microsoft Corporation"}] +requires-python = ">=3.9" +classifiers = [ +] +dependencies = [ +] From 174e96b8ed8fd9182958266e7024cd9f5fdb8711 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 10 Mar 2025 14:11:21 -0700 Subject: [PATCH 03/18] versioning helper wip --- libraries/Core/microsoft-agents-core/pyproject.toml | 4 ++-- versioning-helper/TARGET-VERSION | 1 - versioning-helper/helper/__init__.py | 3 --- versioning-helper/helper/placeholder.py | 2 -- versioning/TARGET-VERSION | 1 + versioning/helper/__init__.py | 3 +++ versioning/helper/versioning.py | 2 ++ {versioning-helper => versioning}/pyproject.toml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 versioning-helper/TARGET-VERSION delete mode 100644 versioning-helper/helper/__init__.py delete mode 100644 versioning-helper/helper/placeholder.py create mode 100644 versioning/TARGET-VERSION create mode 100644 versioning/helper/__init__.py create mode 100644 versioning/helper/versioning.py rename {versioning-helper => versioning}/pyproject.toml (80%) diff --git a/libraries/Core/microsoft-agents-core/pyproject.toml b/libraries/Core/microsoft-agents-core/pyproject.toml index a7e60a5f..6ed79161 100644 --- a/libraries/Core/microsoft-agents-core/pyproject.toml +++ b/libraries/Core/microsoft-agents-core/pyproject.toml @@ -1,10 +1,10 @@ [build-system] requires = ["setuptools>=41", "wheel", "setuptools-git-versioning>=2.0,<3", ] -build-backend = "setuptools.build_meta" +build-backend = "setuptools.build_meta:__legacy__" [tool.setuptools-git-versioning] enabled = true -version_file = "./../../../VERSION" +version_callback = "helper:get_version" [project] name = "microsoft-agents-core" diff --git a/versioning-helper/TARGET-VERSION b/versioning-helper/TARGET-VERSION deleted file mode 100644 index ceab6e11..00000000 --- a/versioning-helper/TARGET-VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1 \ No newline at end of file diff --git a/versioning-helper/helper/__init__.py b/versioning-helper/helper/__init__.py deleted file mode 100644 index c3da04f5..00000000 --- a/versioning-helper/helper/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .placeholder import placeholder - -__all__ = ["placeholder"] \ No newline at end of file diff --git a/versioning-helper/helper/placeholder.py b/versioning-helper/helper/placeholder.py deleted file mode 100644 index 5dce59dc..00000000 --- a/versioning-helper/helper/placeholder.py +++ /dev/null @@ -1,2 +0,0 @@ -def placeholder(): - pass \ No newline at end of file diff --git a/versioning/TARGET-VERSION b/versioning/TARGET-VERSION new file mode 100644 index 00000000..98bb2cd0 --- /dev/null +++ b/versioning/TARGET-VERSION @@ -0,0 +1 @@ +0.1. \ No newline at end of file diff --git a/versioning/helper/__init__.py b/versioning/helper/__init__.py new file mode 100644 index 00000000..b08ea678 --- /dev/null +++ b/versioning/helper/__init__.py @@ -0,0 +1,3 @@ +from .versioning import get_version + +__all__ = ["get_version"] \ No newline at end of file diff --git a/versioning/helper/versioning.py b/versioning/helper/versioning.py new file mode 100644 index 00000000..88515eac --- /dev/null +++ b/versioning/helper/versioning.py @@ -0,0 +1,2 @@ +def get_version(): + return "0.0.1" \ No newline at end of file diff --git a/versioning-helper/pyproject.toml b/versioning/pyproject.toml similarity index 80% rename from versioning-helper/pyproject.toml rename to versioning/pyproject.toml index 4fd9aa66..4c6ac2e3 100644 --- a/versioning-helper/pyproject.toml +++ b/versioning/pyproject.toml @@ -6,8 +6,8 @@ build-backend = "setuptools.build_meta" enabled = true version_file = "TARGET-VERSION" count_commits_from_version_file = true -dev_template = "{tag}{env:MYVAR:.0.dev value}{ccount}" -dirty_template = "{tag}{env:MYVAR:.0.dev value}{ccount}" +dev_template = "{tag}{ccount}" +dirty_template = "{tag}{ccount}" [project] name = "helper" From b85d47a7afb913d2832e62478fd43bde796f9b7b Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 10 Mar 2025 17:56:14 -0700 Subject: [PATCH 04/18] versioning script WIP --- replace-version.ps1 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 replace-version.ps1 diff --git a/replace-version.ps1 b/replace-version.ps1 new file mode 100644 index 00000000..fd4f0f70 --- /dev/null +++ b/replace-version.ps1 @@ -0,0 +1,3 @@ +cd ./versioning +$ActualVersion = & { setuptools-git-versioning } +Write-Output $ActualVersion \ No newline at end of file From 016ec0a7257a4e1c61fcb8a04c3cf99aa3dd5ca4 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 11 Mar 2025 11:49:18 -0700 Subject: [PATCH 05/18] dynamic version and dynamic dependencies working. needs integration into env variables --- .../pyproject.toml | 24 ++++++++++++------- versioning/helper/versioning.py | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml b/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml index f05cfa9b..648be6aa 100644 --- a/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml +++ b/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml @@ -1,10 +1,22 @@ [build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" +requires = ["setuptools", "setuptools_dynamic_dependencies", "wheel", "setuptools-git-versioning>=2.0,<3"] +build-backend = "setuptools.build_meta:__legacy__" + +[tool.setuptools-git-versioning] +enabled = true +version_callback = "helper:get_version" + +[tool.setuptools_dynamic_requires] +dependencies = [ + "dynamic-package == {version}", + "msal>=1.31.1", + "requests>=2.32.3", + "cryptography>=44.0.0", +] [project] name = "microsoft-agents-authorization-msal" -version = "0.0.0a1" +dynamic = ["version", "dependencies"] description = "A msal-based authentication library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" @@ -13,12 +25,6 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ] -dependencies = [ - "microsoft-agents-authentication", - "msal>=1.31.1", - "requests>=2.32.3", - "cryptography>=44.0.0", -] [project.urls] "Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" diff --git a/versioning/helper/versioning.py b/versioning/helper/versioning.py index 88515eac..f2f25aa1 100644 --- a/versioning/helper/versioning.py +++ b/versioning/helper/versioning.py @@ -1,2 +1,2 @@ def get_version(): - return "0.0.1" \ No newline at end of file + return "0.0.0a1" \ No newline at end of file From 1ad280c80cc36902cb347100b6a5e9d343905e2e Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 09:25:51 -0700 Subject: [PATCH 06/18] Resolving formatting issues --- libraries/microsoft-agents-activity/setup.py | 2 +- libraries/microsoft-agents-authentication-msal/setup.py | 2 +- libraries/microsoft-agents-copilotstudio-client/setup.py | 2 +- libraries/microsoft-agents-hosting-aiohttp/setup.py | 2 +- libraries/microsoft-agents-hosting-core/setup.py | 2 +- libraries/microsoft-agents-hosting-teams/setup.py | 2 +- libraries/microsoft-agents-storage-blob/setup.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/microsoft-agents-activity/setup.py b/libraries/microsoft-agents-activity/setup.py index aba2e62b..9b6de9af 100644 --- a/libraries/microsoft-agents-activity/setup.py +++ b/libraries/microsoft-agents-activity/setup.py @@ -5,4 +5,4 @@ setup( version=package_version, -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-authentication-msal/setup.py b/libraries/microsoft-agents-authentication-msal/setup.py index 104f0a51..9f82f11d 100644 --- a/libraries/microsoft-agents-authentication-msal/setup.py +++ b/libraries/microsoft-agents-authentication-msal/setup.py @@ -11,4 +11,4 @@ "requests>=2.32.3", "cryptography>=44.0.0", ], -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-copilotstudio-client/setup.py b/libraries/microsoft-agents-copilotstudio-client/setup.py index bf9c8e2e..41a7da0d 100644 --- a/libraries/microsoft-agents-copilotstudio-client/setup.py +++ b/libraries/microsoft-agents-copilotstudio-client/setup.py @@ -8,4 +8,4 @@ install_requires=[ f"microsoft-agents-hosting-core=={package_version}", ], -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-hosting-aiohttp/setup.py b/libraries/microsoft-agents-hosting-aiohttp/setup.py index 189cf1ab..426735ba 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/setup.py +++ b/libraries/microsoft-agents-hosting-aiohttp/setup.py @@ -9,4 +9,4 @@ f"microsoft-agents-hosting-core=={package_version}", "aiohttp>=3.11.11", ], -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-hosting-core/setup.py b/libraries/microsoft-agents-hosting-core/setup.py index 2c049947..e7604116 100644 --- a/libraries/microsoft-agents-hosting-core/setup.py +++ b/libraries/microsoft-agents-hosting-core/setup.py @@ -12,4 +12,4 @@ "azure-core>=1.30.0", "python-dotenv>=1.1.1", ], -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-hosting-teams/setup.py b/libraries/microsoft-agents-hosting-teams/setup.py index 189cf1ab..426735ba 100644 --- a/libraries/microsoft-agents-hosting-teams/setup.py +++ b/libraries/microsoft-agents-hosting-teams/setup.py @@ -9,4 +9,4 @@ f"microsoft-agents-hosting-core=={package_version}", "aiohttp>=3.11.11", ], -) \ No newline at end of file +) diff --git a/libraries/microsoft-agents-storage-blob/setup.py b/libraries/microsoft-agents-storage-blob/setup.py index b5aa2d37..d38c25bb 100644 --- a/libraries/microsoft-agents-storage-blob/setup.py +++ b/libraries/microsoft-agents-storage-blob/setup.py @@ -10,4 +10,4 @@ "azure-core", "azure-storage-blob", ], -) \ No newline at end of file +) From 6d22d26269767d942c3527843f03f29de8b8b299 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 10:09:46 -0700 Subject: [PATCH 07/18] Adding missing dependencies for build --- .azdo/ci-pr.yaml | 2 +- .github/workflows/python-package.yml | 2 +- .../microsoft-agents-storage-cosmos/pyproject.toml | 7 +------ libraries/microsoft-agents-storage-cosmos/setup.py | 13 +++++++++++++ 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 libraries/microsoft-agents-storage-cosmos/setup.py diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index f9c61660..8aa01ecb 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -22,7 +22,7 @@ steps: - script: | python -m pip install --upgrade pip - python -m pip install flake8 pytest black pytest-asyncio build + python -m pip install flake8 pytest black pytest-asyncio build setuptools-git-versioning if [ -f requirements.txt ]; then pip install -r requirements.txt; fi displayName: 'Install dependencies' diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5adb9a37..784033e6 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install flake8 pytest black pytest-asyncio build + python -m pip install flake8 pytest black pytest-asyncio build setuptools-git-versioning if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Check format with black run: | diff --git a/libraries/microsoft-agents-storage-cosmos/pyproject.toml b/libraries/microsoft-agents-storage-cosmos/pyproject.toml index 611d6e46..59d22815 100644 --- a/libraries/microsoft-agents-storage-cosmos/pyproject.toml +++ b/libraries/microsoft-agents-storage-cosmos/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "microsoft-agents-storage-cosmos" -version = "0.0.0a1" +dynamic = ["version", "dependencies"] description = "A Cosmos DB storage library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" @@ -13,11 +13,6 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ] -dependencies = [ - "microsoft-agents-hosting-core", - "azure-core", - "azure-cosmos", -] [project.urls] "Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-storage-cosmos/setup.py b/libraries/microsoft-agents-storage-cosmos/setup.py new file mode 100644 index 00000000..8f09a0d2 --- /dev/null +++ b/libraries/microsoft-agents-storage-cosmos/setup.py @@ -0,0 +1,13 @@ +from os import environ +from setuptools import setup + +package_version = environ.get("PackageVersion", "0.0.0") + +setup( + version=package_version, + install_requires=[ + f"microsoft-agents-hosting-core=={package_version}", + "azure-core", + "azure-cosmos", + ], +) From 51372c069b8a5339e7bb75638950669c9be5bbab Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 10:18:39 -0700 Subject: [PATCH 08/18] Dependencies fix --- libraries/microsoft-agents-authentication-msal/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/microsoft-agents-authentication-msal/setup.py b/libraries/microsoft-agents-authentication-msal/setup.py index 9f82f11d..67315bcf 100644 --- a/libraries/microsoft-agents-authentication-msal/setup.py +++ b/libraries/microsoft-agents-authentication-msal/setup.py @@ -6,7 +6,7 @@ setup( version=package_version, install_requires=[ - f"microsoft-agents-authentication=={package_version}", + f"microsoft-agents-hosting-core=={package_version}", "msal>=1.31.1", "requests>=2.32.3", "cryptography>=44.0.0", From ed8d46b6a07e53da95701998678948e3a5c6cc7f Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 11:00:36 -0700 Subject: [PATCH 09/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 1 + VERSION | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 VERSION diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 8aa01ecb..79972da6 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -37,6 +37,7 @@ steps: - script: | PACKAGE_VERSION=$(pwsh -File replace-version.ps1) echo "##vso[task.setvariable variable=PackageVersion]$PACKAGE_VERSION" + echo "Package version set to: $PACKAGE_VERSION" displayName: 'Set package version' - script: | diff --git a/VERSION b/VERSION deleted file mode 100644 index 6c6aa7cb..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.0 \ No newline at end of file From 76935130d97c07a2b61f3ab08cf28b8459a8e126 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 11:19:04 -0700 Subject: [PATCH 10/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 79972da6..d176c745 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -38,16 +38,13 @@ steps: PACKAGE_VERSION=$(pwsh -File replace-version.ps1) echo "##vso[task.setvariable variable=PackageVersion]$PACKAGE_VERSION" echo "Package version set to: $PACKAGE_VERSION" - displayName: 'Set package version' - -- script: | mkdir -p dist for dir in libraries/*; do if [ -f "$dir/pyproject.toml" ]; then (cd "$dir" && python -m build --outdir ../../dist) fi done - displayName: 'Build packages' + displayName: 'Set Version and Build packages' - script: | python -m pip install ./dist/microsoft_agents_activity*.whl From ec32ce3bcc53d459aaad90e2f114c341e4932495 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 11:38:25 -0700 Subject: [PATCH 11/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 2 ++ .github/workflows/python-package.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index d176c745..01779be3 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -44,6 +44,8 @@ steps: (cd "$dir" && python -m build --outdir ../../dist) fi done + env: + PackageVersion: $(PackageVersion) displayName: 'Set Version and Build packages' - script: | diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 784033e6..bd170570 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -45,6 +45,7 @@ jobs: run: | $version = & ./replace-version.ps1 echo "PackageVersion=$version" >> $env:GITHUB_ENV + Write-Host "Package version set to: $version" - name: Build packages run: | mkdir -p dist From c602ecb1d3048e78b23e8cc7025a089d8d24732f Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 11:50:50 -0700 Subject: [PATCH 12/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 01779be3..6e7b971c 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -36,8 +36,11 @@ steps: - script: | PACKAGE_VERSION=$(pwsh -File replace-version.ps1) - echo "##vso[task.setvariable variable=PackageVersion]$PACKAGE_VERSION" echo "Package version set to: $PACKAGE_VERSION" + echo "##vso[task.setvariable variable=PackageVersion;isOutput=true]$PACKAGE_VERSION" + displayName: 'Set package version' + +- script: | mkdir -p dist for dir in libraries/*; do if [ -f "$dir/pyproject.toml" ]; then @@ -45,7 +48,7 @@ steps: fi done env: - PackageVersion: $(PackageVersion) + PackageVersion: $[ dependencies.PackageVersion ] displayName: 'Set Version and Build packages' - script: | From 2b55b9825fbc69478a7b55914a624a8bcf8e605c Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 11:56:20 -0700 Subject: [PATCH 13/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 6e7b971c..eb884b13 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -48,7 +48,7 @@ steps: fi done env: - PackageVersion: $[ dependencies.PackageVersion ] + PackageVersion: $(PackageVersion) displayName: 'Set Version and Build packages' - script: | From b2cfa4618bc029cd2634456593f12c52c7dd126f Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 12:02:42 -0700 Subject: [PATCH 14/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index eb884b13..572bdb12 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -38,6 +38,7 @@ steps: PACKAGE_VERSION=$(pwsh -File replace-version.ps1) echo "Package version set to: $PACKAGE_VERSION" echo "##vso[task.setvariable variable=PackageVersion;isOutput=true]$PACKAGE_VERSION" + shell: bash displayName: 'Set package version' - script: | From 55fdce03e97ec6a7443b38ba325f29edfafa85fe Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 12:06:46 -0700 Subject: [PATCH 15/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 572bdb12..efd28f64 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -14,6 +14,10 @@ strategy: Python_3.11: PYTHON_VERSION: '3.11' +variables: + - name: PackageVersion + value: '' + steps: - task: UsePythonVersion@0 inputs: @@ -38,7 +42,6 @@ steps: PACKAGE_VERSION=$(pwsh -File replace-version.ps1) echo "Package version set to: $PACKAGE_VERSION" echo "##vso[task.setvariable variable=PackageVersion;isOutput=true]$PACKAGE_VERSION" - shell: bash displayName: 'Set package version' - script: | From a22ebbd00363e34e0b6811b68f35d9eab238250e Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 12:18:39 -0700 Subject: [PATCH 16/18] ADO pipeline wip --- .azdo/ci-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index efd28f64..309ad820 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -41,7 +41,7 @@ steps: - script: | PACKAGE_VERSION=$(pwsh -File replace-version.ps1) echo "Package version set to: $PACKAGE_VERSION" - echo "##vso[task.setvariable variable=PackageVersion;isOutput=true]$PACKAGE_VERSION" + echo "##vso[task.setvariable variable=PackageVersion]$PACKAGE_VERSION" displayName: 'Set package version' - script: | From dace5c3c426b33e54505051e36599d6a8e8436cb Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 12:32:07 -0700 Subject: [PATCH 17/18] GH pipeline wip --- .azdo/ci-pr.yaml | 3 ++- .github/workflows/python-package.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 309ad820..01189e5c 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -40,9 +40,10 @@ steps: - script: | PACKAGE_VERSION=$(pwsh -File replace-version.ps1) - echo "Package version set to: $PACKAGE_VERSION" echo "##vso[task.setvariable variable=PackageVersion]$PACKAGE_VERSION" + echo "Package version set to: $PACKAGE_VERSION" displayName: 'Set package version' + condition: eq(variables['PackageVersion'], '') - script: | mkdir -p dist diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index bd170570..6020df0a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -41,9 +41,9 @@ jobs: # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --show-source --statistics - name: Set package version - shell: pwsh run: | - $version = & ./replace-version.ps1 + cd ./versioning + $version = & { setuptools-git-versioning } echo "PackageVersion=$version" >> $env:GITHUB_ENV Write-Host "Package version set to: $version" - name: Build packages From c236737702e56c8565290df5cca92b03aa5e5a78 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 24 Jul 2025 12:35:36 -0700 Subject: [PATCH 18/18] GH pipeline wip --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6020df0a..f50d8d14 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -43,9 +43,9 @@ jobs: - name: Set package version run: | cd ./versioning - $version = & { setuptools-git-versioning } - echo "PackageVersion=$version" >> $env:GITHUB_ENV - Write-Host "Package version set to: $version" + version=$(setuptools-git-versioning) + echo "PackageVersion=$version" >> $GITHUB_ENV + echo "Package version set to: $version" - name: Build packages run: | mkdir -p dist