diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-07-14 20:03:10 +0530 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-07-14 10:33:10 -0400 |
| commit | e77ef7e0938564d255f9b34faf3f63ee8719f250 (patch) | |
| tree | 8ed97c6b3ab1dcb23cb6b188c17d0e4f3cf0b061 | |
| parent | 448a0f9de3623dbb72337f33d58bc415cad12a9a (diff) | |
| download | py-bcrypt-git-e77ef7e0938564d255f9b34faf3f63ee8719f250.tar.gz | |
switch wheel building back to using pip wheel (#152)
| -rw-r--r-- | .jenkins/Jenkinsfile-wheel-builder | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/.jenkins/Jenkinsfile-wheel-builder b/.jenkins/Jenkinsfile-wheel-builder index a00f0f8..73977d7 100644 --- a/.jenkins/Jenkinsfile-wheel-builder +++ b/.jenkins/Jenkinsfile-wheel-builder @@ -73,15 +73,11 @@ def build(version, label, imageName) { source .venv/bin/activate pip install -U wheel # upgrade wheel to latest before we use it to build the wheel pip install cffi six # install this with pip so we get TLS 1.2 - pip download bcrypt --no-binary bcrypt --no-deps - tar zxf bcrypt* - pushd bcrypt* REGEX="py3([0-9])*" if [[ "${version}" =~ \$REGEX ]]; then - PY_LIMITED_API="--py-limited-api=cp3\${BASH_REMATCH[1]}" + PY_LIMITED_API="--build-option --py-limited-api=cp3\${BASH_REMATCH[1]}" fi - python setup.py bdist_wheel --dist-dir=../wheelhouse \$PY_LIMITED_API - popd + pip wheel bcrypt --no-binary bcrypt --no-deps --wheel-dir=wheelhouse \$PY_LIMITED_API pip install -f wheelhouse bcrypt --no-index python -c "import bcrypt;password = b'super secret password';hashed = bcrypt.hashpw(password, bcrypt.gensalt());bcrypt.checkpw(password, hashed)" """ @@ -101,16 +97,11 @@ def build(version, label, imageName) { chmod -R 777 wheelhouse $linux32 /opt/python/$version/bin/pip install cffi six - $linux32 /opt/python/$version/bin/pip download bcrypt --no-binary bcrypt --no-deps - tar zxf bcrypt* - pushd bcrypt* REGEX="cp3([0-9])*" if [[ "${version}" =~ \$REGEX ]]; then - PY_LIMITED_API="--py-limited-api=cp3\${BASH_REMATCH[1]}" + PY_LIMITED_API="--build-option --py-limited-api=cp3\${BASH_REMATCH[1]}" fi - $linux32 /opt/python/$version/bin/python setup.py bdist_wheel --dist-dir=../tmpwheelhouse \$PY_LIMITED_API - popd - chmod -R 777 bcrypt* # sometimes you need to delete stuff + $linux32 /opt/python/$version/bin/pip wheel bcrypt --no-binary bcrypt --no-deps --wheel-dir=tmpwheelhouse \$PY_LIMITED_API $linux32 auditwheel repair tmpwheelhouse/bcrypt*.whl -w wheelhouse/ $linux32 /opt/python/$version/bin/pip install bcrypt --no-index -f wheelhouse/ $linux32 /opt/python/$version/bin/python -c "import bcrypt;password = b'super secret password';hashed = bcrypt.hashpw(password, bcrypt.gensalt());bcrypt.checkpw(password, hashed)" |