Skip to content

Update geos version number #498

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.

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

Merged
merged 2 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 7 additions & 31 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
addons:
apt:
packages:
- libgeos-3.4.2
- libgeos-3.5.0
# matplotlib requirements
- libpng12-dev
- libfreetype6-dev
Expand All @@ -33,42 +33,21 @@ cache:
# matrix generates 6 test cases
matrix:
include:
# "minimum requirements" environments
# test the bare minimum versions
# compiles internal libgeos
# Notes:
# numpy 1.7.0 is the first version that works out of the box for Python 2.6 and 3.3
# numpy 1.5.1 is the earliest version to compile and *might* be able to work on Python 2.6,
# if two unit tests are skipped due to numpy.copy(a,order) not having 'order' parameter
# 1.6.0-1.6.2 works out of the box for Python 2.6
# matplotlib 1.2.0 was found to be the earliest version that installs
- python: 2.6
env:
- NUMPY=numpy==1.7.0
- MPL=matplotlib==1.2.0
- BUILD_LIBGEOS=internal

# "middle of the road" environment
# use prepackaged binaries
# if no prepackaged binary available, use a previous stable version
- python: 3.4
env:
- MPL=matplotlib==1.4.3
- NUMPY=numpy==1.9.3
- BUILD_LIBGEOS=internal

# "latest and greatest" stable environments
# this uses the current stable versions
# pip installs latest stable versions automatically
- python: 2.7
env:
- BUILD_LIBGEOS=3.5.1
- python: 3.5
env:
- BUILD_LIBGEOS=3.5.1
- python: 3.6
env:
- BUILD_LIBGEOS=3.6.1
- python: 3.7
env:
- BUILD_LIBGEOS=3.6.1
- python: 3.8
env:
- BUILD_LIBGEOS=3.6.1

# "current development" environment
# this test is diagnostic for development versions and is not required to pass
Expand Down Expand Up @@ -106,9 +85,6 @@ install:
- pip install $PYPROJ
- pip install -r requirements.txt

# extra requirements to support Python 2.6
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r .requirements-2.6.txt; fi

- |
# Is libgeos suppose to be built?
if [[ $BUILD_LIBGEOS != 'false' ]]; then
Expand Down
4 changes: 4 additions & 0 deletions lib/mpl_toolkits/basemap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,10 @@ def _readboundarydata(self,name,as_polygons=False):
# convert polygons to line segments
poly = _geoslib.LineString(poly.boundary)
else:
# this is a workaround to avoid
# GEOS_ERROR: CGAlgorithmsDD::orientationIndex encountered NaN/Inf numbers
b[np.isposinf(b)] = 1e20
b[np.isneginf(b)] = -1e20
poly = Shape(b)
# this is a workaround to avoid
# "GEOS_ERROR: TopologyException:
Expand Down