Skip to content

Commit

Permalink
Merge pull request #495 from jokva/drop-py-27
Browse files Browse the repository at this point in the history
Drop py 27
  • Loading branch information
jokva authored Dec 13, 2020
2 parents a6e7d7b + b2e70bc commit 1219658
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
20 changes: 7 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- 2.7
- 3.5
- 3.6

Expand All @@ -13,30 +12,25 @@ env:
os:
- linux

dist: xenial

services: docker
sudo: required

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
- 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
Expand All @@ -63,10 +57,6 @@ addons:
- cppcheck
- cmake
- cmake-data
homebrew:
update: true
packages:
- cppcheck

before_install:
- git clone https://github.com/matthew-brett/multibuild
Expand Down Expand Up @@ -97,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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1219658

Please sign in to comment.