Skip to content

Commit 389fd87

Browse files
authored
Merge pull request LeeKamentsky#217 from rafaela-amorim/patch-1
Thanks Rafela.
2 parents c8c12b4 + ed27190 commit 389fd87

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

.github/workflows/python-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ jobs:
2727
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
2828
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2929
run: |
30-
python setup.py sdist bdist_wheel
31-
twine upload dist/*
30+
python -m build
31+
pip install dist/*.whl

_javabridge_mac.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ cdef extern from "mac_javabridge_utils.h":
3131
int MacIsMainThread() nogil
3232
void MacRunLoopRunInMode(double) nogil
3333

34-
cdef void StopVM(JavaVM *vm):
34+
cdef void StopVM(JavaVM *vm) noexcept:
3535
MacStopVM()
3636

3737
#
3838
# Unused stub in Mac
3939
#
40-
cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args):
40+
cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) noexcept:
4141
return -1

_javabridge_nomac.pyx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ cdef extern from "jni.h":
99
ctypedef JNIInvokeInterface_ *JavaVM
1010

1111
ctypedef struct JNIInvokeInterface_:
12-
jint (*DestroyJavaVM)(JavaVM *vm) nogil
13-
jint (*AttachCurrentThread)(JavaVM *vm, void **penv, void *args) nogil
14-
jint (*DetachCurrentThread)(JavaVM *vm) nogil
15-
jint (*GetEnv)(JavaVM *vm, void **penv, jint version) nogil
16-
jint (*AttachCurrentThreadAsDaemon)(JavaVM *vm, void *penv, void *args) nogil
17-
jint JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args) nogil
18-
19-
cdef int MacStartVM(JavaVM **pvm, JavaVMInitArgs *pVMArgs, char *class_name) nogil:
12+
jint (*DestroyJavaVM)(JavaVM *vm) noexcept nogil
13+
jint (*AttachCurrentThread)(JavaVM *vm, void **penv, void *args) noexcept nogil
14+
jint (*DetachCurrentThread)(JavaVM *vm) noexcept nogil
15+
jint (*GetEnv)(JavaVM *vm, void **penv, jint version) noexcept nogil
16+
jint (*AttachCurrentThreadAsDaemon)(JavaVM *vm, void *penv, void *args) noexcept nogil
17+
jint JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args) noexcept nogil
18+
19+
cdef int MacStartVM(JavaVM **pvm, JavaVMInitArgs *pVMArgs, char *class_name) noexcept nogil:
2020
return -1
2121

22-
cdef void StopVM(JavaVM *vm) nogil:
22+
cdef void StopVM(JavaVM *vm) noexcept nogil:
2323
vm[0].DestroyJavaVM(vm)
2424

25-
cdef void MacRunLoopInit() nogil:
25+
cdef void MacRunLoopInit() noexcept nogil:
2626
pass
2727

28-
cdef void MacRunLoopRun() nogil:
28+
cdef void MacRunLoopRun() noexcept nogil:
2929
pass
3030

31-
cdef void MacRunLoopStop() nogil:
31+
cdef void MacRunLoopStop() noexcept nogil:
3232
pass
3333

34-
cdef void MacRunLoopReset() nogil:
34+
cdef void MacRunLoopReset() noexcept nogil:
3535
pass
3636

37-
cdef int MacIsMainThread() nogil:
37+
cdef int MacIsMainThread() noexcept nogil:
3838
return 0
3939

40-
cdef void MacRunLoopRunInMode(double timeout) nogil:
40+
cdef void MacRunLoopRunInMode(double timeout) noexcept nogil:
4141
pass
4242

43-
cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) nogil:
43+
cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) noexcept nogil:
4444
return JNI_CreateJavaVM(pvm, pEnv, args)
4545

0 commit comments

Comments
 (0)