From 5e6177064f304bfdf04af49902c43b80f65dbed7 Mon Sep 17 00:00:00 2001 From: Jon Holba Date: Tue, 3 Dec 2024 15:20:44 +0100 Subject: [PATCH] Drop support for Python 3.10 --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 - .github/workflows/build_and_test.yml | 2 +- pyproject.toml | 3 +-- src/ert/ensemble_evaluator/_wait_for_evaluator.py | 2 +- src/ert/scheduler/job.py | 4 +++- src/ert/services/storage_service.py | 5 ++++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 8add2949d78..9f217822d46 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,7 +35,6 @@ body: description: | Please check of the environments where this behavior has been observed. options: - - label: python 3.10 - label: python 3.11 - label: python 3.12 - label: macosx diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3ce765b842e..cd0ce443dbe 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.10', '3.11', '3.12' ] + python-version: [ '3.11', '3.12' ] uses: ./.github/workflows/build-wheels.yml with: diff --git a/pyproject.toml b/pyproject.toml index 9beff0083db..f2f38319686 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ authors = [ { name = "Equinor ASA", email = "fg_sib-scout@equinor.com" }, ] description = "Ensemble based Reservoir Tool (ERT)" -requires-python = ">=3.10" +requires-python = ">=3.11" readme = "README.md" license = { text = "GPL-3.0" } classifiers = [ @@ -21,7 +21,6 @@ classifiers = [ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Natural Language :: English", "Programming Language :: Python", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", diff --git a/src/ert/ensemble_evaluator/_wait_for_evaluator.py b/src/ert/ensemble_evaluator/_wait_for_evaluator.py index 9b5f5591292..4cbde527e0d 100644 --- a/src/ert/ensemble_evaluator/_wait_for_evaluator.py +++ b/src/ert/ensemble_evaluator/_wait_for_evaluator.py @@ -45,7 +45,7 @@ async def wait_for_evaluator( token: Optional[str] = None, cert: Optional[Union[str, bytes]] = None, healthcheck_endpoint: str = "/healthcheck", - timeout: Optional[float] = None, + timeout: Optional[float] = None, # noqa: ASYNC109 connection_timeout: float = 2, ) -> None: if timeout is None: diff --git a/src/ert/scheduler/job.py b/src/ert/scheduler/job.py index cba6e9144ca..d070a12f62f 100644 --- a/src/ert/scheduler/job.py +++ b/src/ert/scheduler/job.py @@ -190,7 +190,9 @@ async def _max_runtime_task(self) -> None: self.returncode.cancel() async def _verify_checksum( - self, checksum_lock: asyncio.Lock, timeout: Optional[int] = None + self, + checksum_lock: asyncio.Lock, + timeout: Optional[int] = None, # noqa: ASYNC109 ) -> None: if timeout is None: timeout = self.DEFAULT_CHECKSUM_TIMEOUT diff --git a/src/ert/services/storage_service.py b/src/ert/services/storage_service.py index 63864e9e3b2..d1a1226e876 100644 --- a/src/ert/services/storage_service.py +++ b/src/ert/services/storage_service.py @@ -86,7 +86,10 @@ def session(cls, timeout: Optional[int] = None) -> Client: ) @classmethod - async def async_session(cls, timeout: Optional[int] = None) -> httpx.AsyncClient: + async def async_session( + cls, + timeout: Optional[int] = None, # noqa: ASYNC109 + ) -> httpx.AsyncClient: """ Start a HTTP transaction with the server """