Refine

hattya · Oct 16, 2024 · e507556 · e507556
1 parent 89590f7
commit e507556
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
           - platform: Linux
             os: ubuntu-latest
           - platform: macOS
-            os: macos-latest
+            os: macos-13
           - platform: Windows
             os: windows-latest
         exclude:

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,4 @@
 [sdist]
-formats = zip
 group = users
 
 [flake8]

diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,7 @@ deps =
     flake8-bugbear
     mypy
     scmver[toml] >= 1.7
-passenv = *FLAGS, DISTUTILS_*, INCLUDE, LC_*, LIB, MSSdk, Program*, SETUPTOOLS_*
+passenv = *FLAGS, INCLUDE, LC_*, LIB, MSSdk, Program*
 commands =
     python setup.py build_ext --inplace
 # test

diff --git a/zopfli/_zopfli/_zopflimodule.h b/zopfli/_zopfli/_zopflimodule.h
@@ -1,7 +1,7 @@
 /*
  * zopfli._zopfli :: _zopflimodule.h
  *
- *   Copyright (c) 2015-2021 Akinori Hattori <[email protected]>
+ *   Copyright (c) 2015-2024 Akinori Hattori <[email protected]>
  *
  *   SPDX-License-Identifier: Apache-2.0
  */
@@ -40,13 +40,13 @@ extern "C" {
               PyThread_free_lock((self)->lock); \
           }                                     \
       } while (0)
-#  define ACQUIRE_LOCK(self)                                \
-      do {                                                  \
-          if (!PyThread_acquire_lock((self)->lock, 0)) {    \
-              Py_BEGIN_ALLOW_THREADS                        \
-              PyThread_acquire_lock((self)->lock, 1);       \
-              Py_END_ALLOW_THREADS                          \
-          }                                                 \
+#  define ACQUIRE_LOCK(self)                                            \
+      do {                                                              \
+          if (!PyThread_acquire_lock((self)->lock, NOWAIT_LOCK)) {      \
+              Py_BEGIN_ALLOW_THREADS                                    \
+              PyThread_acquire_lock((self)->lock, WAIT_LOCK);           \
+              Py_END_ALLOW_THREADS                                      \
+          }                                                             \
       } while (0)
 #  define RELEASE_LOCK(self) PyThread_release_lock((self)->lock)
 # else