diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-19 23:10:52 -0400 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-19 23:10:52 -0400 |
commit | ecf7425b2d950455d3bd3d0a50e62a85c41e3d79 (patch) | |
tree | edf5e51f11578201cf18588184e6dfdcbee12d7e /.jenkins/windows-wheel.bat | |
parent | 05943d7f0f875ecd82b14681249dd3d145fd6d7c (diff) | |
download | cryptography-ecf7425b2d950455d3bd3d0a50e62a85c41e3d79.tar.gz cryptography-ecf7425b2d950455d3bd3d0a50e62a85c41e3d79.tar.bz2 cryptography-ecf7425b2d950455d3bd3d0a50e62a85c41e3d79.zip |
Update wheel scripts to match what Jenkins has (#3459)
* Include python3.6 in the macOS wheel script
* Pull in changes from Jenkins
* For Windows as well
Diffstat (limited to '.jenkins/windows-wheel.bat')
-rw-r--r-- | .jenkins/windows-wheel.bat | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/.jenkins/windows-wheel.bat b/.jenkins/windows-wheel.bat index 17883e3e..356226a7 100644 --- a/.jenkins/windows-wheel.bat +++ b/.jenkins/windows-wheel.bat @@ -1,5 +1,6 @@ wmic qfe @set PATH="C:\Python27";"C:\Python27\Scripts";%PATH% +@set CRYPTOGRAPHY_WINDOWS_LINK_OPENSSL110=1 SET if "%TOXENV%" == "py26" ( @set PYTHON="C:\Python26\python.exe" @@ -15,6 +16,20 @@ if "%TOXENV%" == "py34" ( ) if "%TOXENV%" == "py35" ( @set PYTHON="C:\Python35\python.exe" +) +if "%TOXENV%" == "py36" ( + @set PYTHON="C:\Python36\python.exe" +) + +@set py35orabove=true + +if not "%TOXENV%" == "py35" ( + if not "%TOXENV%" == "py36" ( + @set py35orabove=false + ) +) + +if "%py35orabove%" == "true" ( if %label% == windows ( @set INCLUDE="C:\OpenSSL-Win32-2015\include";%INCLUDE% @set LIB="C:\OpenSSL-Win32-2015\lib";%LIB% @@ -39,4 +54,4 @@ pip wheel cryptography --wheel-dir=wheelhouse --no-use-wheel for %%x in (wheelhouse\*.whl) do ( pip install %%x ) -python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))" +python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))"
\ No newline at end of file |