Skip to content

Commit 7376dcd

Browse files
jgrssgjoseph92Tom Augspurger
authored
fix: Merge latest (#2)
* Support sequence of `Item`s (gjoseph92#164) * Switch to PDM for dependency management (gjoseph92#169) * Add param links to docs (gjoseph92#170) * Automatically hide `pdm.lock` in GitHub diffs (gjoseph92#171) * Fix docs build for visualization functions (gjoseph92#172) * Fix docs build for PDM again (gjoseph92#175) * Remove deprecated `skip_equivalent` pyproj arg (gjoseph92#174) * Release v0.4.3 (gjoseph92#176) * Fixed link to USGS PDF on qa-pixel (gjoseph92#180) Co-authored-by: Gabe Joseph <[email protected]> Co-authored-by: Tom Augspurger <[email protected]>
1 parent 62eff29 commit 7376dcd

19 files changed

+4137
-4742
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Make GitHub treat PDM's lockfile as generated and automatically hide its diff
2+
pdm.lock linguist-generated

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ __pycache__
55
dask-worker-space
66
.ipynb_checkpoints
77
.vscode
8+
.pdm.toml
89
/dist
910

1011
*.DS_Store

.pre-commit-config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
repos:
2+
- repo: local
3+
hooks:
4+
- id: pdm-check
5+
name: pdm check
6+
description: Check that PDM lockfile is up to date
7+
entry: pdm install --check --dry-run
8+
files: "^pyproject.toml$"
9+
language: python
10+
language_version: python3
11+
pass_filenames: false

.readthedocs.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ version: 2
33
sphinx:
44
configuration: docs/conf.py
55

6-
# https://github.com/readthedocs/readthedocs.org/issues/4912#issuecomment-1143587902
76
build:
87
os: ubuntu-20.04
98
tools:
10-
python: '3.8'
9+
python: "3.8"
1110
jobs:
1211
post_install:
13-
- pip install poetry==1.1.13
14-
- poetry config virtualenvs.create false
15-
- poetry install --no-dev -E docs -E viz
12+
# Install PDM in its own isolated environment, so docs deps don't trample its deps
13+
- curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py | python3 -
14+
# TODO how to get `pdm` on the $PATH?
15+
# https://github.com/pdm-project/pdm/discussions/1365#discussioncomment-3581356
16+
# NOTE: pandoc fails in isolation mode
17+
- VIRTUAL_ENV=$(dirname $(dirname $(which python))) $HOME/.local/bin/pdm sync --no-isolation -G viz -dG docs

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 0.4.3 (2022-09-14)
4+
- Support sequences of `Item`s [@gjoseph92](https://github.com/gjoseph92)
5+
- Fix compatibility with `pyproj>=3.4.0` [@gjoseph92](https://github.com/gjoseph92)
6+
- stackstac has switched from Poetry to PDM as its package manager. This does not affect users, only developers.
7+
38
## 0.4.2 (2022-07-06)
49
- Support (and require) rasterio 1.3.0 [@carderne](https://github.com/carderne) [@gjoseph92](https://github.com/gjoseph92)
510
- Fix `ValueError` when passing `dim=` to `mosaic` [@aazuspan](https://github.com/aazuspan)

binder/postBuild

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
21
set -ex
32

4-
poetry config virtualenvs.create false
5-
poetry install -E binder -E viz
3+
VIRTUAL_ENV=$(dirname $(dirname $(which python))) pdm install -G viz -dG binder

binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
poetry
1+
pdm

docs/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
DISTRIBUTION_METADATA = importlib.metadata.metadata("stackstac")
2424

25-
author = DISTRIBUTION_METADATA["Author"]
25+
author = DISTRIBUTION_METADATA["Author-email"].split(" <")[0]
2626
project = DISTRIBUTION_METADATA["Name"]
2727
version = DISTRIBUTION_METADATA["Version"]
2828
copyright = f"{datetime.datetime.now().year}, {author}"
@@ -38,6 +38,7 @@
3838
"sphinx.ext.autosummary",
3939
"sphinx.ext.napoleon",
4040
"sphinx_autodoc_typehints",
41+
"sphinx_paramlinks",
4142
"nbsphinx",
4243
"jupyter_sphinx",
4344
]
@@ -50,6 +51,7 @@
5051
# This pattern also affects html_static_path and html_extra_path.
5152
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
5253

54+
paramlinks_hyperlink_param = 'name'
5355
autosummary_generate = True
5456
napoleon_use_param = True
5557
# set_type_checking_flag = True
@@ -115,7 +117,7 @@
115117
"rasterio": ("https://rasterio.readthedocs.io/en/latest/", None),
116118
"numpy": ("https://numpy.org/doc/stable/", None),
117119
"pystac": ("https://pystac.readthedocs.io/en/latest/", None),
118-
"xarray": ("https://xarray.pydata.org/en/stable/", None),
120+
"xarray": ("https://docs.xarray.dev/en/stable/", None),
119121
"dask": ("https://docs.dask.org/en/latest/", None),
120122
"distributed": ("https://distributed.dask.org/en/latest/", None),
121123
"matplotlib": ("https://matplotlib.org/stable", None),

examples/gif.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259835,7 +259835,7 @@
259835259835
"\n",
259836259836
"Use the bit values of the Landsat-8 QA band to mask out bad pixels. We'll mask pixels labeled as dilated cloud, cirrus, cloud, or cloud shadow. (By \"mask\", we mean just replacing those pixels with NaNs).\n",
259837259837
"\n",
259838-
"See page 14 on [this PDF](https://prd-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/atoms/files/LSDS-1328_Landsat8-9-OLI-TIRS-C2-L2-DFCB-v6.pdf) for the data table describing which bit means what."
259838+
"See page 14 on [this PDF](https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/media/files/LSDS-1619_Landsat-8-9-C2-L2-ScienceProductGuide-v4.pdf) for the data table describing which bit means what."
259839259839
]
259840259840
},
259841259841
{

0 commit comments

Comments
 (0)