Skip to content

Commit

Permalink
Upgrade to work with python 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
mjedrzejewskirtb committed Aug 22, 2024
1 parent ab5f697 commit 8c5f06c
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.1
4.0.2
8 changes: 3 additions & 5 deletions scripts/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM quay.io/pypa/manylinux_2_24_x86_64
FROM quay.io/pypa/manylinux_2_28_x86_64

RUN apt-get update && \
apt-get install -y libssl-dev; \
RUN dnf install -y openssl-devel cpio && \
mkdir -p /code

WORKDIR /code

CMD /code/scripts/incontainer-build.sh

CMD ["/code/scripts/incontainer-build.sh"]

2 changes: 1 addition & 1 deletion scripts/manylinuxbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ done

# Bundle external shared libraries into the wheels
for whl in /code/work/tempwheels/*.whl; do
auditwheel repair "$whl" --plat manylinux_2_24_x86_64 -w /code/work/wheels/
auditwheel repair "$whl" --plat manylinux_2_28_x86_64 -w /code/work/wheels/
done

for PYBIN in /opt/python/*/bin/; do
Expand Down
2 changes: 1 addition & 1 deletion scripts/os_version
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ main() {
distro_version=${distro_version//[[:space:]]/}

case "$distro_id" in
'centos' | 'redhat' | 'rhel' | 'scientific' | 'ol' )
'centos' | 'redhat' | 'rhel' | 'scientific' | 'ol' | 'almalinux' )
distro_version=${distro_version%.*}
distro_long="${distro_id}${distro_version}"
distro_short="el${distro_version}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/aerospike.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ AerospikeConstants operator_constants[] = {
MOD_INIT(aerospike)
{

const char version[8] = "4.0.1";
const char version[8] = "4.0.2";
// Makes things "thread-safe"
PyEval_InitThreads();
int i = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/main/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static bool log_cb(as_log_level level, const char * func,
PyTuple_SetItem(py_arglist, 4, message);

// Invoke user callback, passing in argument's list
PyEval_CallObject(py_callback, py_arglist);
PyObject_CallObject(py_callback, py_arglist);

Py_DECREF(py_arglist);

Expand Down
2 changes: 1 addition & 1 deletion src/main/query/foreach.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static bool each_result(const as_val * val, void * udata)
PyTuple_SetItem(py_arglist, 0, py_result);

// Invoke Python Callback
py_return = PyEval_CallObject(py_callback, py_arglist);
py_return = PyObject_CallObject(py_callback, py_arglist);

// Release Python Function Arguments
Py_DECREF(py_arglist);
Expand Down
2 changes: 1 addition & 1 deletion src/main/scan/foreach.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static bool each_result(const as_val * val, void * udata)
PyTuple_SetItem(py_arglist, 0, py_result);

// Invoke Python Callback
py_return = PyEval_CallObject(py_callback, py_arglist);
py_return = PyObject_CallObject(py_callback, py_arglist);

// Release Python Function Arguments
Py_DECREF(py_arglist);
Expand Down
2 changes: 1 addition & 1 deletion src/main/serializer.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void execute_user_callback(user_serializer_callback *user_callback_info,
}

Py_INCREF(user_callback_info -> callback);
py_return = PyEval_CallObject(user_callback_info->callback, py_arglist);
py_return = PyObject_CallObject(user_callback_info->callback, py_arglist);
Py_DECREF(user_callback_info -> callback);
Py_DECREF(py_arglist);

Expand Down

0 comments on commit 8c5f06c

Please sign in to comment.