Skip to content

Commit

Permalink
Fix signed char portability issue (#293)
Browse files Browse the repository at this point in the history
  • Loading branch information
brendan-ward committed Feb 8, 2021
1 parent 26f9c76 commit 5886ebc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Version 0.10 (unreleased)

* Addition of a ``contains_properly`` function (#267).

**Bug fixes**
* Fixed portability issue for ARM architecture (#293)

**Acknowledgments**

Thanks to everyone who contributed to this release!
Expand Down
17 changes: 17 additions & 0 deletions docker/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This docker container is used for testing pygeos in ARM64 emulation mode.
# To build it:
# docker build . -f ./docker/Dockerfile.arm64 -t pygeos/arm64
# Then run the pygeos test suite:
# docker run --rm pygeos/arm64:latest python3 -m pytest -vv

FROM --platform=linux/arm64/v8 arm64v8/ubuntu:20.04

RUN apt-get update && apt-get install -y build-essential libgeos-dev python3-dev python3-pip --no-install-recommends

RUN pip3 install numpy Cython pytest

COPY . /code

WORKDIR /code

RUN python3 setup.py build_ext --inplace
3 changes: 1 addition & 2 deletions src/ufuncs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1988,8 +1988,7 @@ static char create_collection_dtypes[3] = {NPY_OBJECT, NPY_INT, NPY_OBJECT};
static void create_collection_func(char** args, npy_intp* dimensions, npy_intp* steps,
void* data) {
GEOSGeometry *g, *g_copy;
int n_geoms, type;
char actual_type, expected_type, alt_expected_type;
int n_geoms, type, actual_type, expected_type, alt_expected_type;

GEOS_INIT;

Expand Down

0 comments on commit 5886ebc

Please sign in to comment.