Merge branch 'main' into deps/upper

.github/workflows/release.yaml

@@ -14,7 +14,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -37,7 +37,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -60,7 +60,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies

.github/workflows/style.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -39,7 +39,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -62,7 +62,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -85,7 +85,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -108,7 +108,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies
@@ -45,7 +45,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache dependencies
@@ -88,7 +88,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.9'
     - name: Cache dependencies

.github/workflows/tutorials.yaml

@@ -18,7 +18,7 @@ jobs:
     - name: Clone repo
       uses: actions/checkout@v3.5.3
     - name: Set up python
-      uses: actions/setup-python@v4.6.1
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: '3.11'
     - name: Cache dependencies

environment.yml

@@ -9,7 +9,7 @@ dependencies:
   - matplotlib>=3.3.3
   - numpy>=1.19.3
   - pip
-  - pycocotools>=2.0.4
+  - pycocotools>=2.0.5
   - pyproj>=3
   - python>=3.9
   - pytorch>=1.12

experiments/ssl4eo/landsat/band_data.csv

@@ -1,23 +1,23 @@
 Satellite,Sensor,Band,Wavelength Start (μm),Wavelength Width,Color,Resolution (m)
 
-Landsat 1--2,RBV,1,0.475,0.1,#1f77b4,80
-Landsat 1--2,RBV,2,0.58,0.1,#2ca02c,80
-Landsat 1--2,RBV,3,0.69,0.14,#d62728,80
+Landsats 1--2,RBV,1,0.475,0.1,#1f77b4,80
+Landsats 1--2,RBV,2,0.58,0.1,#2ca02c,80
+Landsats 1--2,RBV,3,0.69,0.14,#d62728,80
 
 Landsat 3,RBV,1,0.505,0.245,#bcbd22,40
 
-Landsat 1--5,MSS,1,0.5,0.1,#2ca02c,80
-Landsat 1--5,MSS,2,0.6,0.1,#d62728,80
-Landsat 1--5,MSS,3,0.7,0.1,#e377c2,80
-Landsat 1--5,MSS,4,0.8,0.3,#ff7f0e,80
+Landsats 1--5,MSS,1,0.5,0.1,#2ca02c,80
+Landsats 1--5,MSS,2,0.6,0.1,#d62728,80
+Landsats 1--5,MSS,3,0.7,0.1,#e377c2,80
+Landsats 1--5,MSS,4,0.8,0.3,#ff7f0e,80
 
-Landsat 4--5,TM,1,0.45,0.07,#1f77b4,30
-Landsat 4--5,TM,2,0.52,0.08,#2ca02c,30
-Landsat 4--5,TM,3,0.63,0.06,#d62728,30
-Landsat 4--5,TM,4,0.76,0.14,#e377c2,30
-Landsat 4--5,TM,5,1.55,0.2,#ff7f0e,30
-Landsat 4--5,TM,6,10.4,2.1,#8c564b,120
-Landsat 4--5,TM,7,2.08,0.27,#7f7f7f,30
+Landsats 4--5,TM,1,0.45,0.07,#1f77b4,30
+Landsats 4--5,TM,2,0.52,0.08,#2ca02c,30
+Landsats 4--5,TM,3,0.63,0.06,#d62728,30
+Landsats 4--5,TM,4,0.76,0.14,#e377c2,30
+Landsats 4--5,TM,5,1.55,0.2,#ff7f0e,30
+Landsats 4--5,TM,6,10.4,2.1,#8c564b,120
+Landsats 4--5,TM,7,2.08,0.27,#7f7f7f,30
 
 Landsat 6,ETM,1,0.45,0.07,#1f77b4,30
 Landsat 6,ETM,2,0.52,0.08,#2ca02c,30
@@ -37,14 +37,14 @@ Landsat 7,ETM+,6,10.4,2.1,#8c564b,60
 Landsat 7,ETM+,7,2.08,0.27,#7f7f7f,30
 Landsat 7,ETM+,8,0.52,0.38,#bcbd22,15
 
-Landsat 8--9,OLI/TIRS,1,0.43,0.02,#17becf,30
-Landsat 8--9,OLI/TIRS,2,0.45,0.06,#1f77b4,30
-Landsat 8--9,OLI/TIRS,3,0.53,0.06,#2ca02c,30
-Landsat 8--9,OLI/TIRS,4,0.64,0.03,#d62728,30
-Landsat 8--9,OLI/TIRS,5,0.85,0.03,#e377c2,30
-Landsat 8--9,OLI/TIRS,6,1.57,0.08,#ff7f0e,30
-Landsat 8--9,OLI/TIRS,7,2.11,0.18,#7f7f7f,30
-Landsat 8--9,OLI/TIRS,8,0.5,0.18,#bcbd22,15
-Landsat 8--9,OLI/TIRS,9,1.36,0.02,#9467bd,30
-Landsat 8--9,OLI/TIRS,10,10.6,0.59,#8c564b,100
-Landsat 8--9,OLI/TIRS,11,11.5,1.01,#8c564b,100
+Landsats 8--9,OLI/TIRS,1,0.43,0.02,#17becf,30
+Landsats 8--9,OLI/TIRS,2,0.45,0.06,#1f77b4,30
+Landsats 8--9,OLI/TIRS,3,0.53,0.06,#2ca02c,30
+Landsats 8--9,OLI/TIRS,4,0.64,0.03,#d62728,30
+Landsats 8--9,OLI/TIRS,5,0.85,0.03,#e377c2,30
+Landsats 8--9,OLI/TIRS,6,1.57,0.08,#ff7f0e,30
+Landsats 8--9,OLI/TIRS,7,2.11,0.18,#7f7f7f,30
+Landsats 8--9,OLI/TIRS,8,0.5,0.18,#bcbd22,15
+Landsats 8--9,OLI/TIRS,9,1.36,0.02,#9467bd,30
+Landsats 8--9,OLI/TIRS,10,10.6,0.59,#8c564b,100
+Landsats 8--9,OLI/TIRS,11,11.5,1.01,#8c564b,100

pyproject.toml

@@ -84,8 +84,8 @@ datasets = [
     "opencv-python>=4.4.0.46",
     # pandas 1.1.3+ required for Python 3.9 wheels
     "pandas>=1.1.3",
-    # pycocotools 2.0.4+ required to avoid use of deprecated setuptools fetch_build_eggs
-    "pycocotools>=2.0.4",
+    # pycocotools 2.0.5+ required for cython 3+ support
+    "pycocotools>=2.0.5",
     # pyvista 0.29+ required for to avoid segfault during testing
     "pyvista>=0.29",
     # radiant-mlhub 0.3+ required for newer tqdm support required by lightning

requirements/datasets.txt

@@ -4,7 +4,7 @@ laspy==2.4.1
 opencv-python==4.8.0.74
 pandas==2.0.3
 pycocotools==2.0.6
-pyvista==0.40.1
+pyvista==0.40.2
 radiant-mlhub==0.4.1
 rarfile==4.0
 scikit-image==0.21.0

requirements/min-reqs.old

@@ -25,7 +25,7 @@ h5py==3.0.0
 laspy==2.0.0
 opencv-python==4.4.0.46
 pandas==1.1.3
-pycocotools==2.0.4
+pycocotools==2.0.5
 pyvista==0.29.0
 radiant-mlhub==0.3.0
 rarfile==4.0

requirements/required.txt

@@ -5,7 +5,7 @@ setuptools==68.0.0
 einops==0.6.1
 fiona==1.9.4.post1
 kornia==0.6.12
-lightly==1.4.12
+lightly==1.4.13
 lightning==2.0.5
 matplotlib==3.7.2
 numpy==1.25.1

torchgeo/datasets/usavars.py

@@ -48,45 +48,34 @@ class USAVars(NonGeoDataset):
     .. versionadded:: 0.3
     """
 
-    url_prefix = (
-        "https://files.codeocean.com/files/verified/"
-        + "fa908bbc-11f9-4421-8bd3-72a4bf00427f_v2.0/data/int/applications"
-    )
-    pop_csv_suffix = "CONTUS_16_640_POP_100000_0.csv?download"
-    uar_csv_suffix = "CONTUS_16_640_UAR_100000_0.csv?download"
-
-    data_url = "https://mosaiks.blob.core.windows.net/datasets/uar.zip"
+    data_url = "https://huggingface.co/datasets/torchgeo/usavars/resolve/main/{}"
     dirname = "uar"
 
     md5 = "677e89fd20e5dd0fe4d29b61827c2456"
 
     label_urls = {
-        "housing": f"{url_prefix}/housing/outcomes_sampled_housing_{pop_csv_suffix}",
-        "income": f"{url_prefix}/income/outcomes_sampled_income_{pop_csv_suffix}",
-        "roads": f"{url_prefix}/roads/outcomes_sampled_roads_{pop_csv_suffix}",
-        "nightlights": f"{url_prefix}/nightlights/"
-        + f"outcomes_sampled_nightlights_{pop_csv_suffix}",
-        "population": f"{url_prefix}/population/"
-        + f"outcomes_sampled_population_{uar_csv_suffix}",
-        "elevation": f"{url_prefix}/elevation/"
-        + f"outcomes_sampled_elevation_{uar_csv_suffix}",
-        "treecover": f"{url_prefix}/treecover/"
-        + f"outcomes_sampled_treecover_{uar_csv_suffix}",
+        "housing": data_url.format("housing.csv"),
+        "income": data_url.format("income.csv"),
+        "roads": data_url.format("roads.csv"),
+        "nightlights": data_url.format("nightlights.csv"),
+        "population": data_url.format("population.csv"),
+        "elevation": data_url.format("elevation.csv"),
+        "treecover": data_url.format("treecover.csv"),
     }
 
     split_metadata = {
         "train": {
-            "url": "https://mosaiks.blob.core.windows.net/datasets/train_split.txt",
+            "url": data_url.format("train_split.txt"),
             "filename": "train_split.txt",
             "md5": "3f58fffbf5fe177611112550297200e7",
         },
         "val": {
-            "url": "https://mosaiks.blob.core.windows.net/datasets/val_split.txt",
+            "url": data_url.format("val_split.txt"),
             "filename": "val_split.txt",
             "md5": "bca7183b132b919dec0fc24fb11662a0",
         },
         "test": {
-            "url": "https://mosaiks.blob.core.windows.net/datasets/test_split.txt",
+            "url": data_url.format("test_split.txt"),
             "filename": "test_split.txt",
             "md5": "97bb36bc003ae0bf556a8d6e8f77141a",
         },