Merge pull request #217 from rafaela-amorim/patch-1

Thanks Rafela.
LeeKamentsky · Jul 4, 2024 · 389fd87 · 389fd87
2 parents c8c12b4 + ed27190
commit 389fd87
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -27,5 +27,5 @@ jobs:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        python -m build
+        pip install dist/*.whl
diff --git a/_javabridge_mac.pyx b/_javabridge_mac.pyx
@@ -31,11 +31,11 @@ cdef extern from "mac_javabridge_utils.h":
     int MacIsMainThread() nogil
     void MacRunLoopRunInMode(double) nogil
 
-cdef void StopVM(JavaVM *vm):
+cdef void StopVM(JavaVM *vm) noexcept:
      MacStopVM()
 
 #
 # Unused stub in Mac
 #
-cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args):
+cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) noexcept:
     return -1
diff --git a/_javabridge_nomac.pyx b/_javabridge_nomac.pyx
@@ -9,37 +9,37 @@ cdef extern from "jni.h":
     ctypedef JNIInvokeInterface_ *JavaVM
 
     ctypedef struct JNIInvokeInterface_:
-         jint (*DestroyJavaVM)(JavaVM *vm) nogil
-         jint (*AttachCurrentThread)(JavaVM *vm, void **penv, void *args) nogil
-         jint (*DetachCurrentThread)(JavaVM *vm) nogil
-         jint (*GetEnv)(JavaVM *vm, void **penv, jint version) nogil
-         jint (*AttachCurrentThreadAsDaemon)(JavaVM *vm, void *penv, void *args) nogil
-    jint JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args) nogil
-
-cdef int MacStartVM(JavaVM **pvm, JavaVMInitArgs *pVMArgs, char *class_name) nogil:
+         jint (*DestroyJavaVM)(JavaVM *vm) noexcept nogil
+         jint (*AttachCurrentThread)(JavaVM *vm, void **penv, void *args) noexcept nogil
+         jint (*DetachCurrentThread)(JavaVM *vm) noexcept nogil
+         jint (*GetEnv)(JavaVM *vm, void **penv, jint version) noexcept nogil
+         jint (*AttachCurrentThreadAsDaemon)(JavaVM *vm, void *penv, void *args) noexcept nogil
+    jint JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args) noexcept nogil
+
+cdef int MacStartVM(JavaVM **pvm, JavaVMInitArgs *pVMArgs, char *class_name) noexcept nogil:
     return -1
 
-cdef void StopVM(JavaVM *vm) nogil:
+cdef void StopVM(JavaVM *vm) noexcept nogil:
     vm[0].DestroyJavaVM(vm)
 
-cdef void MacRunLoopInit() nogil:
+cdef void MacRunLoopInit() noexcept nogil:
     pass
 
-cdef void MacRunLoopRun() nogil:
+cdef void MacRunLoopRun() noexcept nogil:
     pass
 
-cdef void MacRunLoopStop() nogil:
+cdef void MacRunLoopStop() noexcept nogil:
     pass
 
-cdef void MacRunLoopReset() nogil:
+cdef void MacRunLoopReset() noexcept nogil:
     pass
 
-cdef int MacIsMainThread() nogil:
+cdef int MacIsMainThread() noexcept nogil:
     return 0
 
-cdef void MacRunLoopRunInMode(double timeout) nogil:
+cdef void MacRunLoopRunInMode(double timeout) noexcept nogil:
     pass
 
-cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) nogil:
+cdef int CreateJavaVM(JavaVM **pvm, void **pEnv, void *args) noexcept nogil:
     return JNI_CreateJavaVM(pvm, pEnv, args)