From: Federico Caselli <cfederico87@gmail.com>
Date: Mon, 2 Nov 2020 21:49:55 +0000 (+0100)
Subject: Fix wheel generation
X-Git-Tag: rel_1_4_0b2~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e6dccfb60cb900e327ae8ff6632e8c3339c53d;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
---

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index 7d08b2b712..b11a14619c 100644
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -174,12 +174,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`
@@ -193,6 +187,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
@@ -208,6 +204,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:
@@ -332,6 +334,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
@@ -385,6 +389,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:
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 1052472501..e3b054d0e8 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -126,7 +126,7 @@ from .types import VARBINARY  # noqa
 from .types import VARCHAR  # noqa
 
 
-__version__ = '1.4.0b2'
+__version__ = "1.4.0b2"
 
 
 def __go(lcls):