Merge branch 'main' into pytyped

open-telemetry · Mar 20, 2024 · 5a921b9 · 5a921b9
2 parents 939cdc0 + 6dd85fc
commit 5a921b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -8,13 +8,13 @@ set -ev
 # Get the latest versions of packaging tools
 python3 -m pip install --upgrade pip build setuptools wheel
 
-BASEDIR=$(dirname $(readlink -f $(dirname $0)))
+BASEDIR=$(dirname "$(readlink -f "$(dirname $0)")")
 DISTDIR=dist
 
 (
   cd $BASEDIR
   mkdir -p $DISTDIR
-  rm -rf $DISTDIR/*
+  rm -rf ${DISTDIR:?}/*
 
  for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/opentelemetry-opentracing-shim/ propagator/*/ tests/opentelemetry-test-utils/; do
    (

diff --git a/scripts/coverage.sh b/scripts/coverage.sh
@@ -22,9 +22,6 @@ function cov {
     fi
 }
 
-PYTHON_VERSION=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')
-PYTHON_VERSION_INFO=(${PYTHON_VERSION//./ })
-
 coverage erase
 
 cov opentelemetry-api