Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop python310 #9433

Merged
merged 2 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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",
Expand All @@ -30,7 +29,6 @@ classifiers = [
dynamic = ["version"]
dependencies = [
"aiohttp",
"backports-datetime_fromisoformat; python_version < '3.11'",
"cryptography",
"dnspython >= 2",
"fastapi",
Expand Down
2 changes: 1 addition & 1 deletion src/ert/ensemble_evaluator/_wait_for_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions src/ert/ensemble_evaluator/snapshot.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import logging
import sys
import typing
from collections import defaultdict
from datetime import datetime
Expand Down Expand Up @@ -49,11 +48,6 @@

logger = logging.getLogger(__name__)

if sys.version_info < (3, 11):
from backports.datetime_fromisoformat import MonkeyPatch # type: ignore

MonkeyPatch.patch_fromisoformat()


class UnsupportedOperationException(ValueError):
pass
Expand Down
6 changes: 0 additions & 6 deletions src/ert/gui/model/snapshot.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import logging
import sys
from collections import defaultdict
from contextlib import ExitStack
from datetime import datetime, timedelta
Expand All @@ -26,11 +25,6 @@
)
from ert.shared.status.utils import byte_with_unit, file_has_content

if sys.version_info < (3, 11):
from backports.datetime_fromisoformat import MonkeyPatch # type: ignore

MonkeyPatch.patch_fromisoformat()

logger = logging.getLogger(__name__)

UserRole = Qt.ItemDataRole.UserRole
Expand Down
4 changes: 3 additions & 1 deletion src/ert/scheduler/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/ert/services/storage_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down
Loading