diff --git a/.github/workflows/ci.py b/.github/workflows/ci.py index 3b55ab6d2..d1c448e4f 100644 --- a/.github/workflows/ci.py +++ b/.github/workflows/ci.py @@ -160,10 +160,7 @@ def install_deps() -> None: if is_bundle: install_bundle() else: - cmd = 'python3 -m pip install Pillow pygments' - if sys.version_info[:2] < (3, 7): - cmd += ' importlib-resources dataclasses' - run(cmd) + run('python3 -m pip install Pillow pygments') install_slang_compiler() install_fonts() diff --git a/kitty/child.c b/kitty/child.c index 88f423002..e1fdeade2 100644 --- a/kitty/child.c +++ b/kitty/child.c @@ -146,16 +146,12 @@ spawn(PyObject *self UNUSED, PyObject *args) { int handled_signals[16] = {0}, num_handled_signals = MIN((int)arraysz(handled_signals), PyTuple_GET_SIZE(handled_signals_p)); for (Py_ssize_t i = 0; i < num_handled_signals; i++) handled_signals[i] = PyLong_AsLong(PyTuple_GET_ITEM(handled_signals_p, i)); -#if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork(); -#endif pid_t pid = fork(); switch (pid) { case 0: { // child -#if PY_VERSION_HEX >= 0x03070000 PyOS_AfterFork_Child(); -#endif const struct sigaction act = {.sa_handler = SIG_DFL}; #define SA(which) \ @@ -256,19 +252,13 @@ spawn(PyObject *self UNUSED, PyObject *args) { break; } case -1: { -#if PY_VERSION_HEX >= 0x03070000 int saved_errno = errno; PyOS_AfterFork_Parent(); errno = saved_errno; -#endif PyErr_SetFromErrno(PyExc_OSError); break; } - default: -#if PY_VERSION_HEX >= 0x03070000 - PyOS_AfterFork_Parent(); -#endif - break; + default: PyOS_AfterFork_Parent(); break; } #undef exit_on_err free(argv);