Skip to content

Commit

Permalink
STAC 1.0 compatibility, release 0.3.0 (#61)
Browse files Browse the repository at this point in the history
* fix tutorial code blocks and tests

* update changelog and readme

* dont fail fast on matrix test for py versions

* use fsspec master on upstream test environment

* use setup miniconda action

* set driver to rasterio by default, move driver dictionary

* simplfy CI environments, move driver mapping to top of catalog.py

* try conda env for readthedocs
  • Loading branch information
scottyhq authored Oct 16, 2020
1 parent 29a47b3 commit c1a65ce
Show file tree
Hide file tree
Showing 22 changed files with 373 additions and 359 deletions.
27 changes: 17 additions & 10 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,33 @@ jobs:
- uses: pre-commit/[email protected]

test:
name: ${{ matrix.CONDA_ENV }}-build
name: ${{ matrix.CONDA_ENV }}-test
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
CONDA_ENV: [3.6, 3.7, 3.7-upstream, 3.8]
CONDA_ENV: [3.6, 3.7, 3.8, 3.9, upstream]
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v2

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v1
with:
auto-update-conda: true
auto-activate-base: false
activate-environment: intake-stac
environment-file: ci/environment-${{ matrix.CONDA_ENV }}.yml

- name: Setup conda environment
- name: Development Install Intake-STAC
shell: bash -l {0}
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
conda env create -n test_env --file ci/environment-dev-${{ matrix.CONDA_ENV }}.yml --quiet
source activate test_env
python -m pip install --no-deps -e .
conda list
- name: Running Tests
- name: Run Tests
shell: bash -l {0}
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate test_env
pytest --verbose --junitxml=test-reports/junit.xml --cov=intake_stac --cov-config ci/.coveragerc --cov-report term-missing
- name: Upload coverage to Codecov
Expand Down
9 changes: 2 additions & 7 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,5 @@ sphinx:
configuration: docs/source/conf.py

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: requirements.txt
- requirements: docs/requirements.txt
- method: pip
path: .
conda:
environment: ci/environment-docs.yml
20 changes: 17 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [v0.3.0] - 2020-10-01

### Added

- Tests against python3.8 (#63)
- Intake GUI predefined holoviews plots for thumbnails and geotiffs (#58)
- New STAC Asset mimetype driver associations (#56)
- STAC>1.0 support, with additional Jupyter Notebooks in examples/ (#52)
- StacItemCollection `to_geopandas()` method (#38)
- Use GitHub Actions for CI (#37)

## [v0.2.3] - 2019-01-21

### Removed
Expand All @@ -19,7 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Added

- Support for `satstac.ItemCollection` objects. This faciliates integration with STAC search APIs like sat-search.
- Support for `satstac.ItemCollection` objects. This facilitates integration with STAC search APIs like sat-search.

## [v0.2.1] - 2019-10-31

Expand Down Expand Up @@ -50,6 +61,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Initial Release

[v0.2.1]: https://github.com/pangeo-data/intake-stac/compare/0.1.0...v0.2.1
[v0.2.0]: https://github.com/pangeo-data/intake-stac/compare/0.1.0...v0.2.0
[v0.3.0]: https://github.com/intake/intake-stac/compare/0.2.3...0.3.0
[v0.2.3]: https://github.com/intake/intake-stac/compare/0.2.2...0.2.3
[v0.2.2]: https://github.com/intake/intake-stac/compare/0.2.1...0.2.2
[v0.2.1]: https://github.com/pangeo-data/intake-stac/compare/0.2.0...0.2.1
[v0.2.0]: https://github.com/pangeo-data/intake-stac/compare/0.1.0...0.2.0
[v0.1.0]: https://github.com/pangeo-data/intake-stac/tree/0.1.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The [examples/](examples/) directory contains some example Jupyter Notebooks tha
To install a specific versions of intake-stac, specify the version in the install command

```bash
pip install intake-stac==0.1.0
pip install intake-stac==0.3.0
```

The table below shows the corresponding versions between intake-stac and STAC:
Expand Down
13 changes: 13 additions & 0 deletions ci/environment-3.6.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: intake-stac
channels:
- conda-forge
dependencies:
- python=3.6
- fsspec
- geopandas
- intake
- intake-xarray
- pytest-cov
- rasterio
- sat-stac
- xarray
13 changes: 13 additions & 0 deletions ci/environment-3.7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: intake-stac
channels:
- conda-forge
dependencies:
- python=3.7
- fsspec
- geopandas
- intake
- intake-xarray
- pytest-cov
- rasterio
- sat-stac
- xarray
13 changes: 13 additions & 0 deletions ci/environment-3.8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: intake-stac
channels:
- conda-forge
dependencies:
- python=3.8
- fsspec
- geopandas
- intake
- intake-xarray
- pytest-cov
- rasterio
- sat-stac
- xarray
13 changes: 13 additions & 0 deletions ci/environment-3.9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: intake-stac
channels:
- conda-forge
dependencies:
- python=3.9
- fsspec
- geopandas
- intake
- intake-xarray
- pytest-cov
- rasterio
- sat-stac
- xarray
45 changes: 0 additions & 45 deletions ci/environment-dev-3.6.yml

This file was deleted.

45 changes: 0 additions & 45 deletions ci/environment-dev-3.8.yml

This file was deleted.

6 changes: 2 additions & 4 deletions ci/environment-dev-3.7.yml → ci/environment-dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# everything except jupyterlab and plotting libraries
name: intake-stac-dev
channels:
- conda-forge
dependencies:
- python=3.7
- aiohttp
- autopep8
- black
Expand All @@ -27,18 +29,14 @@ dependencies:
- pandoc
- pip
- pre_commit
- pytest
- pytest-cov
- pytest-icdiff
- python=3.7
- pytoml
- pyyaml
- rasterio
- recommonmark
- requests
- sat-search>=0.3
- sat-stac
- scikit-image
- sphinx-copybutton
- sphinx_rtd_theme
- sphinx>=1.6
Expand Down
27 changes: 27 additions & 0 deletions ci/environment-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#readthedocs uses defaults rather than conda-forge
name: intake-stac
channels:
- defaults
dependencies:
- python=3.7
- aiohttp
- fsspec
- geopandas
- intake
- intake-xarray
- ipython
- mock
- numpydoc
- pillow
- pip
- pytest-cov
- rasterio
- scikit-image
- sphinx
- sphinx_rtd_theme
- xarray
- pip:
- nbsphinx
- sat-search
- sat-stac
- .. #installs intake-stac from root folder
2 changes: 1 addition & 1 deletion ci/environment-gui-3.7.yml → ci/environment-gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: intake-stac-gui
channels:
- conda-forge
dependencies:
- python =3.7
- aiohttp
- autopep8
- black
Expand Down Expand Up @@ -42,7 +43,6 @@ dependencies:
- pytest
- pytest-cov
- pytest-icdiff
- python =3.7
- pytoml
- pyyaml
- rasterio
Expand Down
Original file line number Diff line number Diff line change
@@ -1,43 +1,19 @@
name: intake-stac-dev
name: intake-stac
channels:
- conda-forge
dependencies:
- aiohttp
- autopep8
- black
- boto3
- codecov
- coverage
- dask
- distributed
- flake8
- python=3.8
- fsspec
- geopandas
- ipykernel
- ipywidgets
- isort
- make
- nbsphinx
- netcdf4
- numpy
- numpydoc
- pandoc
- intake
- intake-xarray
- pip
- pre_commit
- pytest
- pytest-cov
- pytest-icdiff
- python=3.7
- pytoml
- pyyaml
- rasterio
- recommonmark
- requests
- scikit-image
- sphinx-copybutton
- sphinx_rtd_theme
- sphinx>=1.6
- sat-stac
- xarray
- pip:
- git+https://github.com/intake/filesystem_spec.git
- git+https://github.com/sat-utils/sat-stac.git
- git+https://github.com/sat-utils/sat-search.git
- git+https://github.com/intake/intake.git
Expand Down
10 changes: 0 additions & 10 deletions docs/requirements.txt

This file was deleted.

Loading

0 comments on commit c1a65ce

Please sign in to comment.