From 25047c4bf44f1fc88765730fcaf68404840fd0b5 Mon Sep 17 00:00:00 2001 From: Jeremy Dyer Date: Fri, 17 Jan 2025 17:11:15 -0500 Subject: [PATCH] Update conda package build string and number (#342) --- conda/packages/nv_ingest/meta.yaml | 5 ++++- conda/packages/nv_ingest_client/meta.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conda/packages/nv_ingest/meta.yaml b/conda/packages/nv_ingest/meta.yaml index 10214c6b..d8544fda 100644 --- a/conda/packages/nv_ingest/meta.yaml +++ b/conda/packages/nv_ingest/meta.yaml @@ -5,6 +5,8 @@ {% set data = load_setup_py_data() %} {% set name = data.get('name', 'nv_ingest') | lower %} {% set version = data.get('version') %} +{% set py_version = environ['CONDA_PY'] %} +{% set date_string = "$(date +%y%m%d)" %} # Determine Git root, falling back to default path ../../.. if Git is not available or the directory is not a Git repo {% set git_root = environ.get('GIT_ROOT', '../../..') %} @@ -17,7 +19,8 @@ source: path: {{ git_root }} build: - number: 0 + number: {{ GIT_DESCRIBE_NUMBER }} + string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script: - {{ PYTHON }} -m pip install . --no-deps -vv diff --git a/conda/packages/nv_ingest_client/meta.yaml b/conda/packages/nv_ingest_client/meta.yaml index bf0e5f6c..6a412be9 100644 --- a/conda/packages/nv_ingest_client/meta.yaml +++ b/conda/packages/nv_ingest_client/meta.yaml @@ -5,6 +5,8 @@ {% set data = load_setup_py_data() %} {% set name = data.get('name', 'nv_ingest_client') | lower %} {% set version = data.get('version') %} +{% set py_version = environ['CONDA_PY'] %} +{% set date_string = "$(date +%y%m%d)" %} # Determine Git root, falling back to default path ../../.. if Git is not available or the directory is not a Git repo {% set git_root = environ.get('GIT_ROOT', '../../../client') %} @@ -17,7 +19,8 @@ source: path: {{ git_root }} build: - number: 0 + number: {{ GIT_DESCRIBE_NUMBER }} + string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script: - {{ PYTHON }} -m pip install ./ --no-deps -vv