Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BLD: Fix armv7 build #59906

Merged
merged 5 commits into from
Sep 30, 2024
Merged

BLD: Fix armv7 build #59906

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f4dbd3
BLD: Fix armv7 build
cdce8p Sep 27, 2024
1a6dd01
Remove redundant include
cdce8p Sep 27, 2024
39b8a01
Merge branch 'main' into fix-armv7-build
cdce8p Sep 28, 2024
57b2d27
Merge branch 'main' into fix-armv7-build
WillAyd Sep 30, 2024
af66b1d
Update JSONtoObj.c
WillAyd Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pandas/_libs/src/vendored/ujson/python/JSONtoObj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ Numeric decoder derived from TCL library

// Licence at LICENSES/ULTRAJSON_LICENSE

#include "pandas/vendored/ujson/lib/ultrajson.h"
// clang-format off
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can remove these clang-format comments now too (I assume they were flagging the multiple includes of the header)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately not. clang-format changes the order of imports here, so without the comment the change would be reverted by pre-commit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah OK...that makes sense. Thanks.

I see CI is broken now but I believe that's unrelated

#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "pandas/vendored/ujson/lib/ultrajson.h"
// clang-format on

static int Object_objectAddKey(void *Py_UNUSED(prv), JSOBJ obj, JSOBJ name,
JSOBJ value) {
Expand Down
Loading