From 9bcb3e2a3662a65e09acd8a8512aabc21ada628b Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Fri, 22 Mar 2019 14:28:35 -0500 Subject: [PATCH 1/7] travis: build and test on Python 3.7 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d358684..b901dd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,9 @@ matrix: - os: linux python: 3.6 - os: linux - python: 3.7-dev + sudo: required + dist: xenial + python: 3.7 - os: osx language: generic env: PYTHON_BIN=python2 From d9edbcbe540c15c80e6ba17f0cfec1ad36f6c63d Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Fri, 22 Mar 2019 14:30:09 -0500 Subject: [PATCH 2/7] appveyor: build and test on Python 3.7 --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 881bda2..d8156e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,6 +42,10 @@ environment: PYTHON_ARCH: "64" OPENSSL_LIB: "openssl-1.0.2k-vs2015" + - PYTHON: "C:\\Python37-x64" + PYTHON_ARCH: "64" + OPENSSL_LIB: "openssl-1.0.2k-vs2015" + install: - "%PYTHON%\\python.exe -m pip install wheel" From 993ed0173214b76e2ec0c8fcbafbe2add31df71c Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Tue, 3 Dec 2019 15:22:43 -0600 Subject: [PATCH 3/7] WIP: don't ship openSSL DLLs for Python 3.7+ --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index ec59766..147ebe3 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ import os, shutil, sys -if sys.platform == 'win32': +if sys.platform == 'win32' and sys.version_info < (3,7): LIB_NAMES = ['ssleay32MD', 'libeay32MD'] else: LIB_NAMES = ['ssl'] @@ -28,7 +28,7 @@ try: # Symlink the libs so they can be included in the package data - if sys.platform == 'win32': + if sys.platform == 'win32' and sys.version_info < (3,7): for lib in LIB_NAMES: shutil.copy2('openssl/bin/%s.dll'%lib, 'sslpsk/') @@ -67,6 +67,6 @@ ) finally: - if sys.platform == 'win32': + if sys.platform == 'win32' and sys.version_info < (3,7): for lib in LIB_NAMES: os.remove('sslpsk/%s.dll'%lib) From 02cd341ba9686db770681bfe76c0d8359397ad4d Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Tue, 3 Dec 2019 15:30:08 -0600 Subject: [PATCH 4/7] WIP: use openssl 1.1 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d8156e2..12e76e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,7 +44,7 @@ environment: - PYTHON: "C:\\Python37-x64" PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2015" + OPENSSL_LIB: "openssl-1.1.0f-vs2017" install: - "%PYTHON%\\python.exe -m pip install wheel" From f41c4a189a8dd1af5bb7727d17eecf7c5cf4cf98 Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Tue, 3 Dec 2019 18:40:22 -0600 Subject: [PATCH 5/7] FIXUP: WIP: don't ship openssl for 3.7+ --- setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 147ebe3..cee1926 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,9 @@ import os, shutil, sys -if sys.platform == 'win32' and sys.version_info < (3,7): +BUNDLE_SSL = sys.platform == 'win32' and sys.version_info < (3,7): + +if BUNDLE_SSL: LIB_NAMES = ['ssleay32MD', 'libeay32MD'] else: LIB_NAMES = ['ssl'] @@ -28,7 +30,7 @@ try: # Symlink the libs so they can be included in the package data - if sys.platform == 'win32' and sys.version_info < (3,7): + if BUNDLE_SSL: for lib in LIB_NAMES: shutil.copy2('openssl/bin/%s.dll'%lib, 'sslpsk/') @@ -61,12 +63,12 @@ ], packages = ['sslpsk', 'sslpsk.test'], ext_modules = [_sslpsk], - package_data = {'' : ['%s.dll'%lib for lib in LIB_NAMES]}, + package_data = {'' : ['%s.dll'%lib for lib in LIB_NAMES]} if BUNDLE_SSL else {}, test_suite = 'sslpsk.test', zip_safe = False ) finally: - if sys.platform == 'win32' and sys.version_info < (3,7): + if BUNDLE_SSL: for lib in LIB_NAMES: os.remove('sslpsk/%s.dll'%lib) From 5fe42cf0a82499d713ab17b297d94af2c3a357d1 Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Tue, 3 Dec 2019 18:40:44 -0600 Subject: [PATCH 6/7] TMP: appveyor: disable <3.7 builds on windows --- appveyor.yml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 12e76e5..1bb8e0b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,47 +1,5 @@ environment: matrix: - - PYTHON: "C:\\Python27" - PYTHON_ARCH: "32" - OPENSSL_LIB: "openssl-1.0.2k-vs2008" - - - PYTHON: "C:\\Python33" - PYTHON_ARCH: "32" - OPENSSL_LIB: "openssl-1.0.2k-vs2010" - - - PYTHON: "C:\\Python34" - PYTHON_ARCH: "32" - OPENSSL_LIB: "openssl-1.0.2k-vs2010" - - - PYTHON: "C:\\Python35" - PYTHON_ARCH: "32" - OPENSSL_LIB: "openssl-1.0.2k-vs2015" - - - PYTHON: "C:\\Python36" - PYTHON_ARCH: "32" - OPENSSL_LIB: "openssl-1.0.2k-vs2015" - - - PYTHON: "C:\\Python27-x64" - PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2008" - - - PYTHON: "C:\\Python33-x64" - PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2010" - DISTUTILS_USE_SDK: "1" - - - PYTHON: "C:\\Python34-x64" - PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2010" - DISTUTILS_USE_SDK: "1" - - - PYTHON: "C:\\Python35-x64" - PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2015" - - - PYTHON: "C:\\Python36-x64" - PYTHON_ARCH: "64" - OPENSSL_LIB: "openssl-1.0.2k-vs2015" - - PYTHON: "C:\\Python37-x64" PYTHON_ARCH: "64" OPENSSL_LIB: "openssl-1.1.0f-vs2017" From 78add5eaa069f0fd7ac79cdd76af83fe6e216ece Mon Sep 17 00:00:00 2001 From: "David R. Bild" Date: Wed, 29 Jan 2020 09:44:51 -0600 Subject: [PATCH 7/7] WIP: fix setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cee1926..76b20ad 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ import os, shutil, sys -BUNDLE_SSL = sys.platform == 'win32' and sys.version_info < (3,7): +BUNDLE_SSL = sys.platform == 'win32' and sys.version_info < (3,7) if BUNDLE_SSL: LIB_NAMES = ['ssleay32MD', 'libeay32MD']