Drop Python 2.7 support. Add Python 3.7 support

This commit is contained in:
Romain Thomas 2018-11-16 09:05:20 +01:00
parent f3e52f5f3c
commit 184074841b
3 changed files with 75 additions and 73 deletions

View File

@ -27,15 +27,15 @@ environment:
secure: /S6Vbt3vEisoC81siFbkqOXQeVnwxLZZPMYp1r79G7h+HFjLlWUZSidxxpsAgHNE
matrix:
# Python 2.7
- PYTHON_VERSION: "2.7"
PYTHON32_PATH: "C:\\Python27"
PYTHON32_INCLUDE: "C:\\Python27\\include"
PYTHON32_BINARY: "C:\\Python27\\python.exe"
PYTHON32_LIBRARY: "C:\\Python27\\libs\\python27.lib"
PYTHON64_PATH: "C:\\Python27-x64"
PYTHON64_INCLUDE: "C:\\Python27-x64\\include"
PYTHON64_BINARY: "C:\\Python27-x64\\python.exe"
PYTHON64_LIBRARY: "C:\\Python27-x64\\libs\\python27.lib"
#- PYTHON_VERSION: "2.7"
# PYTHON32_PATH: "C:\\Python27"
# PYTHON32_INCLUDE: "C:\\Python27\\include"
# PYTHON32_BINARY: "C:\\Python27\\python.exe"
# PYTHON32_LIBRARY: "C:\\Python27\\libs\\python27.lib"
# PYTHON64_PATH: "C:\\Python27-x64"
# PYTHON64_INCLUDE: "C:\\Python27-x64\\include"
# PYTHON64_BINARY: "C:\\Python27-x64\\python.exe"
# PYTHON64_LIBRARY: "C:\\Python27-x64\\libs\\python27.lib"
# Python 3.5
@ -50,7 +50,7 @@ environment:
PYTHON64_LIBRARY: "C:\\Python35-x64\\libs\\python35.lib"
# Python 3.6
## Python 3.6
- PYTHON_VERSION: "3.6"
PYTHON32_PATH: "C:\\Python36"
PYTHON32_INCLUDE: "C:\\Python36\\include"
@ -62,15 +62,15 @@ environment:
PYTHON64_LIBRARY: "C:\\Python36-x64\\libs\\python36.lib"
# Python 3.7
#- PYTHON_VERSION: "3.7"
# PYTHON32_PATH: "C:\\Python37"
# PYTHON32_INCLUDE: "C:\\Python37\\include"
# PYTHON32_BINARY: "C:\\Python37\\python.exe"
# PYTHON32_LIBRARY: "C:\\Python37\\libs\\python37.lib"
# PYTHON64_PATH: "C:\\Python37-x64"
# PYTHON64_INCLUDE: "C:\\Python37-x64\\include"
# PYTHON64_BINARY: "C:\\Python37-x64\\python.exe"
# PYTHON64_LIBRARY: "C:\\Python37-x64\\libs\\python37.lib"
- PYTHON_VERSION: "3.7"
PYTHON32_PATH: "C:\\Python37"
PYTHON32_INCLUDE: "C:\\Python37\\include"
PYTHON32_BINARY: "C:\\Python37\\python.exe"
PYTHON32_LIBRARY: "C:\\Python37\\libs\\python37.lib"
PYTHON64_PATH: "C:\\Python37-x64"
PYTHON64_INCLUDE: "C:\\Python37-x64\\include"
PYTHON64_BINARY: "C:\\Python37-x64\\python.exe"
PYTHON64_LIBRARY: "C:\\Python37-x64\\libs\\python37.lib"
matrix:
fast_finish: true # set this flag to immediately finish build once one of the jobs fails.

View File

@ -6,22 +6,22 @@ git:
matrix:
include:
# Linux gcc 5.0 - Python 2.7
- os: linux
dist: trusty
compiler: gcc
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-5', 'ccache', 'libpython2.7']
env: >
[
CXX_COMPILER=g++-5 ,
C_COMPILER=gcc-5 ,
PYTHON_VERSION=2.7 ,
PYTHON_INCLUDE_DIR=/usr/include/python2.7 ,
PYTHON_LIBRARY=/usr/lib/libpython2.7.so ,
PYTHON_BINARY=/usr/bin/python2.7 ,
]
#- os: linux
# dist: trusty
# compiler: gcc
# addons:
# apt:
# sources: ['ubuntu-toolchain-r-test']
# packages: ['g++-5', 'ccache', 'libpython2.7']
# env: >
# [
# CXX_COMPILER=g++-5 ,
# C_COMPILER=gcc-5 ,
# PYTHON_VERSION=2.7 ,
# PYTHON_INCLUDE_DIR=/usr/include/python2.7 ,
# PYTHON_LIBRARY=/usr/lib/libpython2.7.so ,
# PYTHON_BINARY=/usr/bin/python2.7 ,
# ]
# Linux gcc 5.0 - Python 3.5
@ -63,34 +63,34 @@ matrix:
# Linux gcc 6 - Python 3.7
#- os: linux
# dist: trusty
# compiler: gcc
# addons:
# apt:
# sources: ['ubuntu-toolchain-r-test', 'deadsnakes']
# packages: ['g++-6', 'gcc-6', 'ccache', 'python3.7-dev']
# env: >
# [
# CXX_COMPILER=g++-6 ,
# C_COMPILER=gcc-6 ,
# PYTHON_VERSION=3.7 ,
# PYTHON_INCLUDE_DIR=/usr/include/python3.7m ,
# PYTHON_LIBRARY=/usr/lib/libpython3.7m.so ,
# PYTHON_BINARY=/usr/bin/python3.7 ,
# ]
# OSX 10.11 - xcode 7.3 - Python 2.7
- os: osx
osx_image: xcode7.3
compiler: clang
- os: linux
dist: xenial
compiler: gcc
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'deadsnakes']
packages: ['g++-6', 'gcc-6', 'ccache', 'python3.7', 'python3.7-dev']
env: >
[
CXX_COMPILER=clang++ ,
C_COMPILER=clang ,
PYTHON_VERSION=2.7 ,
CXX_COMPILER=g++-6 ,
C_COMPILER=gcc-6 ,
PYTHON_VERSION=3.7 ,
PYTHON_INCLUDE_DIR=/usr/include/python3.7m ,
PYTHON_LIBRARY=/usr/lib/libpython3.7m.so ,
PYTHON_BINARY=/usr/bin/python3.7 ,
]
# OSX 10.11 - xcode 7.3 - Python 2.7
#- os: osx
# osx_image: xcode7.3
# compiler: clang
# env: >
# [
# CXX_COMPILER=clang++ ,
# C_COMPILER=clang ,
# PYTHON_VERSION=2.7 ,
# ]
# OSX 10.12 - xcode 8.3 - Python 3.5
- os: osx
osx_image: xcode8.3
@ -116,15 +116,15 @@ matrix:
# OSX 10.12 - xcode 8.3 - Python 3.7
#- os: osx
# osx_image: xcode8.3
# compiler: clang
# env: >
# [
# CXX_COMPILER=clang++ ,
# C_COMPILER=clang ,
# PYTHON_VERSION=3.7 ,
# ]
- os: osx
osx_image: xcode8.3
compiler: clang
env: >
[
CXX_COMPILER=clang++ ,
C_COMPILER=clang ,
PYTHON_VERSION=3.7 ,
]
#branches:
# only:
@ -168,7 +168,8 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "2.7" ]]; then pyenv install 2.7.12; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.5" ]]; then pyenv install 3.5.0; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.6" ]]; then pyenv install 3.6.0; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then pyenv install 3.7-dev; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then pyenv install 3.7.0a1; fi
#- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then ls -alR $(pyenv root)/versions/3.7.0a1; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "2.7" ]]; then export PYTHON_INCLUDE_DIR=$(pyenv root)/versions/2.7.12/include/python2.7 ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "2.7" ]]; then export PYTHON_LIBRARY=$(pyenv root)/versions/2.7.12/lib/libpython2.7.dylib ;fi
@ -182,9 +183,9 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.6" ]]; then export PYTHON_LIBRARY=$(pyenv root)/versions/3.6.0/lib/libpython3.dylib ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.6" ]]; then export PYTHON_BINARY=$(pyenv root)/versions/3.6.0/bin/python3.6 ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_INCLUDE_DIR=$(pyenv root)/versions/3.7.0/include/python3.7m ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_LIBRARY=$(pyenv root)/versions/3.7.0/lib/libpython3.dylib ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_BINARY=$(pyenv root)/versions/3.7.0/bin/python3.7 ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_INCLUDE_DIR=$(pyenv root)/versions/3.7.0a1/include/python3.7m ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_LIBRARY=$(pyenv root)/versions/3.7.0a1/lib/libpython3.7m.dylib ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$PYTHON_VERSION" == "3.7" ]]; then export PYTHON_BINARY=$(pyenv root)/versions/3.7.0a1/bin/python3.7 ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then $PYTHON_BINARY -m pip install --upgrade pip ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then $PYTHON_BINARY -m pip install --upgrade setuptools ;fi

View File

@ -136,7 +136,8 @@ if(LIEF_COVERAGE)
endif()
ADD_FLAG_IF_SUPPORTED("-Wno-macro-redefined" NO_MACRO_REDEFINED)
ADD_FLAG_IF_SUPPORTED("-Wno-macro-redefined" NO_MACRO_REDEFINED)
ADD_FLAG_IF_SUPPORTED("-Wno-deprecated-declarations" NO_DEPRECATED_DECLARATIONS)
set_target_properties(pyLIEF PROPERTIES PREFIX "" OUTPUT_NAME "_pylief")
add_dependencies(pyLIEF lief_pybind11)