Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Python 3.7 #14

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add support for Python 3.7 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bcb3e2
travis: build and test on Python 3.7
drbild Mar 22, 2019
d9edbcb
appveyor: build and test on Python 3.7
drbild Mar 22, 2019
993ed01
WIP: don't ship openSSL DLLs for Python 3.7+
drbild Dec 3, 2019
02cd341
WIP: use openssl 1.1
drbild Dec 3, 2019
f41c4a1
FIXUP: WIP: don't ship openssl for 3.7+
drbild Dec 4, 2019
5fe42cf
TMP: appveyor: disable <3.7 builds on windows
drbild Dec 4, 2019
78add5e
WIP: fix setup.py
drbild Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 2 additions & 40 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,8 @@
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: "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"
Expand Down
10 changes: 6 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

import os, shutil, sys

if sys.platform == 'win32':
BUNDLE_SSL = sys.platform == 'win32' and sys.version_info < (3,7)

if BUNDLE_SSL:
LIB_NAMES = ['ssleay32MD', 'libeay32MD']
else:
LIB_NAMES = ['ssl']
Expand All @@ -28,7 +30,7 @@

try:
# Symlink the libs so they can be included in the package data
if sys.platform == 'win32':
if BUNDLE_SSL:
for lib in LIB_NAMES:
shutil.copy2('openssl/bin/%s.dll'%lib, 'sslpsk/')

Expand Down Expand Up @@ -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':
if BUNDLE_SSL:
for lib in LIB_NAMES:
os.remove('sslpsk/%s.dll'%lib)