diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a24212..260eed9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Master +- Sqlite fix: + - Update Python3 base formula - Test staged binaries on Travis -------------------------------------------------------------------------------- diff --git a/builds/cedar-14.Dockerfile b/builds/cedar-14.Dockerfile index ea11542..5d1ae59 100644 --- a/builds/cedar-14.Dockerfile +++ b/builds/cedar-14.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="cedar-14" -RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y python-pip libsqlite3-dev realpath && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install -r /app/requirements.txt diff --git a/builds/heroku-16.Dockerfile b/builds/heroku-16.Dockerfile index 324042e..6b0728e 100644 --- a/builds/heroku-16.Dockerfile +++ b/builds/heroku-16.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-16" -RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y python-pip libsqlite3-dev && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt diff --git a/builds/heroku-18.Dockerfile b/builds/heroku-18.Dockerfile index 7f0f942..80ad34d 100644 --- a/builds/heroku-18.Dockerfile +++ b/builds/heroku-18.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-18" -RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel libsqlite3-dev && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt diff --git a/builds/runtimes/python3 b/builds/runtimes/python3 index 79f4421..1b6d152 100755 --- a/builds/runtimes/python3 +++ b/builds/runtimes/python3 @@ -16,17 +16,6 @@ python_version=${BASE^} # this gives us only the filename with version number version_number=$(echo "$python_version" | cut -d- -f2) # this returns just X.X.X dep_url=https://python.org/ftp/python/${version_number}/${python_version}.tgz -# shellcheck source=bin/utils -source "$BIN_DIR/steps/sqlite3" - -sqlite3_version -echo "Setting up SQLite3 Headers for $SQLITE3_VERSION" -sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1 - -echo "Building Python 3..." -echo "Pulling from source: ${dep_url}" - - curl -L "${dep_url}" | tar xz -C "${OUT_PREFIX}" mv "${OUT_PREFIX}/${python_version}" src cd src @@ -42,4 +31,9 @@ find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm - # Remove spare / LOCATION=${OUT_PREFIX%?} +# Create links to SQLITE headers so Python can call them at runtime +mkdir -p ${OUT_PREFIX}/include ${OUT_PREFIX}/lib/x86_64-linux-gnu +cp /usr/include/sqlite3*.h ${OUT_PREFIX}/include +ln -fs $(realpath /usr/lib/x86_64-linux-gnu/libsqlite3.so) ${OUT_PREFIX}/lib/x86_64-linux-gnu/libsqlite3.so + ln $LOCATION/bin/python3 $LOCATION/bin/python