Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest #2

Merged
merged 9 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Make GitHub treat PDM's lockfile as generated and automatically hide its diff
pdm.lock linguist-generated
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ __pycache__
dask-worker-space
.ipynb_checkpoints
.vscode
.pdm.toml
/dist

*.DS_Store
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
repos:
- repo: local
hooks:
- id: pdm-check
name: pdm check
description: Check that PDM lockfile is up to date
entry: pdm install --check --dry-run
files: "^pyproject.toml$"
language: python
language_version: python3
pass_filenames: false
12 changes: 7 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ version: 2
sphinx:
configuration: docs/conf.py

# https://github.com/readthedocs/readthedocs.org/issues/4912#issuecomment-1143587902
build:
os: ubuntu-20.04
tools:
python: '3.8'
python: "3.8"
jobs:
post_install:
- pip install poetry==1.1.13
- poetry config virtualenvs.create false
- poetry install --no-dev -E docs -E viz
# Install PDM in its own isolated environment, so docs deps don't trample its deps
- curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py | python3 -
# TODO how to get `pdm` on the $PATH?
# https://github.com/pdm-project/pdm/discussions/1365#discussioncomment-3581356
# NOTE: pandoc fails in isolation mode
- VIRTUAL_ENV=$(dirname $(dirname $(which python))) $HOME/.local/bin/pdm sync --no-isolation -G viz -dG docs
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 0.4.3 (2022-09-14)
- Support sequences of `Item`s [@gjoseph92](https://github.com/gjoseph92)
- Fix compatibility with `pyproj>=3.4.0` [@gjoseph92](https://github.com/gjoseph92)
- stackstac has switched from Poetry to PDM as its package manager. This does not affect users, only developers.

## 0.4.2 (2022-07-06)
- Support (and require) rasterio 1.3.0 [@carderne](https://github.com/carderne) [@gjoseph92](https://github.com/gjoseph92)
- Fix `ValueError` when passing `dim=` to `mosaic` [@aazuspan](https://github.com/aazuspan)
Expand Down
4 changes: 1 addition & 3 deletions binder/postBuild
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

set -ex

poetry config virtualenvs.create false
poetry install -E binder -E viz
VIRTUAL_ENV=$(dirname $(dirname $(which python))) pdm install -G viz -dG binder
2 changes: 1 addition & 1 deletion binder/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
poetry
pdm
6 changes: 4 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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

author = DISTRIBUTION_METADATA["Author"]
author = DISTRIBUTION_METADATA["Author-email"].split(" <")[0]
project = DISTRIBUTION_METADATA["Name"]
version = DISTRIBUTION_METADATA["Version"]
copyright = f"{datetime.datetime.now().year}, {author}"
Expand All @@ -38,6 +38,7 @@
"sphinx.ext.autosummary",
"sphinx.ext.napoleon",
"sphinx_autodoc_typehints",
"sphinx_paramlinks",
"nbsphinx",
"jupyter_sphinx",
]
Expand All @@ -50,6 +51,7 @@
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]

paramlinks_hyperlink_param = 'name'
autosummary_generate = True
napoleon_use_param = True
# set_type_checking_flag = True
Expand Down Expand Up @@ -115,7 +117,7 @@
"rasterio": ("https://rasterio.readthedocs.io/en/latest/", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"pystac": ("https://pystac.readthedocs.io/en/latest/", None),
"xarray": ("https://xarray.pydata.org/en/stable/", None),
"xarray": ("https://docs.xarray.dev/en/stable/", None),
"dask": ("https://docs.dask.org/en/latest/", None),
"distributed": ("https://distributed.dask.org/en/latest/", None),
"matplotlib": ("https://matplotlib.org/stable", None),
Expand Down
2 changes: 1 addition & 1 deletion examples/gif.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -259835,7 +259835,7 @@
"\n",
"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",
"\n",
"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."
"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."
]
},
{
Expand Down
Loading