diff --git a/conda/build_conda_packages.sh b/conda/build_conda_packages.sh index 878dd858..91cd3397 100755 --- a/conda/build_conda_packages.sh +++ b/conda/build_conda_packages.sh @@ -40,7 +40,6 @@ NV_INGEST_CLIENT_DIR="${BUILD_SCRIPT_BASE}/packages/nv_ingest_client" echo "Using OUTPUT_DIR: $OUTPUT_DIR" mkdir -p "${OUTPUT_DIR}/linux-64" -DATE_STRING="$(date +%y%m%d)" GIT_SHA=$(git rev-parse --short HEAD) ############################## @@ -48,7 +47,7 @@ GIT_SHA=$(git rev-parse --short HEAD) ############################## if [[ "${BUILD_NV_INGEST}" -eq 1 ]]; then echo "Building nv_ingest..." - GIT_ROOT="${GIT_ROOT}" DATE_STRING="${DATE_STRING}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_DIR}" \ + GIT_ROOT="${GIT_ROOT}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_DIR}" \ -c nvidia/label/dev -c rapidsai -c nvidia -c conda-forge -c pytorch \ --output-folder "${OUTPUT_DIR}" --no-anaconda-upload else @@ -57,7 +56,7 @@ fi if [[ "${BUILD_NV_INGEST_CLIENT}" -eq 1 ]]; then echo "Building nv_ingest_client..." - GIT_ROOT="${GIT_ROOT}/client" DATE_STRING="${DATE_STRING}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_CLIENT_DIR}" \ + GIT_ROOT="${GIT_ROOT}/client" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_CLIENT_DIR}" \ -c conda-forge \ --output-folder "${OUTPUT_DIR}" --no-anaconda-upload else diff --git a/conda/packages/nv_ingest/meta.yaml b/conda/packages/nv_ingest/meta.yaml index 04e9f3dd..611d0d02 100644 --- a/conda/packages/nv_ingest/meta.yaml +++ b/conda/packages/nv_ingest/meta.yaml @@ -6,7 +6,6 @@ {% set name = data.get('name', 'nv_ingest') | lower %} {% set version = data.get('version') %} {% set py_version = environ['CONDA_PY'] %} -{% set date_string = environ['DATE_STRING'] %} {% set GIT_SHA = environ['GIT_SHA'] %} # Determine Git root, falling back to default path ../../.. if Git is not available or the directory is not a Git repo @@ -21,7 +20,7 @@ source: build: number: 0 - string: py{{ py_version }}_{{ date_string }}_{{ GIT_SHA }} + string: py{{ py_version }}_{{ GIT_SHA }} 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 d15ffaaa..079515e5 100644 --- a/conda/packages/nv_ingest_client/meta.yaml +++ b/conda/packages/nv_ingest_client/meta.yaml @@ -6,7 +6,6 @@ {% set name = data.get('name', 'nv_ingest_client') | lower %} {% set version = data.get('version') %} {% set py_version = environ['CONDA_PY'] %} -{% set date_string = environ['DATE_STRING'] %} {% set GIT_SHA = environ['GIT_SHA'] %} # Determine Git root, falling back to default path ../../.. if Git is not available or the directory is not a Git repo @@ -21,7 +20,7 @@ source: build: number: 0 - string: py{{ py_version }}_{{ date_string }}_{{ GIT_SHA }} + string: py{{ py_version }}_{{ GIT_SHA }} script: - {{ PYTHON }} -m pip install ./ --no-deps -vv