Skip to content

Commit b0e6dcc

Browse files
committed
Fix wheel generation
Avoid passing LD_LIBRARY_PATH variable to the docker image used to generate the wheels Change-Id: I418a9574a7f49695984b1c68c997fc02f0450c12
1 parent d846d0b commit b0e6dcc

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

.github/workflows/create-wheels.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,6 @@ jobs:
174174
echo $version
175175
echo "::set-output name=python-version::$version"
176176
177-
- name: Set up Python
178-
uses: actions/setup-python@v2
179-
with:
180-
python-version: ${{ steps.linux-py-version.outputs.python-version }}
181-
architecture: ${{ matrix.architecture }}
182-
183177
- name: Remove tag_build from setup.cfg
184178
# sqlalchemy has `tag_build` set to `dev` in setup.cfg. We need to remove it before creating the weel
185179
# otherwise it gets tagged with `dev0`
@@ -193,6 +187,8 @@ jobs:
193187
run: |
194188
(cat setup.cfg) | %{$_ -replace "tag_build.?=.?dev",""} | set-content setup.cfg
195189
190+
# This should run before setting up python, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation
191+
# See https://github.com/RalfG/python-wheels-manylinux-build/issues/26#issuecomment-720736647
196192
- name: Create wheel for manylinux
197193
# this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
198194
# the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
@@ -208,6 +204,12 @@ jobs:
208204
# `--no-deps` is used to only generate the wheel for the current library. Redundant in sqlalchemy since it has no dependencies
209205
pip-wheel-args: "-w ./dist --no-use-pep517 -v --no-deps"
210206

207+
- name: Set up Python
208+
uses: actions/setup-python@v2
209+
with:
210+
python-version: ${{ steps.linux-py-version.outputs.python-version }}
211+
architecture: ${{ matrix.architecture }}
212+
211213
- name: Check created wheel
212214
# check that the wheel is compatible with the current installation.
213215
# If it is then does:
@@ -332,6 +334,8 @@ jobs:
332334
run: |
333335
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
334336
337+
# This should run before setting up python, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation
338+
# See https://github.com/RalfG/python-wheels-manylinux-build/issues/26#issuecomment-720736647
335339
- name: Create wheel for manylinux2014
336340
# this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
337341
# the action uses the image for manylinux2014 but can generate also a manylinux1 wheel
@@ -385,6 +389,7 @@ jobs:
385389
asset_content_type: application/zip # application/octet-stream
386390

387391
- name: Set up Python for twine
392+
# Setup python after creating the wheel, otherwise LD_LIBRARY_PATH gets set and it will break wheel generation
388393
# twine on py2 is very old and is no longer updated, so we change to python 3.8 before upload
389394
uses: actions/setup-python@v2
390395
with:

lib/sqlalchemy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
from .types import VARCHAR # noqa
127127

128128

129-
__version__ = '1.4.0b2'
129+
__version__ = "1.4.0b2"
130130

131131

132132
def __go(lcls):

0 commit comments

Comments
 (0)