Skip to content

Commit 9703ed3

Browse files
committed
Sync with meos, use MobilityDB/MobilityDB to build package, and bump version to rc1
1 parent 46b3f16 commit 9703ed3

7 files changed

Lines changed: 6 additions & 37 deletions

File tree

pymeos/pymeos/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
MeosGeoJsonOutputError,
3030
)
3131

32-
__version__ = "1.1.3b5"
32+
__version__ = "1.1.3rc1"
3333
__all__ = [
3434
# initialization
3535
"pymeos_initialize",

pymeos/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ license = { file = 'LICENSE' }
3434

3535
requires-python = '>=3.7'
3636
dependencies = [
37-
'pymeos-cffi ==1.1.0b5',
37+
'pymeos-cffi ==1.1.0rc1',
3838
'python-dateutil',
3939
'shapely',
4040
]

pymeos_cffi/docker/MEOS.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ FROM quay.io/pypa/manylinux2014_x86_64
33
RUN yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
44
&& yum -y update \
55
&& yum -y install gcc gcc-c++ make cmake postgresql13-devel proj81-devel json-c-devel geos39-devel gsl-devel \
6-
&& git clone https://github.com/Diviloper/MobilityDB
6+
&& git clone https://github.com/MobilityDB/MobilityDB

pymeos_cffi/pymeos_cffi/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from .enums import *
33
from .errors import *
44

5-
__version__ = "1.1.0b6"
5+
__version__ = "1.1.0rc1"
66
__all__ = [
77
# Exceptions
88
"MeosException",
@@ -1515,7 +1515,6 @@
15151515
"temporal_time_split",
15161516
"tfloat_value_split",
15171517
"tfloat_value_time_split",
1518-
"tpoint_space_split",
15191518
"tfloatbox_tile",
15201519
"tfloatbox_tile_list",
15211520
"timestamptz_bucket",

pymeos_cffi/pymeos_cffi/builder/meos.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,15 +2045,14 @@ extern STBox *stbox_tile_list(const STBox *bounds, double xsize, double ysize, d
20452045
extern Temporal **temporal_time_split(Temporal *temp, Interval *duration, TimestampTz torigin, TimestampTz **time_buckets, int *count);
20462046
extern Temporal **tfloat_value_split(Temporal *temp, double size, double origin, double **value_buckets, int *count);
20472047
extern Temporal **tfloat_value_time_split(Temporal *temp, double size, Interval *duration, double vorigin, TimestampTz torigin, double **value_buckets, TimestampTz **time_buckets, int *count);
2048-
extern Temporal **tpoint_space_split(Temporal *temp, float xsize, float ysize, float zsize, GSERIALIZED *sorigin, bool bitmatrix, GSERIALIZED ***space_buckets, int *count);
20492048
extern TBox *tfloatbox_tile(double value, TimestampTz t, double vsize, Interval *duration, double vorigin, TimestampTz torigin);
20502049
extern TBox *tfloatbox_tile_list(const TBox *box, double xsize, const Interval *duration, double xorigin, TimestampTz torigin, int *count);
20512050
extern TimestampTz timestamptz_bucket(TimestampTz timestamp, const Interval *duration, TimestampTz origin);
20522051
extern Temporal **tint_value_split(Temporal *temp, int size, int origin, int **value_buckets, int *count);
20532052
extern Temporal **tint_value_time_split(Temporal *temp, int size, Interval *duration, int vorigin, TimestampTz torigin, int **value_buckets, TimestampTz **time_buckets, int *count);
20542053
extern TBox *tintbox_tile(int value, TimestampTz t, int vsize, Interval *duration, int vorigin, TimestampTz torigin);
20552054
extern TBox *tintbox_tile_list(const TBox *box, int xsize, const Interval *duration, int xorigin, TimestampTz torigin, int *count);
2056-
/* extern Temporal **tpoint_space_split(Temporal *temp, float xsize, float ysize, float zsize, GSERIALIZED *sorigin, bool bitmatrix, GSERIALIZED ***space_buckets, int *count); (repeated) */
2055+
extern Temporal **tpoint_space_split(Temporal *temp, float xsize, float ysize, float zsize, GSERIALIZED *sorigin, bool bitmatrix, GSERIALIZED ***space_buckets, int *count);
20572056
extern Temporal **tpoint_space_time_split(Temporal *temp, float xsize, float ysize, float zsize, Interval *duration, GSERIALIZED *sorigin, TimestampTz torigin, bool bitmatrix, GSERIALIZED ***space_buckets, TimestampTz **time_buckets, int *count);
20582057
extern Span *tstzspan_bucket_list(const Span *bounds, const Interval *duration, TimestampTz origin, int *count);
20592058

pymeos_cffi/pymeos_cffi/builder/templates/init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from .enums import *
33
from .errors import *
44

5-
__version__ = "1.1.0b6"
5+
__version__ = "1.1.0rc1"
66
__all__ = [
77
# Exceptions
88
"MeosException",

pymeos_cffi/pymeos_cffi/functions.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12137,35 +12137,6 @@ def tfloat_value_time_split(
1213712137
)
1213812138

1213912139

12140-
def tpoint_space_split(
12141-
temp: "Temporal *",
12142-
xsize: "float",
12143-
ysize: "float",
12144-
zsize: "float",
12145-
sorigin: "GSERIALIZED *",
12146-
bitmatrix: bool,
12147-
) -> "Tuple['Temporal **', 'GSERIALIZED ***', 'int']":
12148-
temp_converted = _ffi.cast("Temporal *", temp)
12149-
xsize_converted = _ffi.cast("float", xsize)
12150-
ysize_converted = _ffi.cast("float", ysize)
12151-
zsize_converted = _ffi.cast("float", zsize)
12152-
sorigin_converted = _ffi.cast("GSERIALIZED *", sorigin)
12153-
space_buckets = _ffi.new("GSERIALIZED ***")
12154-
count = _ffi.new("int *")
12155-
result = _lib.tpoint_space_split(
12156-
temp_converted,
12157-
xsize_converted,
12158-
ysize_converted,
12159-
zsize_converted,
12160-
sorigin_converted,
12161-
bitmatrix,
12162-
space_buckets,
12163-
count,
12164-
)
12165-
_check_error()
12166-
return result if result != _ffi.NULL else None, space_buckets[0], count[0]
12167-
12168-
1216912140
def tfloatbox_tile(
1217012141
value: float,
1217112142
t: int,

0 commit comments

Comments
 (0)