Browse Source

Pin pip version to install in tinyipa images

Since pip needs to be the same during the entire process, let's
pin a version that is supposed to work and use it on both
build and finalise scripts.

Change-Id: I0bbac68bb6e970c2e540d0a03133c3cc828ac44a
tags/2.2.0
Riccardo Pittau 1 month ago
parent
commit
b609df3111
3 changed files with 5 additions and 3 deletions
  1. +2
    -2
      tinyipa/build-tinyipa.sh
  2. +2
    -0
      tinyipa/common.sh
  3. +1
    -1
      tinyipa/finalise-tinyipa.sh

+ 2
- 2
tinyipa/build-tinyipa.sh View File

@@ -2,7 +2,7 @@

set -ex
WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh
source ${WORKDIR}/common.sh
BUILDDIR="$WORKDIR/tinyipabuild"
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
@@ -187,7 +187,7 @@ fi

# Build python wheels
$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip wheel
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
$CHROOT_CMD ${PIP_COMMAND} install pbr
$CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ipa-requirements.txt
if [ -n "$IRONIC_LIB_SOURCE" ]; then


+ 2
- 0
tinyipa/common.sh View File

@@ -3,6 +3,8 @@
WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh

PIP_VERSION="20.2.2"

# Allow an extension to be added to the generated files by specifying
# $BRANCH_PATH e.g. export BRANCH_PATH=master results in tinyipa-master.gz etc
BRANCH_EXT=''


+ 1
- 1
tinyipa/finalise-tinyipa.sh View File

@@ -160,7 +160,7 @@ fi
# NOTE(rpittau): pip MUST be the same version used in the build script or
# dragons will appear and put everything on fire
$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip wheel
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel

# If flag is set install python now
if $BUILD_AND_INSTALL_TINYIPA ; then


Loading…
Cancel
Save