Skip to content

Commit

Permalink
Merge pull request #170 from Deltares/v0.5
Browse files Browse the repository at this point in the history
prepare release v0.5.0
  • Loading branch information
DirkEilander committed Aug 4, 2022
2 parents 100998f + 8f8e5a2 commit e30a4f6
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 37 deletions.
14 changes: 9 additions & 5 deletions binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
# minimal environment to install hydromt and run examples
name: hydromt

channels:
- conda-forge

dependencies:
- affine
- click
- black
- bottleneck
- cartopy # to run examples
- click
- dask
- descartes # to run examples
- entrypoints
- flit>=3.2
- flit>=3.4
- gdal>=3.1
- geopandas
- geopandas>=0.10
- jupyter # to run examples
- netcdf4
- matplotlib # to run examples
- numba
- numpy
- openpyxl
- pandas
- pcraster # optional
- pip
- pyflwdir>=0.5.0
- pyflwdir>=0.5.4
- pygeos>=0.8
- python>=3.8
- python>=3.7
- rasterio
- requests
- rioxarray
- scipy
- toml
- xarray
- zarr
4 changes: 2 additions & 2 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ All notable changes to this project will be documented in this page.
The format is based on `Keep a Changelog`_, and this project adheres to
`Semantic Versioning`_.

Unreleased
----------
v0.5.0 (3 August 2022)
----------------------

Added
^^^^^
Expand Down
20 changes: 10 additions & 10 deletions envs/hydromt-dev.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# note that these are the developer dependencies,
# if you only want the user dependencies, see
# dependencies in pyproj.toml
name: hydromt-dev

channels:
- conda-forge

# note that these are the developer dependencies,
# if you only want the user dependencies, see
# install_requires in setup.py
dependencies:
- affine
- click
- black
- bottleneck
- cartopy # to run examples
- click
- dask
- descartes # to run examples
- entrypoints
- flit>=3.2
- flit>=3.4
- gdal>=3.1
- geopandas>=0.10
- jupyter # to run examples
Expand All @@ -26,27 +26,27 @@ dependencies:
- numpy
- openpyxl
- pandas
- pcraster # TODO make optional
- pcraster # optional
- pip
- pydata-sphinx-theme
- pyflwdir>=0.5.3
- pydata-sphinx-theme # docs
- pyflwdir>=0.5.4
- pygeos>=0.8
- pytest # tests
- pytest-cov # tests
- pytest-benchmark # tests
- python>=3.7
- rasterio
- rioxarray
- responses # tests
- requests
- rioxarray
- scipy
- testpath # tests
- toml
- sphinx # docs
- xarray
- zarr
- pip:
- hydroengine
- hydroengine # optional
- sphinx_design # docs
- sphinx_autosummary_accessors # docs

10 changes: 4 additions & 6 deletions envs/hydromt-min.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
# minimal environment to install hydromt
name: hydromt-min

channels:
- conda-forge

# note that these are the developer dependencies,
# if you only want the user dependencies, see
# install_requires in setup.py
dependencies:
- affine
- bottleneck
- click
- dask
- entrypoints
- flit>=3.2
- flit>=3.4 # install
- gdal>=3.1
- geopandas>=0.10
- netcdf4
- numba
- numpy
- openpyxl
- pandas
- pyflwdir>=0.5.3
- pip # install
- pyflwdir>=0.5.4
- pygeos>=0.8
- python>=3.8
- rasterio
- requests
- rioxarray
- rtree # =0.9.3 issue with dll in newer vesions
- scipy
- xarray
- zarr
12 changes: 5 additions & 7 deletions envs/hydromt-test.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# this environment is used to test on github actions
name: hydromt-test

channels:
- conda-forge

# note that these are the developer dependencies,
# if you only want the user dependencies, see
# install_requires in setup.py
dependencies:
- affine
- click
- black
- black # test
- bottleneck
- click
- dask
- entrypoints
- gdal>=3.1
Expand All @@ -21,13 +19,13 @@ dependencies:
- openpyxl
- pandas
- pcraster # optional
- pyflwdir>=0.5.3
- pyflwdir>=0.5.4
- pygeos>=0.8
- pytest # tests
- pytest-cov # tests
- pytest-benchmark # tests
- requests
- rasterio
- requests
- rioxarray
- scipy
- xarray
Expand Down
2 changes: 1 addition & 1 deletion hydromt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""HydroMT: Automated and reproducible model building and analysis"""

# version number without 'v' at start
__version__ = "0.4.6.dev"
__version__ = "0.5.0"

import geopandas as gpd
import warnings
Expand Down
11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["flit_core >=3.2.0,<4"]
requires = ["flit_core >=3.4.0,<4"]
build-backend = "flit_core.buildapi"

[project]
Expand All @@ -13,16 +13,16 @@ dependencies = [
"bottleneck",
"click",
"dask",
"geopandas>=0.10",
"entrypoints",
"geopandas>=0.10",
"gdal>=3.1",
"numba",
"numpy",
"netcdf4",
"openpyxl",
"pandas",
"pyflwdir>=0.5.4",
"pygeos",
"openpyxl",
"rasterio",
"requests",
"rioxarray",
Expand All @@ -45,11 +45,10 @@ dynamic = ['version', 'description']

[project.optional-dependencies]
test = [
"testpath",
"responses",
"black",
"pytest>=2.7.3",
"pytest-cov",
"black",
"responses",
]
doc = [
"nbsphinx",
Expand Down

0 comments on commit e30a4f6

Please sign in to comment.