зеркало из https://github.com/microsoft/torchgeo.git
torchvision 0.10 no longer has a conflict
This commit is contained in:
Родитель
6514a2c2b9
Коммит
79abd392df
|
@ -10,4 +10,4 @@ dependencies:
|
|||
- python
|
||||
- pytorch::pytorch>=1.7
|
||||
- conda-forge::rarfile
|
||||
- pytorch::torchvision>=0.3,!=0.10.0
|
||||
- pytorch::torchvision>=0.3
|
||||
|
|
|
@ -24,4 +24,4 @@ segmentation-models-pytorch
|
|||
setuptools>=42
|
||||
sphinx
|
||||
torch>=1.7
|
||||
torchvision>=0.3,!=0.10.0
|
||||
torchvision>=0.3
|
||||
|
|
|
@ -34,7 +34,7 @@ install_requires =
|
|||
rasterio>=1.0
|
||||
rtree>=0.5.0
|
||||
torch>=1.7
|
||||
torchvision>=0.3,!=0.10.0
|
||||
torchvision>=0.3
|
||||
python_requires = >= 3.6
|
||||
packages = find:
|
||||
|
||||
|
|
|
@ -27,5 +27,5 @@ spack:
|
|||
- "py-setuptools@42:"
|
||||
- py-sphinx
|
||||
- "py-torch@1.7:"
|
||||
- "py-torchvision@0.3:0.9,0.10.1:"
|
||||
- "py-torchvision@0.3:"
|
||||
concretization: together
|
||||
|
|
|
@ -19,10 +19,6 @@ pytest.importorskip("rarfile")
|
|||
pytest.importorskip("pycocotools")
|
||||
|
||||
|
||||
def download_file_from_google_drive(file_id: str, root: str, *args: str) -> None:
|
||||
shutil.copy(file_id, root)
|
||||
|
||||
|
||||
def download_url(url: str, root: str, *args: str) -> None:
|
||||
shutil.copy(url, root)
|
||||
|
||||
|
@ -37,17 +33,12 @@ class TestVHR10:
|
|||
tmp_path: Path,
|
||||
request: SubRequest,
|
||||
) -> VHR10:
|
||||
monkeypatch.setattr( # type: ignore[attr-defined]
|
||||
torchvision.datasets.utils,
|
||||
"download_file_from_google_drive",
|
||||
download_file_from_google_drive,
|
||||
)
|
||||
monkeypatch.setattr( # type: ignore[attr-defined]
|
||||
torchgeo.datasets.nwpu, "download_url", download_url
|
||||
)
|
||||
file_id = os.path.join("tests", "data", "vhr10", "NWPU VHR-10 dataset.rar")
|
||||
url = os.path.join("tests", "data", "vhr10", "NWPU VHR-10 dataset.rar")
|
||||
monkeypatch.setitem( # type: ignore[attr-defined]
|
||||
VHR10.image_meta, "file_id", file_id
|
||||
VHR10.image_meta, "url", url
|
||||
)
|
||||
md5 = "e5c38351bd948479fe35a71136aedbc4"
|
||||
monkeypatch.setitem(VHR10.image_meta, "md5", md5) # type: ignore[attr-defined]
|
||||
|
|
Загрузка…
Ссылка в новой задаче