MonkeyPatch exposed in public API in newer pytest (#1333)

* MonkeyPatch exposed in public API in newer pytest

* Fix import order

environment.yml

@@ -36,7 +36,7 @@ dependencies:
     - pandas>=1.1.3
     - pillow>=8
     - pydocstyle[toml]>=6.1
-    - pytest>=6.1.2
+    - pytest>=6.2
     - pytest-cov>=2.4
     - git+https://github.com/pytorch/pytorch_sphinx_theme
     - pyupgrade>=2.8

requirements/min-reqs.old

@@ -50,7 +50,7 @@ hydra-core==1.0.0
 mypy==0.900
 nbmake==1.3.3
 omegaconf==2.0.1
-pytest==6.1.2
+pytest==6.2.0
 pytest-cov==2.4.0
 tensorboard==2.9.1
 

setup.cfg

@@ -125,8 +125,8 @@ tests =
     nbmake>=1.3.3,<2
     # omegaconf 2+ required by lightning, 2.0.1+ required by hydra-core
     omegaconf>=2.0.1,<3
-    # pytest 6.1.2+ required by nbmake
-    pytest>=6.1.2,<8
+    # pytest 6.2+ required for pytest.MonkeyPatch
+    pytest>=6.2,<8
     # pytest-cov 2.4+ required for pytest --cov flags
     pytest-cov>=2.4,<5
     # tensorboard 2.9.1+ required by lightning

tests/datasets/test_advance.py

@@ -11,7 +11,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import ADVANCE

tests/datasets/test_agb_live_woody_density.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo

tests/datasets/test_benin_cashews.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 from torchgeo.datasets import BeninSmallHolderCashews

tests/datasets/test_bigearthnet.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import BigEarthNet

tests/datasets/test_cbf.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_cdl.py

@@ -11,7 +11,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_chesapeake.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_cloud_cover.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import CloudCoverDetection
 

tests/datasets/test_cms_mangrove_canopy.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 from torchgeo.datasets import CMSGlobalMangroveCanopy, IntersectionDataset, UnionDataset

tests/datasets/test_cowc.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_cv4a_kenya_crop_type.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 from torchgeo.datasets import CV4AKenyaCropType

tests/datasets/test_cyclone.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 from torchgeo.datasets import TropicalCyclone

tests/datasets/test_deepglobelandcover.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import DeepGlobeLandCover
 

tests/datasets/test_dfc2022.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import DFC2022
 

tests/datasets/test_eddmaps.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import BoundingBox, EDDMapS, IntersectionDataset, UnionDataset
 

tests/datasets/test_enviroatlas.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_esri2020.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_etci2021.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import ETCI2021

tests/datasets/test_eudem.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 from torchgeo.datasets import EUDEM, BoundingBox, IntersectionDataset, UnionDataset

tests/datasets/test_eurosat.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_fair1m.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import FAIR1M

tests/datasets/test_fire_risk.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import FireRisk

tests/datasets/test_forestdamage.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import ForestDamage

tests/datasets/test_gbif.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import GBIF, BoundingBox, IntersectionDataset, UnionDataset
 

tests/datasets/test_gid15.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import GID15

tests/datasets/test_globbiomass.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 from torchgeo.datasets import (

tests/datasets/test_idtrees.py

@@ -13,7 +13,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import IDTReeS

tests/datasets/test_inaturalist.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import (
     BoundingBox,

tests/datasets/test_inria.py

@@ -9,7 +9,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import InriaAerialImageLabeling
 

tests/datasets/test_l7irish.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_l8biome.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_landcoverai.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_landsat.py

@@ -9,7 +9,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 from torchgeo.datasets import BoundingBox, IntersectionDataset, Landsat8, UnionDataset

tests/datasets/test_levircd.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import LEVIRCDPlus

tests/datasets/test_loveda.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import LoveDA

tests/datasets/test_nasa_marine_debris.py

@@ -10,7 +10,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import NASAMarineDebris
 

tests/datasets/test_nlcd.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_openbuildings.py

@@ -13,7 +13,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 from torchgeo.datasets import (

tests/datasets/test_oscd.py

@@ -10,8 +10,8 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from matplotlib import pyplot as plt
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_patternnet.py

@@ -9,7 +9,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import PatternNet

tests/datasets/test_potsdam.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import Potsdam2D
 

tests/datasets/test_reforestree.py

@@ -11,7 +11,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import ReforesTree

tests/datasets/test_resisc45.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import RESISC45

tests/datasets/test_seco.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_sen12ms.py

@@ -9,7 +9,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 from torchgeo.datasets import SEN12MS

tests/datasets/test_skippd.py

@@ -12,7 +12,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import SKIPPD

tests/datasets/test_so2sat.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import So2Sat
 

tests/datasets/test_spacenet.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import (
     SpaceNet1,

tests/datasets/test_ssl4eo.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 from torchgeo.datasets import SSL4EOS12

tests/datasets/test_sustainbench_crop_yield.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import SustainBenchCropYield

tests/datasets/test_ucmerced.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_usavars.py

@@ -11,8 +11,8 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from matplotlib import pyplot as plt
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_utils.py

@@ -16,7 +16,7 @@ from typing import Any
 import numpy as np
 import pytest
 import torch
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from rasterio.crs import CRS
 
 import torchgeo.datasets.utils

tests/datasets/test_vaihingen.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import Vaihingen2D
 

tests/datasets/test_vhr10.py

@@ -12,7 +12,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torch.utils.data import ConcatDataset
 
 import torchgeo.datasets.utils

tests/datasets/test_western_usa_live_fuel_moisture.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import WesternUSALiveFuelMoisture
 

tests/datasets/test_xview2.py

@@ -10,7 +10,7 @@ import pytest
 import torch
 import torch.nn as nn
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 from torchgeo.datasets import XView2
 

tests/datasets/test_zuericrop.py

@@ -11,7 +11,7 @@ import matplotlib.pyplot as plt
 import pytest
 import torch
 import torch.nn as nn
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 import torchgeo.datasets.utils
 from torchgeo.datasets import ZueriCrop

tests/models/test_resnet.py

@@ -9,7 +9,7 @@ import timm
 import torch
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torchvision.models._api import WeightsEnum
 
 from torchgeo.models import ResNet18_Weights, ResNet50_Weights, resnet18, resnet50

tests/models/test_vit.py

@@ -9,7 +9,7 @@ import timm
 import torch
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from torchvision.models._api import WeightsEnum
 
 from torchgeo.models import ViTSmall16_Weights, vit_small_patch16_224

tests/trainers/test_byol.py

@@ -11,10 +11,10 @@ import torch
 import torch.nn as nn
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torchvision.models import resnet18
 from torchvision.models._api import WeightsEnum
 

tests/trainers/test_classification.py

@@ -11,10 +11,10 @@ import torch
 import torch.nn as nn
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn.modules import Module
 from torchvision.models._api import WeightsEnum
 

tests/trainers/test_detection.py

@@ -8,10 +8,10 @@ import pytest
 import torch
 import torch.nn as nn
 import torchvision.models.detection
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn.modules import Module
 
 from torchgeo.datamodules import MisconfigurationException, NASAMarineDebrisDataModule

tests/trainers/test_moco.py

@@ -10,10 +10,10 @@ import timm
 import torch
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn import Module
 from torchvision.models._api import WeightsEnum
 

tests/trainers/test_regression.py

@@ -12,10 +12,10 @@ import torch
 import torch.nn as nn
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn.modules import Module
 from torchvision.models._api import WeightsEnum
 

tests/trainers/test_segmentation.py

@@ -12,10 +12,10 @@ import torch
 import torch.nn as nn
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn.modules import Module
 from torchvision.models._api import WeightsEnum
 

tests/trainers/test_simclr.py

@@ -10,10 +10,10 @@ import timm
 import torch
 import torchvision
 from _pytest.fixtures import SubRequest
-from _pytest.monkeypatch import MonkeyPatch
 from hydra.utils import instantiate
 from lightning.pytorch import Trainer
 from omegaconf import OmegaConf
+from pytest import MonkeyPatch
 from torch.nn import Module
 from torchvision.models._api import WeightsEnum