From ab7228a83db581beee83e15dc0411e5c14b385db Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Tue, 18 Feb 2020 21:35:46 -0800 Subject: [PATCH 1/3] build: adding sdist to build scripts Some operating systems (such as SUSE with py2pack) have an easier time packaging source distributions. Adding a check for the setup.py before attempting to build distributions. --- scripts/build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 97af69babc8..2ee7214b9dc 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,7 +6,7 @@ set -ev # Get the latest versions of packaging tools -python3 -m pip install --upgrade pip setuptools wheel +python3 -m pip install --user --upgrade pip setuptools wheel BASEDIR=$(dirname $(readlink -f $(dirname $0))) @@ -17,8 +17,14 @@ BASEDIR=$(dirname $(readlink -f $(dirname $0))) for d in opentelemetry-api/ opentelemetry-sdk/ ext/*/ ; do ( + echo "building $d" cd "$d" - python3 setup.py --verbose bdist_wheel --dist-dir "$BASEDIR/dist/" + # some ext directories (such as docker tests) + # are not intended to be packaged. Verify the + # intent by looking for a setup.py + if [ -f setup.py ]; then + python3 setup.py --verbose bdist_wheel --dist-dir "$BASEDIR/dist/" sdist --dist-dir "$BASEDIR/dist/" + fi ) done ) From f970efc52c1bff763cbac21cafc29fdf57eb9b62 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Thu, 20 Feb 2020 09:59:24 -0800 Subject: [PATCH 2/3] Remove build/ dirs after build --- scripts/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 2ee7214b9dc..97910966a88 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -23,7 +23,9 @@ BASEDIR=$(dirname $(readlink -f $(dirname $0))) # are not intended to be packaged. Verify the # intent by looking for a setup.py if [ -f setup.py ]; then - python3 setup.py --verbose bdist_wheel --dist-dir "$BASEDIR/dist/" sdist --dist-dir "$BASEDIR/dist/" + python3 setup.py --verbose bdist_wheel --dist-dir "$BASEDIR/dist/" \ + sdist --dist-dir "$BASEDIR/dist/" \ + clean --all fi ) done From 2c96fd5c87ab0caede0683dca7a485c6f851e3e2 Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Thu, 20 Feb 2020 10:44:13 -0800 Subject: [PATCH 3/3] build: removing --user flag The script was intended to be run under a virtualenv, where user packages do not exist, and are not needed. --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 97910966a88..15e0d1d37e4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,7 +6,7 @@ set -ev # Get the latest versions of packaging tools -python3 -m pip install --user --upgrade pip setuptools wheel +python3 -m pip install --upgrade pip setuptools wheel BASEDIR=$(dirname $(readlink -f $(dirname $0)))