Skip to content

Commit

Permalink
Dependencies: Drop support for Python 3.7 (#282)
Browse files Browse the repository at this point in the history
  • Loading branch information
sphuber authored Feb 2, 2024
1 parent ff5770f commit 14b7c1a
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

services:
rabbitmq:
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ classifiers = [
'License :: OSI Approved :: MIT License',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
]
keywords = ['workflow', 'multithreaded', 'rabbitmq']
requires-python = '>=3.7'
requires-python = '>=3.8'
dependencies = [
'kiwipy[rmq]~=0.8.3',
'nest_asyncio~=1.5,>=1.5.1',
Expand Down
2 changes: 0 additions & 2 deletions src/plumpy/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ def reset_event_loop_policy() -> None:
cls = loop.__class__

del cls._check_running # type: ignore
# typo in Python 3.7 source
del cls._check_runnung # type: ignore
del cls._nest_patched # type: ignore
# pylint: enable=protected-access

Expand Down
6 changes: 0 additions & 6 deletions src/plumpy/process_states.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
import asyncio
from enum import Enum
import sys
import traceback
Expand Down Expand Up @@ -231,11 +230,6 @@ async def execute(self) -> State: # type: ignore # pylint: disable=invalid-over
except Interruption:
# Let this bubble up to the caller
raise
except asyncio.CancelledError: # pylint: disable=try-except-raise
# note this re-raise is only required in python<=3.7,
# for python>=3.8 asyncio.CancelledError does not inherit from Exception,
# so will not be caught below
raise
except Exception: # pylint: disable=broad-except
excepted = self.create_state(ProcessState.EXCEPTED, *sys.exc_info()[1:])
return cast(State, excepted)
Expand Down
6 changes: 0 additions & 6 deletions src/plumpy/processes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1235,12 +1235,6 @@ async def step(self) -> None:

except KeyboardInterrupt: # pylint: disable=try-except-raise
raise
except asyncio.CancelledError: # pylint: disable=try-except-raise
# note this re-raise is only required in python<=3.7,
# where asyncio.CancelledError == concurrent.futures.CancelledError
# it is encountered when the run_task is cancelled
# for python>=3.8 asyncio.CancelledError does not inherit from Exception, so will not be caught below
raise
except Exception: # pylint: disable=broad-except
# Overwrite the next state to go to excepted directly
next_state = self.create_state(process_states.ProcessState.EXCEPTED, *sys.exc_info()[1:])
Expand Down

0 comments on commit 14b7c1a

Please sign in to comment.