Skip to content

Commit

Permalink
remove py27
Browse files Browse the repository at this point in the history
  • Loading branch information
darioizzo committed Jan 9, 2020
1 parent bc06a24 commit dc36ad8
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 54 deletions.
18 changes: 0 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ matrix:
sudo: required
services:
- docker
- env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
sudo: required
services:
- docker
- env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27mu" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
sudo: required
services:
- docker
- env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC"
dist: bionic
compiler: gcc
Expand Down Expand Up @@ -83,23 +75,13 @@ matrix:
apt:
sources:
- ubuntu-toolchain-r-test
- env: PAGMO_PLUGINS_NONFREE_BUILD="Python27"
compiler: gcc
os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXDebug"
os: osx
- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
os: osx
- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython37"
os: osx
osx_image: xcode6.4
- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython27"
os: osx
osx_image: xcode6.4
script:
- mkdir build
- cd build
Expand Down
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if((NOT PPNF_BUILD_CPP) AND (NOT PPNF_BUILD_PYTHON))
endif()

# Main ppnf project version.
set(pagmo_plugins_nonfree_VERSION 0.10)
set(pagmo_plugins_nonfree_VERSION 0.20)

if(PPNF_BUILD_CPP)
# Initial setup of a pagmo_plugins_nonfree build.
Expand Down Expand Up @@ -81,15 +81,14 @@ if(PPNF_BUILD_PYTHON)
include(YACMAPythonSetup)

# Python version check.
if(${PYTHON_VERSION_MAJOR} LESS 2 OR (${PYTHON_VERSION_MAJOR} EQUAL 2 AND ${PYTHON_VERSION_MINOR} LESS 7))
message(FATAL_ERROR "Minimum supported Python version is 2.7.")
if(${PYTHON_VERSION_MAJOR} LESS 3 )
message(FATAL_ERROR "Minimum supported Python version is 3")
endif()

# Internal variable that will be used to tell PagmoFindBoost to locate Boost.Python.
set(_PAGMO_PLUGINS_NONFREE_FIND_BOOST_PYTHON TRUE)
endif()


# Boost setup (common to pagmo/pygmo . pluginsnonfree).
include(PagmoPNFFindBoost)
# Pagmo setup (common to pagmo/pygmo . pluginsnonfree).
Expand Down
4 changes: 0 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ environment:
- BUILD_TYPE: "MinGW_64_Debug"
- BUILD_TYPE: "MinGW_64_Python37"
- BUILD_TYPE: "MinGW_64_Python36"
- BUILD_TYPE: "MinGW_64_Python27"
global:
PLATFORMTOOLSET: "v140"

Expand All @@ -31,7 +30,6 @@ install:

# Rename sh.exe as sh.exe in PATH interferes with MinGW.
- if [%BUILD_TYPE%]==[MinGW_64_Debug] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- if [%BUILD_TYPE%]==[MinGW_64_Python27] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- if [%BUILD_TYPE%]==[MinGW_64_Python36] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- if [%BUILD_TYPE%]==[MinGW_64_Python37] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"

Expand All @@ -55,8 +53,6 @@ build_script:

- if [%BUILD_TYPE%]==[MinGW_64_Debug] C:\Python36-x64\python.exe tools\install_appveyor_mingw.py

- if [%BUILD_TYPE%]==[MinGW_64_Python27] C:\Python36-x64\python.exe tools\install_appveyor_mingw.py

- if [%BUILD_TYPE%]==[MinGW_64_Python36] C:\Python36-x64\python.exe tools\install_appveyor_mingw.py

- if [%BUILD_TYPE%]==[MinGW_64_Python37] C:\Python36-x64\python.exe tools\install_appveyor_mingw.py
Expand Down
10 changes: 0 additions & 10 deletions tools/install_appveyor_mingw.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,6 @@ def run_command(raw_command, directory=None, verbose=True):
python_version = '36'
python_folder = r'Python36-x64'
python_library = r'C:\\' + python_folder + r'\\python36.dll '
elif '64_Python27' in BUILD_TYPE:
python_version = r'27'
python_folder = r'Python27-x64'
python_library = r'C:\\' + python_folder + r'\\libs\\python27.dll '
# For py27 I could not get it to work with the appveyor python (I was close but got tired).
# Since this is anyway going to disappear (py27 really!!!), I am handling it as a one time workaround using the old py27 patched by bluescarni
rm_fr(r'c:\\Python27-x64')
wget(r'https://github.com/bluescarni/binary_deps/raw/master/python27_mingw_64.7z', 'python.7z')
run_command(r'7z x -aoa -oC:\\ python.7z', verbose=False)
run_command(r'mv C:\\Python27 C:\\Python27-x64', verbose=False)
else:
raise RuntimeError('Unsupported Python build: ' + BUILD_TYPE)

Expand Down
8 changes: 0 additions & 8 deletions tools/install_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ elif [[ ${PAGMO_PLUGINS_NONFREE_BUILD} == *36 ]]; then
PYTHON_DIR="cp36-cp36m"
BOOST_PYTHON_LIBRARY_NAME="libboost_python36.so"
PYTHON_VERSION="36"
elif [[ ${PAGMO_PLUGINS_NONFREE_BUILD} == *27mu ]]; then
PYTHON_DIR="cp27-cp27mu"
BOOST_PYTHON_LIBRARY_NAME="libboost_python27mu.so"
PYTHON_VERSION="27"
elif [[ ${PAGMO_PLUGINS_NONFREE_BUILD} == *27 ]]; then
PYTHON_DIR="cp27-cp27m"
BOOST_PYTHON_LIBRARY_NAME="libboost_python27.so"
PYTHON_VERSION="27"
else
echo "Invalid build type: ${PAGMO_PLUGINS_NONFREE_BUILD}"
exit 1
Expand Down
10 changes: 0 additions & 10 deletions tools/mingw_wheel_libs_python27.txt

This file was deleted.

0 comments on commit dc36ad8

Please sign in to comment.