Skip to content

Commit

Permalink
Remove duplicative date from conda package
Browse files Browse the repository at this point in the history
  • Loading branch information
jdye64 committed Jan 17, 2025
1 parent 5269bbc commit e2a7832
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions conda/build_conda_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ 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)

##############################
# Build Packages
##############################
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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions conda/packages/nv_ingest/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions conda/packages/nv_ingest_client/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit e2a7832

Please sign in to comment.