From: Federico Caselli Date: Mon, 2 Nov 2020 21:49:55 +0000 (+0100) Subject: Fix wheel generation X-Git-Tag: rel_1_3_21~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51a257852db36070e0d6dd24a92b77ae48a05e44;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix wheel generation Avoid passing LD_LIBRARY_PATH variable to the docker image used to generate the wheels Change-Id: I418a9574a7f49695984b1c68c997fc02f0450c12 (cherry picked from commit d30bb5154c34aa7e13ce11a0a561a2dbdf17a94d) --- diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml index 18c4ee2bc7..1360c1ed5a 100644 --- a/.github/workflows/create-wheels.yaml +++ b/.github/workflows/create-wheels.yaml @@ -176,12 +176,6 @@ jobs: echo $version echo "::set-output name=python-version::$version" - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: ${{ steps.linux-py-version.outputs.python-version }} - architecture: ${{ matrix.architecture }} - - name: Remove tag_build from setup.cfg # sqlalchemy has `tag_build` set to `dev` in setup.cfg. We need to remove it before creating the weel # otherwise it gets tagged with `dev0` @@ -195,6 +189,8 @@ jobs: run: | (cat setup.cfg) | %{$_ -replace "tag_build.?=.?dev",""} | set-content setup.cfg + # This should run before setting up python, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation + # See https://github.com/RalfG/python-wheels-manylinux-build/issues/26#issuecomment-720736647 - name: Create wheel for manylinux # this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux # the action uses the image for manylinux2010 but can generate also a manylinux1 wheel @@ -210,6 +206,12 @@ jobs: # `--no-deps` is used to only generate the wheel for the current library. Redundant in sqlalchemy since it has no dependencies pip-wheel-args: "-w ./dist --no-use-pep517 -v --no-deps" + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: ${{ steps.linux-py-version.outputs.python-version }} + architecture: ${{ matrix.architecture }} + - name: Check created wheel # check that the wheel is compatible with the current installation. # If it is then does: @@ -334,6 +336,8 @@ jobs: run: | docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # This should run before setting up python, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation + # See https://github.com/RalfG/python-wheels-manylinux-build/issues/26#issuecomment-720736647 - name: Create wheel for manylinux2014 # this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux # the action uses the image for manylinux2014 but can generate also a manylinux1 wheel @@ -386,6 +390,7 @@ jobs: asset_content_type: application/zip # application/octet-stream - name: Set up Python for twine + # Setup python after creating the wheel, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation # twine on py2 is very old and is no longer updated, so we change to python 3.8 before upload uses: actions/setup-python@v2 with: