Merge branch 'main' into oodxbd

microsoft · Feb 1, 2025 · dc97c66 · dc97c66
2 parents a23344e + 8072f2b
commit dc97c66
Show file tree

Hide file tree

Showing 1,065 changed files with 21,358 additions and 8,019 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,4 +1,6 @@
-# Double quote -> single quote
+# Prettier: double quote -> single quote
+6a5aaf4b93507072d40dcd78114893362c4eaf6e
+# Ruff: double quote -> single quote
 b09122f3e4a9cb422f6747bf33eca02993f67549
 # Prettier
 bd9c75798eede1a4b7d7ecd6203179d3cb5e54dd

diff --git a/.codecov.yml → .github/codecov.yml b/.codecov.yml → .github/codecov.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,35 +1,36 @@
 # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 version: 2
 updates:
-  - package-ecosystem: "devcontainers"
-    directory: "/.devcontainer"
+  - package-ecosystem: 'devcontainers'
+    directory: '/.devcontainer'
     schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      interval: 'weekly'
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     schedule:
-      interval: "weekly"
-  - package-ecosystem: "pip"
-    directory: "/requirements"
+      interval: 'weekly'
+  - package-ecosystem: 'pip'
+    directory: '/requirements'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     groups:
       # torchvision pins torch, must update in unison
       torch:
         patterns:
-          - "torch"
-          - "torchvision"
+          - 'torch'
+          - 'torchvision'
     ignore:
       # setuptools releases new versions almost daily
-      - dependency-name: "setuptools"
-        update-types: ["version-update:semver-patch"]
+      - dependency-name: 'setuptools'
+        update-types: ['version-update:semver-patch']
       # sphinx 6 is incompatible with pytorch-sphinx-theme
       # https://github.com/pytorch/pytorch_sphinx_theme/issues/175
-      - dependency-name: "sphinx"
-        versions: ">=6"
+      - dependency-name: 'sphinx'
+        versions: '>=6'
       # segmentation-models-pytorch pins timm, must update in unison
-      - dependency-name: "timm"
-  - package-ecosystem: "npm"
-    directory: "/requirements"
+      - dependency-name: 'timm'
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "weekly"
+      interval: 'weekly'
+    versioning-strategy: 'lockfile-only'
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,48 +1,48 @@
 # TorchGeo modules
 datamodules:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/datamodules/**"
+      - any-glob-to-any-file: 'torchgeo/datamodules/**'
 datasets:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/datasets/**"
+      - any-glob-to-any-file: 'torchgeo/datasets/**'
 losses:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/losses/**"
+      - any-glob-to-any-file: 'torchgeo/losses/**'
 models:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/models/**"
+      - any-glob-to-any-file: 'torchgeo/models/**'
 samplers:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/samplers/**"
+      - any-glob-to-any-file: 'torchgeo/samplers/**'
 trainers:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/trainers/**"
+      - any-glob-to-any-file: 'torchgeo/trainers/**'
 transforms:
   - changed-files:
-      - any-glob-to-any-file: "torchgeo/transforms/**"
+      - any-glob-to-any-file: 'torchgeo/transforms/**'
 
 # Other
 dependencies:
   - changed-files:
       - any-glob-to-any-file:
-          - "pyproject.toml"
-          - "requirements/**"
-          - ".github/dependabot.yml"
+          - 'pyproject.toml'
+          - 'requirements/**'
+          - '.github/dependabot.yml'
 documentation:
   - changed-files:
       - any-glob-to-any-file:
-          - "docs/**"
-          - "*.md"
-          - ".github/*.md"
-          - ".readthedocs.yaml"
+          - 'docs/**'
+          - '*.md'
+          - '.github/*.md'
+          - '.readthedocs.yaml'
 scripts:
   - changed-files:
       - any-glob-to-any-file:
-          - "torchgeo/__main__.py"
-          - "torchgeo/main.py"
-          - "experiments/**"
+          - 'torchgeo/__main__.py'
+          - 'torchgeo/main.py'
+          - 'experiments/**'
 testing:
   - changed-files:
       - any-glob-to-any-file:
-          - "tests/**"
-          - ".github/workflows/**"
+          - 'tests/**'
+          - '.github/workflows/**'
diff --git a/.github/release.yml b/.github/release.yml
@@ -1,7 +1,7 @@
 changelog:
   exclude:
     authors:
-      - dependabot[bot]
+      - app/dependabot
   categories:
     - title: Backwards-incompatible changes
       labels:

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -0,0 +1,45 @@
+name: deploy
+on:
+  release:
+    types:
+      - published
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repo
+        uses: actions/[email protected]
+      - name: Set up python
+        uses: actions/[email protected]
+        with:
+          python-version: '3.12'
+      - name: Install pip dependencies
+        run: pip install build
+      - name: List pip dependencies
+        run: pip list
+      - name: Build project
+        run: python3 -m build
+      - name: Upload artifacts
+        uses: actions/[email protected]
+        with:
+          name: pypi-dist
+          path: dist/
+  pypi:
+    name: pypi
+    needs:
+      - build
+    environment:
+      name: pypi
+      url: https://pypi.org/p/torchgeo
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/[email protected]
+        with:
+          name: pypi-dist
+          path: dist/
+      - name: Publish to PyPI
+        uses: pypa/[email protected]
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -1,4 +1,4 @@
-name: "labeler"
+name: 'labeler'
 on:
   - pull_request_target
 jobs:
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Add label
         uses: actions/[email protected]
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,23 +6,27 @@ on:
   pull_request:
     branches:
       - release**
+defaults:
+  run:
+    shell: bash
 jobs:
   integration:
     name: integration
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Set up python
-        uses: actions/[email protected]
+        id: setup-python
+        uses: actions/[email protected]
         with:
-          python-version: "3.12"
+          python-version: '3.12'
       - name: Cache dependencies
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.2.0
         id: cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-integration
+          key: ${{ runner.os }}-${{ runner.arch }}-Python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('pyproject.toml') }}
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -40,21 +44,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Set up python
-        uses: actions/[email protected]
+        id: setup-python
+        uses: actions/[email protected]
         with:
-          python-version: "3.12"
+          python-version: '3.12'
       - name: Cache dependencies
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.2.0
         id: cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-tutorials
+          key: ${{ runner.os }}-${{ runner.arch }}-Python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('pyproject.toml') }}-tutorials
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          pip install .[docs,tests] planetary_computer pystac
+          pip install .[docs,tests] planetary_computer pystac tensorboard
           pip cache purge
       - name: List pip dependencies
         run: pip list

diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -8,23 +8,27 @@ on:
     branches:
       - main
       - release**
+defaults:
+  run:
+    shell: bash
 jobs:
   mypy:
     name: mypy
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Set up python
-        uses: actions/[email protected]
+        id: setup-python
+        uses: actions/[email protected]
         with:
-          python-version: "3.12"
+          python-version: '3.12'
       - name: Cache dependencies
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.2.0
         id: cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/required.txt') }}-${{ hashFiles('requirements/datasets.txt') }}-${{ hashFiles('requirements/style.txt') }}-${{ hashFiles('requirements/tests.txt') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-Python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('requirements/required.txt', 'requirements/datasets.txt', 'requirements/style.txt', 'requirements/tests.txt') }}
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -39,17 +43,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Set up python
-        uses: actions/[email protected]
+        id: setup-python
+        uses: actions/[email protected]
         with:
-          python-version: "3.12"
+          python-version: '3.12'
       - name: Cache dependencies
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.2.0
         id: cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-Python-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('requirements/style.txt') }}
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -66,21 +71,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.2.2
       - name: Set up nodejs
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
-          node-version: "20"
-          cache: "npm"
-          cache-dependency-path: "requirements/package-lock.json"
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: 'package-lock.json'
       - name: Installing prettier
         run: |
-          npm install requirements/
+          npm install
           npm cache clean --force
       - name: List npm dependencies
         run: npm ls --all
       - name: Run prettier formatting
-        run: npx prettier . --check
+        run: npx prettier --check .
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}
   cancel-in-progress: true