diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index b0a95754cab..9695dc7ef9a 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -105,9 +105,6 @@ jobs: echo "::remove-matcher owner=configure-system-package-warning::" echo "::remove-matcher owner=configure-system-package-error::" - # Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed - pip install --no-build-isolation -v -v ptyprocess==0.5.1 - - name: Build shell: bash -l {0} run: | diff --git a/build/pkgs/ptyprocess/checksums.ini b/build/pkgs/ptyprocess/checksums.ini index 7c8cf7bd652..d55046be142 100644 --- a/build/pkgs/ptyprocess/checksums.ini +++ b/build/pkgs/ptyprocess/checksums.ini @@ -1,5 +1,5 @@ tarball=ptyprocess-VERSION.tar.gz -sha1=3290062d67ef8a2f136bff9c2cd106673ff21316 -md5=94e537122914cc9ec9c1eadcd36e73a1 -cksum=1748633415 +sha1=2d8830d1025c8e33149c7723c2f283122f9488c1 +md5=9da200c397cb1752209a6b718b6cfc68 +cksum=2094263560 upstream_url=https://pypi.io/packages/source/p/ptyprocess/ptyprocess-VERSION.tar.gz diff --git a/build/pkgs/ptyprocess/install-requires.txt b/build/pkgs/ptyprocess/install-requires.txt index a89be777b4a..4527bfdd3d1 100644 --- a/build/pkgs/ptyprocess/install-requires.txt +++ b/build/pkgs/ptyprocess/install-requires.txt @@ -1,3 +1 @@ -ptyprocess ==0.5.1 -# https://github.com/sagemath/sage/issues/31280#comment:42 and following -# sagelib is not compatible with ptyprocess 0.5.2, 0.6, and 0.7 +ptyprocess > 0.5 diff --git a/build/pkgs/ptyprocess/package-version.txt b/build/pkgs/ptyprocess/package-version.txt index dfd7f4b3ab3..faef31a4357 100644 --- a/build/pkgs/ptyprocess/package-version.txt +++ b/build/pkgs/ptyprocess/package-version.txt @@ -1 +1 @@ -0.5.1.p0 +0.7.0 diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py index 84adf0341b5..30d3843852e 100644 --- a/src/sage/interfaces/expect.py +++ b/src/sage/interfaces/expect.py @@ -561,7 +561,7 @@ def _close(self, force=True): try: if self._expect is not None: self._expect.close(force=force) - except ExceptionPexpect: + except (ExceptionPexpect, OSError): self._expect.ptyproc.fd = -1 self._expect.ptyproc.closed = True self._expect.child_fd = -1