From 7aa393e02c8a66688a05f0c890c9aafd10bde96d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 21 Dec 2023 19:20:37 -0800 Subject: [PATCH 1/4] src/sage/doctest/forker.py: Use JobClient(use_cysignals=True) --- src/sage/doctest/forker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py index 4315cd1ba9f..f7ddb6255d8 100644 --- a/src/sage/doctest/forker.py +++ b/src/sage/doctest/forker.py @@ -1807,7 +1807,7 @@ def parallel_dispatch(self): try: from gnumake_tokenpool import JobClient, NoJobServer try: - job_client = JobClient() + job_client = JobClient(use_cysignals=True) except NoJobServer: pass except ImportError: From 6f70bef8cc7200a852447a6f4873d6af0d28c2a5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 22 Dec 2023 12:41:59 -0800 Subject: [PATCH 2/4] src/sage/doctest/forker.py: Do not mask ImportError while calling JobClient --- src/sage/doctest/forker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py index f7ddb6255d8..efd28d10abe 100644 --- a/src/sage/doctest/forker.py +++ b/src/sage/doctest/forker.py @@ -1806,12 +1806,13 @@ def parallel_dispatch(self): job_client = None try: from gnumake_tokenpool import JobClient, NoJobServer + except ImportError: + pass + else: try: job_client = JobClient(use_cysignals=True) except NoJobServer: pass - except ImportError: - pass source_iter = iter(self.controller.sources) From 0eb95d8d0ccad4ed84673a33b177b8db4cd6df64 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 22 Dec 2023 13:01:10 -0800 Subject: [PATCH 3/4] build/pkgs/gnumake_tokenpool: Update to 0.0.4 --- build/pkgs/gnumake_tokenpool/checksums.ini | 6 +++--- build/pkgs/gnumake_tokenpool/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/gnumake_tokenpool/checksums.ini b/build/pkgs/gnumake_tokenpool/checksums.ini index 62f631ea40a..e79058d27e3 100644 --- a/build/pkgs/gnumake_tokenpool/checksums.ini +++ b/build/pkgs/gnumake_tokenpool/checksums.ini @@ -1,5 +1,5 @@ tarball=gnumake_tokenpool-VERSION-py3-none-any.whl -sha1=a060f03e0306a85bc1a91a450e457be83ed371e9 -md5=834ccc4d6d52741c5eabac1bdb8f39b2 -cksum=1679797266 +sha1=3dfcc8c466c17f974d90694f81f4481c3d84aecc +md5=5dae4c65e9609853085ae1970d4fe143 +cksum=612213211 upstream_url=https://pypi.io/packages/py3/g/gnumake_tokenpool/gnumake_tokenpool-VERSION-py3-none-any.whl diff --git a/build/pkgs/gnumake_tokenpool/package-version.txt b/build/pkgs/gnumake_tokenpool/package-version.txt index bcab45af15a..81340c7e72d 100644 --- a/build/pkgs/gnumake_tokenpool/package-version.txt +++ b/build/pkgs/gnumake_tokenpool/package-version.txt @@ -1 +1 @@ -0.0.3 +0.0.4 From f1be152e7dc4d8815796f806c1b2c48926e156b7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 22 Dec 2023 13:01:48 -0800 Subject: [PATCH 4/4] build/pkgs/gnumake_tokenpool/install-requires.txt: require >= 0.0.4 --- build/pkgs/gnumake_tokenpool/install-requires.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/gnumake_tokenpool/install-requires.txt b/build/pkgs/gnumake_tokenpool/install-requires.txt index 0ee4452edd3..759ca97a680 100644 --- a/build/pkgs/gnumake_tokenpool/install-requires.txt +++ b/build/pkgs/gnumake_tokenpool/install-requires.txt @@ -1 +1 @@ -gnumake-tokenpool +gnumake-tokenpool >= 0.0.4