utf-queue-client 1.21.4b4__tar.gz → 1.21.4b5__tar.gz

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/Jenkinsfile

@@ -106,9 +106,9 @@ pipeline {
             }
         }
         stage('Deploy to pypi') {
-            // when {
-            //      branch 'main'
-            // }
+            when {
+                 branch 'main'
+            }
             environment {
                 TWINE_REPOSITORY_URL = "https://upload.pypi.org/legacy/"
                 TWINE_USERNAME = "__token__"
@@ -126,10 +126,50 @@ pipeline {
                         rm -rf utf_queue_client.egg-info
                         python3 -m build
 
-                        twine upload dist/* --verbose
+                        twine upload dist/*
                     '''
                 }
             }
         }
+        stage('Deploy to PyPI (Beta)') {
+            when {
+                branch 'develop'
+            }
+            environment {
+                TWINE_REPOSITORY_URL = "https://upload.pypi.org/legacy/"
+                TWINE_USERNAME = "__token__"
+            }
+            steps {
+                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: "[ERROR] Beta deployment failed - check version suffix") {
+                    withVaultOnAgent(vaultSecrets: vaultSecrets) {
+                        sh '''
+                            if [ ! -f venv/bin/activate ]; then
+                               python3 -m venv venv
+                            fi
+                            . venv/bin/activate
+                            pip3 install wheel && pip3 install -r test-requirements.txt build
+                            rm -rf build
+                            rm -rf dist
+                            rm -rf utf_queue_client.egg-info
+
+                            # Extract version from pyproject.toml
+                            VERSION=$(grep -oP 'version = "\\K[^"]+' pyproject.toml)
+                            
+                            # Validate version contains alphabetic characters (alpha/beta/rc/dev)
+                            if ! echo "${VERSION}" | grep -qE '[a-zA-Z]'; then
+                                echo "[ERROR] Version '${VERSION}' in pyproject.toml must contain alpha/beta/rc/dev suffix"
+                                exit 1
+                            fi
+                            
+                            echo "[INFO] Deploying beta version: ${VERSION}"
+
+                            python3 -m build
+
+                            twine upload dist/*
+                        '''
+                    }
+                }
+            }
+        }
     }
 }

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.21.4b4
+Version: 1.21.4b5
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF
@@ -14,7 +14,6 @@ Requires-Dist: typing_extensions; python_version < "3.8"
 Requires-Dist: click
 Requires-Dist: certifi>=2020.4
 Requires-Dist: ubai-client>=1.2.0
-Requires-Dist: package-release-metadata-client
 Requires-Dist: opentelemetry-distro[otlp]
 Requires-Dist: otel-extensions>=0.1.2
 Requires-Dist: retry>=0.9.2

utf_queue_client-1.21.4b5/README.md

@@ -0,0 +1,53 @@
+# UTF Queue Client Python
+
+Python client library for UTF Queue operations.
+
+## Development & Deployment
+
+### Beta Releases (develop branch)
+Push to `develop` branch automatically deploys beta version to PyPI.
+
+**Requirements:**
+- Version in `pyproject.toml` must contain alphabetic suffix (`alpha`, `beta`, `rc`, `dev`)
+- Example: `version = "1.21.4-beta.1"`
+
+**Workflow:**
+```bash
+# Update version to beta
+# Edit pyproject.toml: version = "1.21.4-beta.1"
+git add pyproject.toml
+git commit -m "Bump to 1.21.4-beta.1"
+git push origin develop
+```
+
+**Pipeline validates:** Version contains alphabetic characters, fails stage if missing.
+
+### Production Releases (main branch)
+Push to `main` branch automatically deploys stable version to PyPI.
+
+**Requirements:**
+- Version in `pyproject.toml` should be stable (no suffix)
+- Example: `version = "1.21.5"`
+
+**Workflow:**
+```bash
+git checkout main
+git merge develop
+# Edit pyproject.toml: version = "1.21.5"
+git commit -m "Release 1.21.5"
+git push origin main
+```
+
+## Installation
+
+**Stable release:**
+```bash
+pip install utf-queue-client
+```
+
+**Beta/pre-release:**
+```bash
+pip install --pre utf-queue-client
+# Or specify exact version:
+pip install utf-queue-client==1.21.4-beta.1
+```

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utf-queue-client"
-version = "1.21.4b4"
+version = "1.21.4b5"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }
@@ -20,7 +20,6 @@ dependencies = [
     "click",
     "certifi >= 2020.4",
     "ubai-client >= 1.2.0",
-    "package-release-metadata-client",
     "opentelemetry-distro[otlp]",
     "otel-extensions >= 0.1.2",
     "retry>=0.9.2",
@@ -37,8 +36,6 @@ publish_test_results_cli = "utf_queue_client.scripts.publish_test_results_cli:cl
 ubai_update_retention_cli = "utf_queue_client.scripts.ubai_update_retention_cli:cli_entrypoint"
 publish_release_info_cli = "utf_queue_client.scripts.publish_release_info_cli:cli_entrypoint"
 ubai_copy_cli = "utf_queue_client.scripts.ubai_copy_cli:cli_entrypoint"
-pkgrelease_quality_status_update = "utf_queue_client.scripts.package_release_metadata_cli:update_cli_entrypoint"
-pkgrelease_quality_status_enquiry = "utf_queue_client.scripts.package_release_metadata_cli:enquiry_cli_entrypoint"
 
 [tool.setuptools.packages.find]
 include = ["utf_queue_client"]
@@ -50,9 +47,6 @@ utf_queue_client = [
     "models/schemas/utf_queue_models/schema/*.json",
 ]
 
-[tool.uv]
-extra-index-url = ["https://artifactory-bos.silabs.net/artifactory/api/pypi/infrasw-python-local/simple"]
-
 [tool.ruff]
 fix = true
 line-length = 88

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/requirements.txt

@@ -1,4 +1,3 @@
---extra-index-url https://artifactory-bos.silabs.net/artifactory/api/pypi/infrasw-python-local/simple
 pika>=1.2.0
 jsonschema>=3.2.0
 msgpack>=1.0.2
@@ -9,7 +8,6 @@ typing_extensions; python_version < '3.8'
 click
 certifi>=2020.4
 ubai-client>=1.2.0
-package-release-metadata-client==0.1.2
 opentelemetry-distro[otlp]
 otel-extensions>=0.2.4
 retry>=0.9.2

{utf_queue_client-1.21.4b4/test/scripts → utf_queue_client-1.21.4b5/test}/test_publish_release_info.py

@@ -41,9 +41,7 @@ def test_publish_release_info(request, publish_release_info):
     for k, v in publish_release_info:
         args += ["--data", k, v]
 
-    base_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    base_dir = os.path.dirname(os.path.dirname(__file__))
 
     @inject_context_to_env
     def call_cli_script():

{utf_queue_client-1.21.4b4/test/scripts → utf_queue_client-1.21.4b5/test}/test_publish_test_results.py

@@ -118,9 +118,7 @@ def test_jobstatus_session_data(request, session_start_data, session_stop_data):
     for k, v in session_stop_data:
         stop_args += ["--data", k, v]
 
-    base_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    base_dir = os.path.dirname(os.path.dirname(__file__))
 
     @inject_context_to_env
     def call_cli_script():
@@ -179,9 +177,7 @@ def test_app_build_results_data(request, app_build_results_data):
     for k, v in app_build_results_data:
         args += ["--data", k, v]
 
-    base_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    base_dir = os.path.dirname(os.path.dirname(__file__))
 
     @inject_context_to_env
     def call_cli_script():

{utf_queue_client-1.21.4b4/test/scripts → utf_queue_client-1.21.4b5/test}/test_ubai_copy.py

@@ -101,9 +101,7 @@ def test_ubai_copy_cli(
 def test_ubai_copy_cli_script(
     artifact_id, copy_name, copy_extension, copy_metadata, set_environment_variables
 ):
-    base_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    base_dir = os.path.dirname(os.path.dirname(__file__))
 
     args = [
         "--artifact_id",

{utf_queue_client-1.21.4b4/test/scripts → utf_queue_client-1.21.4b5/test}/test_ubai_update_retention.py

@@ -47,7 +47,7 @@ def test_ubai_search_cli_script(set_environment_variable):
             [
                 sys.executable,
                 str(
-                    pathlib.Path(__file__).resolve().parent.parent.parent
+                    pathlib.Path(__file__).parent.parent
                     / os.path.join(
                         "utf_queue_client", "scripts", "ubai_update_retention_cli.py"
                     )

{utf_queue_client-1.21.4b4/test/scripts → utf_queue_client-1.21.4b5/test}/test_ubai_upload.py

@@ -30,9 +30,7 @@ def metadata():
 )
 @pytest.mark.parametrize("use_queue", [True, False])
 def test_ubai_upload_cli(request, metadata, set_environment_variable, use_queue):
-    file = os.path.join(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "test.hex"
-    )
+    file = os.path.join(os.path.dirname(__file__), "test.hex")
 
     username = os.environ["UTF_QUEUE_USERNAME"]
     password = os.environ["UTF_QUEUE_PASSWORD"]
@@ -105,12 +103,8 @@ def test_ubai_upload_cli_large_file(
 def test_ubai_upload_cli_script(
     request, metadata, use_queue, set_environment_variables
 ):
-    file = os.path.join(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "test.hex"
-    )
-    base_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    file = os.path.join(os.path.dirname(__file__), "test.hex")
+    base_dir = os.path.dirname(os.path.dirname(__file__))
 
     client_id = request.node.name
     args = ["--file-path", file, "--client-id", client_id]

utf_queue_client-1.21.4b5/test-requirements-pydantic-v1.txt

@@ -0,0 +1,14 @@
+-r requirements.txt
+pytest
+black
+wheel
+twine
+requests
+pytest-cov
+opentelemetry-distro[otlp]==0.35b0
+opentelemetry-instrumentation-urllib3==0.35b0
+otel-extensions-pytest>=0.1.2
+pytest-mock
+pytest-xdist
+pydantic==1.*
+pre-commit

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/test-requirements.txt

@@ -10,5 +10,5 @@ opentelemetry-instrumentation-urllib3==0.40b0
 otel-extensions-pytest>=0.1.2
 pytest-mock
 pytest-xdist
-pydantic==2.10.6
+pydantic==2.*
 pre-commit

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v1.py

@@ -220,6 +220,9 @@ class SqaTestSession(BaseModel):
     from_build_num: Optional[float] = Field(
         None, description="Build number from which the test originated"
     )
+    test_framework_version: Optional[constr(max_length=250)] = Field(
+        None, description="Test Framework version on which the test ran"
+    )
 
 
 class LogEvent(BaseModel):

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v2.py

@@ -218,6 +218,9 @@ class SqaTestSession(BaseModel):
     from_build_num: Optional[float] = Field(
         None, description="Build number from which the test originated"
     )
+    test_framework_version: Optional[constr(max_length=250)] = Field(
+        None, description="Test Framework version on which the test ran"
+    )
 
 
 class LogEvent(BaseModel):

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json

@@ -635,6 +635,11 @@
             "from_build_num": {
                "description": "Build number from which the test originated",
                "type": "number"
+            },
+            "test_framework_version": {
+               "description": "Test Framework version on which the test ran",
+               "maxLength": 250,
+               "type": "string"
             }
          },
          "required": [

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client/scripts/publish_test_results_cli.py

@@ -169,6 +169,7 @@ def prepare_session_data(data_dict: dict):
         package_name=data_dict.get("package_name"),
         from_branch_name=data_dict.get("from_branch_name"),
         from_build_num=data_dict.get("from_build_num"),
+        test_framework_version=data_dict.get("test_framework_version"),
     )
 
 

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.21.4b4
+Version: 1.21.4b5
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF
@@ -14,7 +14,6 @@ Requires-Dist: typing_extensions; python_version < "3.8"
 Requires-Dist: click
 Requires-Dist: certifi>=2020.4
 Requires-Dist: ubai-client>=1.2.0
-Requires-Dist: package-release-metadata-client
 Requires-Dist: opentelemetry-distro[otlp]
 Requires-Dist: otel-extensions>=0.1.2
 Requires-Dist: retry>=0.9.2

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client.egg-info/SOURCES.txt

@@ -23,25 +23,24 @@ test/silabs-intermediate.pem
 test/silabs-root.pem
 test/stopwatch.py
 test/test.hex
+test/test_amqp_connections.py
+test/test_async_consumer.py
+test/test_ca_cert.py
+test/test_connection_retry.py
+test/test_data_lake_data_producer.py
+test/test_http_producer.py
 test/test_models.py
+test/test_opentelemetry_data_producer.py
+test/test_publish_release_info.py
+test/test_publish_test_results.py
+test/test_rail_data_producer_tests.py
+test/test_sqa_test_result_producer.py
+test/test_ubai_copy.py
+test/test_ubai_search.py
+test/test_ubai_update_retention.py
+test/test_ubai_upload.py
 test/test_utils.py
-test/clients/test_amqp_connections.py
-test/clients/test_async_consumer.py
-test/clients/test_connection_retry.py
-test/clients/test_data_lake_data_producer.py
-test/clients/test_http_producer.py
-test/clients/test_opentelemetry_data_producer.py
-test/clients/test_rail_data_producer_tests.py
-test/clients/test_sqa_test_result_producer.py
-test/clients/test_xray_data_producer.py
-test/scripts/test_ca_cert.py
-test/scripts/test_package_release_metadata_cli.py
-test/scripts/test_publish_release_info.py
-test/scripts/test_publish_test_results.py
-test/scripts/test_ubai_copy.py
-test/scripts/test_ubai_search.py
-test/scripts/test_ubai_update_retention.py
-test/scripts/test_ubai_upload.py
+test/test_xray_data_producer.py
 tools/build_dist.bat
 tools/setup_venv.bat
 tools/silabs-net.pem
@@ -78,7 +77,6 @@ utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_
 utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v2.py
 utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json
 utf_queue_client/scripts/__init__.py
-utf_queue_client/scripts/package_release_metadata_cli.py
 utf_queue_client/scripts/publish_release_info_cli.py
 utf_queue_client/scripts/publish_test_results_cli.py
 utf_queue_client/scripts/ubai_copy_cli.py

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client.egg-info/entry_points.txt

@@ -1,6 +1,4 @@
 [console_scripts]
-pkgrelease_quality_status_enquiry = utf_queue_client.scripts.package_release_metadata_cli:enquiry_cli_entrypoint
-pkgrelease_quality_status_update = utf_queue_client.scripts.package_release_metadata_cli:update_cli_entrypoint
 publish_release_info_cli = utf_queue_client.scripts.publish_release_info_cli:cli_entrypoint
 publish_test_results_cli = utf_queue_client.scripts.publish_test_results_cli:cli_entrypoint
 ubai_copy_cli = utf_queue_client.scripts.ubai_copy_cli:cli_entrypoint

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.4b5}/utf_queue_client.egg-info/requires.txt

@@ -6,7 +6,6 @@ regex
 click
 certifi>=2020.4
 ubai-client>=1.2.0
-package-release-metadata-client
 opentelemetry-distro[otlp]
 otel-extensions>=0.1.2
 retry>=0.9.2