Skip to content

Commit af05d17

Browse files
committed
Merge branch 'main' into proj-v2
2 parents 839dadd + 0e6a8e6 commit af05d17

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v4
3939

4040
- name: Set up Python ${{ matrix.python-version }}
41-
uses: actions/setup-python@v4
41+
uses: actions/setup-python@v5
4242
with:
4343
python-version: ${{ matrix.python-version }}
4444
cache: "pip"
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v4
6060

6161
- name: Set up Python 3.9
62-
uses: actions/setup-python@v4
62+
uses: actions/setup-python@v5
6363
with:
6464
python-version: "3.9"
6565
cache: "pip"
@@ -109,7 +109,7 @@ jobs:
109109
- uses: actions/checkout@v4
110110

111111
- name: Set up Python ${{ matrix.python-version }}
112-
uses: actions/setup-python@v4
112+
uses: actions/setup-python@v5
113113
with:
114114
python-version: ${{ matrix.python-version }}
115115
cache: "pip"
@@ -125,7 +125,7 @@ jobs:
125125
steps:
126126
- uses: actions/checkout@v4
127127

128-
- uses: actions/setup-python@v4
128+
- uses: actions/setup-python@v5
129129
with:
130130
python-version: "3.9"
131131

@@ -143,7 +143,7 @@ jobs:
143143
steps:
144144
- uses: actions/checkout@v4
145145

146-
- uses: actions/setup-python@v4
146+
- uses: actions/setup-python@v5
147147
with:
148148
python-version: "3.9"
149149
cache: "pip"
@@ -158,7 +158,7 @@ jobs:
158158
runs-on: ubuntu-latest
159159
steps:
160160
- uses: actions/checkout@v4
161-
- uses: actions/setup-python@v4
161+
- uses: actions/setup-python@v5
162162
with:
163163
python-version: "3.9"
164164
cache: "pip"
@@ -173,7 +173,7 @@ jobs:
173173
runs-on: ubuntu-latest
174174
steps:
175175
- uses: actions/checkout@v4
176-
- uses: actions/setup-python@v4
176+
- uses: actions/setup-python@v5
177177
with:
178178
python-version: "3.9"
179179
cache: "pip"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

1616
- name: Set up Python 3.x
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.x"
2020

docs/concepts.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ for reading from AWS's S3 cloud object storage using `boto3
303303
import boto3
304304
from pystac import Link
305305
from pystac.stac_io import DefaultStacIO, StacIO
306+
from typing import Union, Any
306307
307308
class CustomStacIO(DefaultStacIO):
308309
def __init__(self):
@@ -345,6 +346,7 @@ to take advantage of connection pooling using a `requests.Session
345346
from urllib.parse import urlparse
346347
import requests
347348
from pystac.stac_io import DefaultStacIO, StacIO
349+
from typing import Union, Any
348350
349351
class ConnectionPoolingIO(DefaultStacIO):
350352
def __init__(self):

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test = [
5757
"pytest-recording~=0.13.0",
5858
"pytest~=7.3",
5959
"requests-mock~=1.11",
60-
"ruff==0.1.6",
60+
"ruff==0.1.7",
6161
"types-html5lib~=1.1",
6262
"types-orjson~=3.6",
6363
"types-jsonschema~=4.18",

0 commit comments

Comments
 (0)