Skip to content

Commit 2c71472

Browse files
author
Release Manager
committed
gh-36339: fix expect interface for newer ptyprocess This will close #32147 ptyprocess 0.5.2+ included a change that broke our expect.py on macOS Here we guard a bit more around thrown errors, and this appears to suffice URL: #36339 Reported by: Dima Pasechnik Reviewer(s): Dima Pasechnik, Gonzalo Tornaría, Matthias Köppe
2 parents bb04839 + df89444 commit 2c71472

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

.github/workflows/ci-conda.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ jobs:
105105
echo "::remove-matcher owner=configure-system-package-warning::"
106106
echo "::remove-matcher owner=configure-system-package-error::"
107107
108-
# Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed
109-
pip install --no-build-isolation -v -v ptyprocess==0.5.1
110-
111108
- name: Build
112109
shell: bash -l {0}
113110
run: |

build/pkgs/ptyprocess/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=ptyprocess-VERSION.tar.gz
2-
sha1=3290062d67ef8a2f136bff9c2cd106673ff21316
3-
md5=94e537122914cc9ec9c1eadcd36e73a1
4-
cksum=1748633415
2+
sha1=2d8830d1025c8e33149c7723c2f283122f9488c1
3+
md5=9da200c397cb1752209a6b718b6cfc68
4+
cksum=2094263560
55
upstream_url=https://pypi.io/packages/source/p/ptyprocess/ptyprocess-VERSION.tar.gz
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
ptyprocess ==0.5.1
2-
# https://github.com/sagemath/sage/issues/31280#comment:42 and following
3-
# sagelib is not compatible with ptyprocess 0.5.2, 0.6, and 0.7
1+
ptyprocess > 0.5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.1.p0
1+
0.7.0

src/sage/interfaces/expect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ def _close(self, force=True):
561561
try:
562562
if self._expect is not None:
563563
self._expect.close(force=force)
564-
except ExceptionPexpect:
564+
except (ExceptionPexpect, OSError):
565565
self._expect.ptyproc.fd = -1
566566
self._expect.ptyproc.closed = True
567567
self._expect.child_fd = -1

0 commit comments

Comments
 (0)