Skip to content

Commit

Permalink
Bump test dep versions
Browse files Browse the repository at this point in the history
  • Loading branch information
adamjstewart committed Jun 17, 2022
1 parent 80c7d67 commit b90a6cb
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 11 deletions.
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dependencies:
- pip:
- black[jupyter]>=21.8
- flake8>=3.8
- ipywidgets>=7
- isort[colors]>=5.8
- kornia>=0.6.4
- laspy>=2
Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_advance.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def mocked_import(name: str, *args: Any, **kwargs: Any) -> Any:
monkeypatch.setattr(builtins, "__import__", mocked_import)

def test_getitem(self, dataset: ADVANCE) -> None:
pytest.importorskip("scipy", minversion="0.9.0")
pytest.importorskip("scipy", minversion="1.2")
x = dataset[0]
assert isinstance(x, dict)
assert isinstance(x["image"], torch.Tensor)
Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_idtrees.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import torchgeo.datasets.utils
from torchgeo.datasets import IDTReeS

pytest.importorskip("pandas", minversion="0.19.1")
pytest.importorskip("pandas", minversion="0.23.2")
pytest.importorskip("laspy", minversion="2")


Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_openbuildings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
UnionDataset,
)

pytest.importorskip("pandas", minversion="0.19.1")
pytest.importorskip("pandas", minversion="0.23.2")


class TestOpenBuildings:
Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_so2sat.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from torchgeo.datasets import So2Sat

pytest.importorskip("h5py")
pytest.importorskip("h5py", minversion="2.6")


class TestSo2Sat:
Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_usavars.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import torchgeo.datasets.utils
from torchgeo.datasets import USAVars

pytest.importorskip("pandas", minversion="0.19.1")
pytest.importorskip("pandas", minversion="0.23.2")


def download_url(url: str, root: str, *args: str, **kwargs: str) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tests/datasets/test_zuericrop.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import torchgeo.datasets.utils
from torchgeo.datasets import ZueriCrop

pytest.importorskip("h5py")
pytest.importorskip("h5py", minversion="2.6")


def download_url(url: str, root: str, *args: str, **kwargs: str) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tests/trainers/test_classification.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_trainer(
self, monkeypatch: MonkeyPatch, name: str, classname: Type[LightningDataModule]
) -> None:
if name.startswith("so2sat"):
pytest.importorskip("h5py")
pytest.importorskip("h5py", minversion="2.6")

conf = OmegaConf.load(os.path.join("tests", "conf", name + ".yaml"))
conf_dict = OmegaConf.to_object(conf.experiment)
Expand Down
3 changes: 0 additions & 3 deletions tests/transforms/test_transforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

from torchgeo.transforms import indices, transforms

# Tests require newer version of Kornia for newer bounding box behavior
pytest.importorskip("kornia", minversion="0.6.3")


@pytest.fixture
def batch_gray() -> Dict[str, Tensor]:
Expand Down

0 comments on commit b90a6cb

Please sign in to comment.