From a14869cdec7926e4594e42bf8b5e2ce1253248cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Fri, 11 Dec 2020 13:09:29 +0100 Subject: [PATCH 1/3] Drop support for python 2.7 Python 2.7 is officially dead, and pip will stop supporting packages for 2.7 in January 2021. Drop the official support for python2.7 and 2.7 pre-built packages. --- .travis.yml | 5 ----- README.md | 2 +- appveyor.yml | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 551f21595..103155692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - 2.7 - 3.5 - 3.6 @@ -33,10 +32,6 @@ matrix: - SCAN="scan-build --status-bugs" - SOURCEDEPLOY=1 - MKDOC="-DBUILD_DOC=ON -DSPHINX_ARGS=-WT" - - os: osx - language: generic - env: MB_PYTHON_VERSION=2.7 - python: 2.7 - os: osx language: generic env: MB_PYTHON_VERSION=3.5 diff --git a/README.md b/README.md index 6617bb725..f6677bb6d 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ To build segyio you need: * A C99 compatible C compiler (tested mostly on gcc and clang) * A C++ compiler for the Python extension, and C++11 for the tests * [CMake](https://cmake.org/) version 2.8.12 or greater - * [Python](https://www.python.org/) 2.7 or 3.x. + * [Python](https://www.python.org/) 3.6 or greater * [numpy](http://www.numpy.org/) version 1.10 or greater * [setuptools](https://pypi.python.org/pypi/setuptools) version 28 or greater * [setuptools-scm](https://pypi.python.org/pypi/setuptools_scm) diff --git a/appveyor.yml b/appveyor.yml index dcd731487..2062ebc79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,9 +18,6 @@ environment: TWINE_PASSWORD: secure: kTga6+rLL1fNpKqFNcX0QZNyqiYaHsEfSS4k6wvUoTE= matrix: - - PYTHON: C:\Python27 - LANG: -DBUILD_PYTHON=ON - PYTHON_VERSION: 27 - PYTHON: C:\Python35 LANG: -DBUILD_PYTHON=ON PYTHON_VERSION: 35 From 4751c11b8a8192b5bda2aeca10c4680f89038a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Fri, 11 Dec 2020 13:11:36 +0100 Subject: [PATCH 2/3] Set linux distro (xenial) as global config All jobs require (at least) xenial anyway, so it is about time to move it to a global config. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 103155692..3fcf1a8ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ env: os: - linux +dist: xenial + services: docker sudo: required @@ -19,15 +21,12 @@ matrix: fast_finish: true include: - python: 3.7 - dist: xenial sudo: true - python: 3.8 - dist: xenial sudo: true env: MB_ML_VER=2010 - compiler: clang python: 3.7 - dist: xenial env: - SCAN="scan-build --status-bugs" - SOURCEDEPLOY=1 From b2e70bca2f138fdea5de66ebdc94331031cbef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Fri, 11 Dec 2020 13:16:34 +0100 Subject: [PATCH 3/3] Stop running cppcheck on osx The homebrew install takes unreasonably long and effectively breaks travis. While it would be great to run cppcheck on all systems, the cost isn't worth it on travis infrastructure. The implementation is slightly more precise than a host check - it checks if a cppcheck program is available. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fcf1a8ed..941d1c24d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,10 +57,6 @@ addons: - cppcheck - cmake - cmake-data - homebrew: - update: true - packages: - - cppcheck before_install: - git clone https://github.com/matthew-brett/multibuild @@ -91,13 +87,17 @@ before_script: -DCMAKE_INSTALL_NAME_DIR=/usr/local/lib $MKDOC $enabled .. - - cppcheck --enable=style,portability,performance,warning + - if command -v cppcheck; then + cppcheck + --enable=style,portability,performance,warning --library=posix --library=$TRAVIS_BUILD_DIR/cppcheck/segyio.cfg --suppressions-list=$TRAVIS_BUILD_DIR/cppcheck/suppressions.txt --inline-suppr --project=compile_commands.json --error-exitcode=1 + ; + fi - popd # distutils/setuptools on macos ignores the --rpath argument, so set