Skip to content

Commit 7bd8605

Browse files
authored
Merge branch 'main' into add-headers-stacio-requests
2 parents fa0a50b + 8b2a540 commit 7bd8605

File tree

5 files changed

+50
-32
lines changed

5 files changed

+50
-32
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
experimental:
3232
- false
3333
include:
34-
- python-version: "3.11.0-alpha.7"
34+
- python-version: "3.11.0-rc.2"
3535
os: ubuntu-latest
3636
experimental: true
37-
- python-version: "3.11.0-alpha.7"
37+
- python-version: "3.11.0-rc.2"
3838
os: windows-latest
3939
experimental: true
40-
- python-version: "3.11.0-alpha.7"
40+
- python-version: "3.11.0-rc.2"
4141
os: macos-latest
4242
experimental: true
4343

@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/setup-python@v4
4949
with:
5050
python-version: ${{ matrix.python-version }}
51-
cache: 'pip'
51+
cache: "pip"
5252
cache-dependency-path: requirements-test.txt
5353

5454
- uses: actions-rs/toolchain@v1
@@ -66,7 +66,7 @@ jobs:
6666
pip install --upgrade pip
6767
pip install -r requirements-test.txt
6868
pip install -e ".[validation]"
69-
69+
7070
- name: Execute test suite
7171
run: ./scripts/test
7272
shell: bash
@@ -83,15 +83,15 @@ jobs:
8383
uses: actions/setup-python@v4
8484
with:
8585
python-version: "3.8"
86-
cache: 'pip'
86+
cache: "pip"
8787
cache-dependency-path: requirements-test.txt
88-
88+
8989
- name: Install dependencies
9090
run: |
9191
pip install --upgrade pip
9292
pip install -r requirements-test.txt
9393
pip install -e ".[validation]"
94-
94+
9595
- name: Execute test suite
9696
run: ./scripts/test
9797
env:
@@ -101,14 +101,14 @@ jobs:
101101
# Ignore the configured fail-under to ensure we upload the coverage report. We
102102
# will trigger a failure for coverage drops in a later job
103103
run: coverage xml --fail-under 0
104-
104+
105105
- name: Upload All coverage to Codecov
106106
uses: codecov/codecov-action@v3
107107
if: ${{ env.GITHUB_REPOSITORY }} == 'stac-utils/pystac'
108108
with:
109109
token: ${{ secrets.CODECOV_TOKEN }}
110110
file: ./coverage.xml
111-
fail_ci_if_error: false
111+
fail_ci_if_error: false
112112

113113
- name: Check for coverage drop
114114
# This will use the configured fail-under, causing this job to fail if the
@@ -125,7 +125,7 @@ jobs:
125125
- "3.8"
126126
- "3.9"
127127
- "3.10"
128-
- "3.11.0-alpha.7"
128+
- "3.11.0-rc.2"
129129

130130
steps:
131131
- uses: actions/checkout@v3
@@ -134,9 +134,9 @@ jobs:
134134
uses: actions/setup-python@v4
135135
with:
136136
python-version: ${{ matrix.python-version }}
137-
cache: 'pip'
137+
cache: "pip"
138138
cache-dependency-path: requirements-test.txt
139-
139+
140140
- name: Install dependencies
141141
run: |
142142
pip install --upgrade pip
@@ -147,15 +147,29 @@ jobs:
147147

148148
vanilla:
149149
runs-on: ubuntu-latest
150-
steps:
150+
steps:
151151
- uses: actions/checkout@v3
152-
152+
153153
- uses: actions/setup-python@v4
154154
with:
155155
python-version: "3.8"
156156

157157
- name: Install without orjson
158158
run: pip install '.[validation]'
159-
159+
160160
- name: Run unittests
161161
run: python -m unittest discover tests
162+
163+
check-dev-dependencies:
164+
runs-on: ubuntu-latest
165+
steps:
166+
- uses: actions/checkout@v3
167+
168+
- uses: actions/setup-python@v4
169+
with:
170+
python-version: "3.8"
171+
cache: "pip"
172+
cache-dependency-path: requirements-dev.txt
173+
174+
- name: Install dev dependencies
175+
run: pip install -r requirements-dev.txt

CHANGELOG.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
### Fixed
1414

15+
- Dependency resolution when installing `requirements-dev.txt` ([#897](https://github.com/stac-utils/pystac/pull/897))
16+
1517
## [v1.6.1]
1618

1719
### Fixed
@@ -137,13 +139,14 @@
137139
## [v1.1.0]
138140

139141
### Added
142+
140143
- Include type information during packaging for use with e.g. `mypy` ([#579](https://github.com/stac-utils/pystac/pull/579))
141144
- Optional `dest_href` argument to `Catalog.save` to allow saving `Catalog` instances to
142145
locations other than their `self` href ([#565](https://github.com/stac-utils/pystac/pull/565))
143146

144147
### Changed
145148

146-
- Pin the rustc version in Continuous Integration to work around https://github.com/rust-lang/cargo/pull/9727 ([#581](https://github.com/stac-utils/pystac/pull/581))
149+
- Pin the rustc version in Continuous Integration to work around <https://github.com/rust-lang/cargo/pull/9727> ([#581](https://github.com/stac-utils/pystac/pull/581))
147150

148151
## [v1.0.1]
149152

@@ -195,9 +198,9 @@
195198
### Added
196199

197200
- (Experimental) support for Python 3.10 ([#473](https://github.com/stac-utils/pystac/pull/473))
198-
- `LabelTask` enum in `pystac.extensions.label` with recommended values for
201+
- `LabelTask` enum in `pystac.extensions.label` with recommended values for
199202
`"label:tasks"` field ([#484](https://github.com/stac-utils/pystac/pull/484))
200-
- `LabelMethod` enum in `pystac.extensions.label` with recommended values for
203+
- `LabelMethod` enum in `pystac.extensions.label` with recommended values for
201204
`"label:methods"` field ([#484](https://github.com/stac-utils/pystac/pull/484))
202205
- Label Extension summaries ([#484](https://github.com/stac-utils/pystac/pull/484))
203206
- Timestamps Extension summaries ([#513](https://github.com/stac-utils/pystac/pull/513))
@@ -410,7 +413,6 @@
410413

411414
- Be more strict with CatalogType in `Catalog.save` ([#244](https://github.com/stac-utils/pystac/pull/244))
412415

413-
414416
## [v0.5.3]
415417

416418
### Added
@@ -510,6 +512,7 @@ asset extension renamed to item-assets and renamed assets field in Collections t
510512
## [v0.4.0]
511513

512514
The two major changes for this release are:
515+
513516
- Upgrade to STAC 0.9.0
514517
- Refactor the extensions API to accommodate items that implement multiple extensions (e.g. `eo` and `view`)
515518

@@ -519,7 +522,7 @@ See the [stac-spec 0.9.0 changelog](https://github.com/radiantearth/stac-spec/bl
519522

520523
These are the major API changes that will have to be accounted for when upgrading PySTAC:
521524

522-
#### Extensions are wrappers around Catalogs, Collection and Items, and no longer inherit.
525+
#### Extensions are wrappers around Catalogs, Collection and Items, and no longer inherit
523526

524527
This change affects the two extensions that were implemented for Item - `EOItem` and `LabelItem`
525528
have become `EOItemExt` and `LabelItemExt`, and no longer inherit from Item.
@@ -531,7 +534,8 @@ be able to account well for these new items that implemented both the `eo` and `
531534
See the [Extensions section](https://pystac.readthedocs.io/en/0.4/concepts.html#extensions) in the
532535
documentation for more information on the new way to use extensions.
533536

534-
#### Extensions have moved to their own package:
537+
#### Extensions have moved to their own package
538+
535539
- `pystac.label` -> `pystac.extensions.label`
536540
- `pystac.eo` -> `pystac.extensions.eo`
537541
- `pystac.single_file_stac` -> `pystac.extensions.single_file_stac`
@@ -544,6 +548,7 @@ documentation for more information on the new way to use extensions.
544548
- Added support for the [commons](https://github.com/radiantearth/stac-spec/tree/v0.9.0/extensions/commons) extension.
545549

546550
### Changed
551+
547552
- Migrated CI workflows from Travis CI to GitHub Actions [#108](https://github.com/azavea/pystac/pull/108)
548553
- Dropped support for Python 3.5 [#108](https://github.com/azavea/pystac/pull/108)
549554

@@ -554,7 +559,6 @@ documentation for more information on the new way to use extensions.
554559
- The `Band` constructor in the EO extension changed to taking a dict. To create a band from property values,
555560
use `Band.create`
556561

557-
558562
## [v0.3.4] - 2020-06-20
559563

560564
### Changed

requirements-docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ipython==8.4.0
1+
ipython==8.5.0
22
Sphinx==4.5.0
33
sphinxcontrib-fulltoc==1.2.0
44
nbsphinx==0.8.9

requirements-test.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
mypy==0.971
1+
mypy==0.982
22
flake8==5.0.4
3-
black==22.6.0
3+
black==22.10.0
44

5-
codespell==2.1.0
5+
codespell==2.2.1
66

7-
jsonschema==4.14.0
7+
jsonschema==4.16.0
88
coverage==6.5.0
9-
doc8==1.0.0
9+
doc8==0.11.2
1010

1111
types-python-dateutil==2.8.19
1212
types-orjson==3.6.2
1313

1414
pre-commit==2.20.0
1515

1616
# optional dependencies
17-
orjson==3.7.11
17+
orjson==3.8.0

tests/extensions/test_sar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_stac_extensions(self) -> None:
4141
self.assertTrue(SarExtension.has_extension(self.item))
4242

4343
def test_required(self) -> None:
44-
mode: str = "Nonesense mode"
44+
mode: str = "Nonsense mode"
4545
frequency_band: sar.FrequencyBand = sar.FrequencyBand.P
4646
polarizations: List[sar.Polarization] = [
4747
sar.Polarization.HV,
@@ -140,7 +140,7 @@ def test_all(self) -> None:
140140
self.item.validate()
141141

142142
def test_polarization_must_be_list(self) -> None:
143-
mode: str = "Nonesense mode"
143+
mode: str = "Nonsense mode"
144144
frequency_band: sar.FrequencyBand = sar.FrequencyBand.P
145145
# Skip type hint as we are passing in an incorrect polarization.
146146
polarizations = sar.Polarization.HV

0 commit comments

Comments
 (0)