Skip to content

Commit e5ebd3f

Browse files
authored
Remove duplicative date from conda package (#349)
1 parent 5269bbc commit e5ebd3f

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

conda/build_conda_packages.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,14 @@ NV_INGEST_CLIENT_DIR="${BUILD_SCRIPT_BASE}/packages/nv_ingest_client"
4040
echo "Using OUTPUT_DIR: $OUTPUT_DIR"
4141
mkdir -p "${OUTPUT_DIR}/linux-64"
4242

43-
DATE_STRING="$(date +%y%m%d)"
4443
GIT_SHA=$(git rev-parse --short HEAD)
4544

4645
##############################
4746
# Build Packages
4847
##############################
4948
if [[ "${BUILD_NV_INGEST}" -eq 1 ]]; then
5049
echo "Building nv_ingest..."
51-
GIT_ROOT="${GIT_ROOT}" DATE_STRING="${DATE_STRING}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_DIR}" \
50+
GIT_ROOT="${GIT_ROOT}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_DIR}" \
5251
-c nvidia/label/dev -c rapidsai -c nvidia -c conda-forge -c pytorch \
5352
--output-folder "${OUTPUT_DIR}" --no-anaconda-upload
5453
else
@@ -57,7 +56,7 @@ fi
5756

5857
if [[ "${BUILD_NV_INGEST_CLIENT}" -eq 1 ]]; then
5958
echo "Building nv_ingest_client..."
60-
GIT_ROOT="${GIT_ROOT}/client" DATE_STRING="${DATE_STRING}" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_CLIENT_DIR}" \
59+
GIT_ROOT="${GIT_ROOT}/client" GIT_SHA="${GIT_SHA}" conda build "${NV_INGEST_CLIENT_DIR}" \
6160
-c conda-forge \
6261
--output-folder "${OUTPUT_DIR}" --no-anaconda-upload
6362
else

conda/packages/nv_ingest/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
{% set name = data.get('name', 'nv_ingest') | lower %}
77
{% set version = data.get('version') %}
88
{% set py_version = environ['CONDA_PY'] %}
9-
{% set date_string = environ['DATE_STRING'] %}
109
{% set GIT_SHA = environ['GIT_SHA'] %}
1110

1211
# 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:
2120

2221
build:
2322
number: 0
24-
string: py{{ py_version }}_{{ date_string }}_{{ GIT_SHA }}
23+
string: py{{ py_version }}_{{ GIT_SHA }}
2524
script:
2625
- {{ PYTHON }} -m pip install . --no-deps -vv
2726

conda/packages/nv_ingest_client/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
{% set name = data.get('name', 'nv_ingest_client') | lower %}
77
{% set version = data.get('version') %}
88
{% set py_version = environ['CONDA_PY'] %}
9-
{% set date_string = environ['DATE_STRING'] %}
109
{% set GIT_SHA = environ['GIT_SHA'] %}
1110

1211
# 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:
2120

2221
build:
2322
number: 0
24-
string: py{{ py_version }}_{{ date_string }}_{{ GIT_SHA }}
23+
string: py{{ py_version }}_{{ GIT_SHA }}
2524
script:
2625
- {{ PYTHON }} -m pip install ./ --no-deps -vv
2726

0 commit comments

Comments
 (0)