File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed
src/pytorch_lightning/utilities
tests/tests_pytorch/trainer/connectors Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -124,6 +124,7 @@ def __repr__(self) -> str:
124124_IS_WINDOWS = platform .system () == "Windows"
125125_IS_INTERACTIVE = hasattr (sys , "ps1" ) # https://stackoverflow.com/a/64523765
126126_PYTHON_GREATER_EQUAL_3_8_0 = (sys .version_info .major , sys .version_info .minor ) >= (3 , 8 )
127+ _PYTHON_GREATER_EQUAL_3_10_0 = (sys .version_info .major , sys .version_info .minor ) >= (3 , 10 )
127128_TORCH_GREATER_EQUAL_1_9_1 = _compare_version ("torch" , operator .ge , "1.9.1" )
128129_TORCH_GREATER_EQUAL_1_10 = _compare_version ("torch" , operator .ge , "1.10.0" )
129130_TORCH_LESSER_EQUAL_1_10_2 = _compare_version ("torch" , operator .le , "1.10.2" )
Original file line number Diff line number Diff line change 3030)
3131from pytorch_lightning .demos .boring_classes import BoringModel
3232from pytorch_lightning .trainer .connectors .callback_connector import CallbackConnector
33- from pytorch_lightning .utilities .imports import _PYTHON_GREATER_EQUAL_3_8_0
33+ from pytorch_lightning .utilities .imports import _PYTHON_GREATER_EQUAL_3_8_0 , _PYTHON_GREATER_EQUAL_3_10_0
3434
3535
3636def test_checkpoint_callbacks_are_last (tmpdir ):
@@ -265,7 +265,10 @@ def _make_entry_point_query_mock(callback_factory):
265265 entry_point = Mock ()
266266 entry_point .name = "mocked"
267267 entry_point .load .return_value = callback_factory
268- if _PYTHON_GREATER_EQUAL_3_8_0 :
268+ if _PYTHON_GREATER_EQUAL_3_10_0 :
269+ query_mock .return_value = [entry_point ]
270+ import_path = "importlib.metadata.entry_points"
271+ elif _PYTHON_GREATER_EQUAL_3_8_0 :
269272 query_mock ().get .return_value = [entry_point ]
270273 import_path = "importlib.metadata.entry_points"
271274 else :
You can’t perform that action at this time.
0 commit comments