From c27c61b29a216adc96d73e649068d046585bff13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCmer=20Cip?= Date: Thu, 31 Oct 2024 22:52:58 +0300 Subject: [PATCH 1/5] fix: silently ignore exceptions threw in PyObject_GetAttrString during pit->name resolve --- yappi/_yappi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yappi/_yappi.c b/yappi/_yappi.c index 56187c9..030acf3 100644 --- a/yappi/_yappi.c +++ b/yappi/_yappi.c @@ -688,8 +688,12 @@ _code2pit(PyFrameObject *fobj, uintptr_t current_tag) if (class_name) { pit->name = PyStr_FromFormat("%s.%s", PyStr_AS_CSTRING(class_name), PyStr_AS_CSTRING(cobj->co_name)); Py_DECREF(class_name); + } else { + PyErr_Clear(); } Py_DECREF(class_obj); + } else { + PyErr_Clear(); } } } From dc0fb004ec9d3119f776303182f87d68467f36bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCmer=20Cip?= Date: Thu, 31 Oct 2024 22:57:23 +0300 Subject: [PATCH 2/5] add more platforms/architectures --- .github/workflows/github-deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/github-deploy.yml b/.github/workflows/github-deploy.yml index 006ec5c..6241dc0 100644 --- a/.github/workflows/github-deploy.yml +++ b/.github/workflows/github-deploy.yml @@ -16,12 +16,18 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, windows-2019, macos-11] + architecture: [x86_64, arm64] steps: - uses: actions/checkout@v4 - name: Build wheels uses: pypa/cibuildwheel@v2.16.2 + env: + CIBW_ARCHS_MACOS: ${{ matrix.architecture }} + CIBW_PLATFORM: ${{ matrix.platform }} # Set platform based on matrix + CIBW_BUILD_VERBOSITY: 1 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl From 369c208c8e13e91208d1e4ef89e535cbf6da2534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCmer=20Cip?= Date: Thu, 31 Oct 2024 23:03:00 +0300 Subject: [PATCH 3/5] add more platforms/architectures --- .github/workflows/github-deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-deploy.yml b/.github/workflows/github-deploy.yml index 6241dc0..1b4081c 100644 --- a/.github/workflows/github-deploy.yml +++ b/.github/workflows/github-deploy.yml @@ -17,6 +17,7 @@ jobs: matrix: os: [ubuntu-20.04, windows-2019, macos-11] architecture: [x86_64, arm64] + platform: [manylinux2014, musllinux_1_1] steps: - uses: actions/checkout@v4 @@ -27,7 +28,7 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.architecture }} CIBW_PLATFORM: ${{ matrix.platform }} # Set platform based on matrix CIBW_BUILD_VERBOSITY: 1 - + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl From c7e5ba8c29f451a7b1607beb18065f7aed065f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCmer=20Cip?= Date: Thu, 31 Oct 2024 23:05:18 +0300 Subject: [PATCH 4/5] update changelog/version --- CHANGELOG | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a6ddce5..e32a834 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG ========= +1.6.1 (2024-10-31) + +- Fix error not cleared from an internal PyObject_GetAttrString call + 1.6.0 (2023-12-07) - Drop support 2.7-3.5 and clean backward compatible code (pull/152) diff --git a/setup.py b/setup.py index 9fd4048..0345247 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ HOMEPAGE = "https://github.com/sumerc/yappi" NAME = "yappi" -VERSION = "1.6.0" +VERSION = "1.6.1" _DEBUG = False # compile/link code for debugging _PROFILE = False # profile yappi itself From c69da27ce7da4c213a46664ce9e6d70f14816eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCmer=20Cip?= Date: Thu, 31 Oct 2024 23:06:20 +0300 Subject: [PATCH 5/5] fix: conflict --- .github/workflows/github-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-deploy.yml b/.github/workflows/github-deploy.yml index 1b4081c..0c6413b 100644 --- a/.github/workflows/github-deploy.yml +++ b/.github/workflows/github-deploy.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 env: CIBW_ARCHS_MACOS: ${{ matrix.architecture }} CIBW_PLATFORM: ${{ matrix.platform }} # Set platform based on matrix