Skip to content

Commit 5f11881

Browse files
Update to CPython 3.12 and Numpy 1.26 (#2)
Also update to the latest Scala and JUnit Jupiter API and fix resulting compile-errors. Co-authored-by: Hannes Wellmann <[email protected]>
1 parent 2c740d1 commit 5f11881

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>numpy</artifactId>
15-
<version>1.18.2-1.5.3</version>
15+
<version>1.26.3-1.5.10</version>
1616
</dependency>
1717

1818
<dependency>
1919
<groupId>org.bytedeco</groupId>
2020
<artifactId>numpy-platform</artifactId>
21-
<version>1.18.2-1.5.3</version>
21+
<version>1.26.3-1.5.10</version>
2222
<scope>test</scope>
2323
</dependency>
2424

2525
<dependency>
2626
<groupId>org.scala-lang.modules</groupId>
2727
<artifactId>scala-java8-compat_2.13</artifactId>
28-
<version>0.9.1</version>
28+
<version>1.0.2</version>
2929
</dependency>
3030

3131
<dependency>
3232
<groupId>org.junit.jupiter</groupId>
3333
<artifactId>junit-jupiter-api</artifactId>
34-
<version>5.7.1</version>
34+
<version>5.11.0</version>
3535
<scope>test</scope>
3636
</dependency>
3737
</dependencies>

src/main/java/org/bytedeco/embeddedpython/PyTypes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.bytedeco.cpython.PyObject;
44
import org.bytedeco.cpython.PyTypeObject;
5+
import org.bytedeco.cpython.global.python;
56

67
import static org.bytedeco.cpython.global.python.*;
78
import static org.bytedeco.numpy.global.numpy.*;
@@ -30,7 +31,7 @@ private PyTypes() {
3031
}
3132

3233
static PyTypeObject Py_TYPE(PyObject ob) {
33-
return ob.ob_type();
34+
return python.Py_TYPE(ob);
3435
}
3536

3637
static boolean Py_IS_TYPE(PyObject ob, PyTypeObject type) {

src/main/java/org/bytedeco/embeddedpython/Python.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private static void putPyObject(String name, PyObject obj) {
244244

245245
private static Object toJava(PyObject obj, TypeTreeBuilder builder) {
246246
PyObject iterator;
247-
PyTypeObject t = obj.ob_type();
247+
PyTypeObject t = PyTypes.Py_TYPE(obj);
248248
if (PyNone_Check(obj)) {
249249
builder.addType("None");
250250
return null;

0 commit comments

Comments
 (0)