Merge branch 'main' into proj-v2

stac-utils · Dec 11, 2023 · af05d17 · af05d17
2 parents 839dadd + 0e6a8e6
commit af05d17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
@@ -109,7 +109,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -125,7 +125,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -143,7 +143,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
@@ -158,7 +158,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"
@@ -173,7 +173,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
           cache: "pip"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 

diff --git a/docs/concepts.rst b/docs/concepts.rst
@@ -303,6 +303,7 @@ for reading from AWS's S3 cloud object storage using `boto3
    import boto3
    from pystac import Link
    from pystac.stac_io import DefaultStacIO, StacIO
+   from typing import Union, Any
 
    class CustomStacIO(DefaultStacIO):
       def __init__(self):
@@ -345,6 +346,7 @@ to take advantage of connection pooling using a `requests.Session
    from urllib.parse import urlparse
    import requests
    from pystac.stac_io import DefaultStacIO, StacIO
+   from typing import Union, Any
 
    class ConnectionPoolingIO(DefaultStacIO):
       def __init__(self):

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,7 @@ test = [
     "pytest-recording~=0.13.0",
     "pytest~=7.3",
     "requests-mock~=1.11",
-    "ruff==0.1.6",
+    "ruff==0.1.7",
     "types-html5lib~=1.1",
     "types-orjson~=3.6",
     "types-jsonschema~=4.18",