Skip to content

Commit 18bc167

Browse files
authored
Merge branch 'master' into fix-namedtuple-overlapping
2 parents 9233143 + d4e7a81 commit 18bc167

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

mypyc/lib-rt/pythoncapi_compat.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,7 +1939,8 @@ PyLongWriter_Finish(PyLongWriter *writer)
19391939
static inline FILE* Py_fopen(PyObject *path, const char *mode)
19401940
{
19411941
#if 0x030400A2 <= PY_VERSION_HEX && !defined(PYPY_VERSION)
1942-
extern FILE* _Py_fopen_obj(PyObject *path, const char *mode);
1942+
PyAPI_FUNC(FILE*) _Py_fopen_obj(PyObject *path, const char *mode);
1943+
19431944
return _Py_fopen_obj(path, mode);
19441945
#else
19451946
FILE *f;
@@ -2109,7 +2110,8 @@ PyConfig_Get(const char *name)
21092110
return Py_NewRef(value);
21102111
}
21112112

2112-
extern const PyConfig* _Py_GetConfig(void);
2113+
PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
2114+
21132115
const PyConfig *config = _Py_GetConfig();
21142116
void *member = (char *)config + spec->offset;
21152117
switch (spec->type) {

test-requirements.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
-r build-requirements.txt
66
attrs>=18.0
77
filelock>=3.3.0
8-
# lxml 4.9.3 switched to manylinux_2_28, the wheel builder still uses manylinux2014
9-
lxml>=4.9.1,<4.9.3; (python_version<'3.11' or sys_platform!='win32') and python_version<'3.12'
8+
lxml>=5.3.0; python_version<'3.14'
109
psutil>=4.0
1110
pytest>=8.1.0
1211
pytest-xdist>=1.34.0

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ identify==2.6.6
2222
# via pre-commit
2323
iniconfig==2.0.0
2424
# via pytest
25-
lxml==4.9.2 ; (python_version < "3.11" or sys_platform != "win32") and python_version < "3.12"
25+
lxml==5.3.0 ; python_version < "3.14"
2626
# via -r test-requirements.in
2727
mypy-extensions==1.0.0
2828
# via -r mypy-requirements.txt

0 commit comments

Comments
 (0)