Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisleaman committed Dec 19, 2019
2 parents 2f93462 + 8bf6542 commit 6847f36
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Chris Leaman"

# The full version, including alpha/beta/rc tags
release = "v0.1.5"
release = "v0.1.6"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion py_wave_runup/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.5"
__version__ = "0.1.6"
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "py-wave-runup"
version = "0.1.5"
version = "0.1.6"
description = "Empirical wave runup models implemented in Python"
authors = ["Chris Leaman"]
license = "GPL-3.0+"
Expand All @@ -12,7 +12,6 @@ documentation = 'https://py-wave-runup.readthedocs.io'
[tool.poetry.dependencies]
python = "^3.6 || ^3.7"
numpy = "^1.16"
black = {version = ">=18.3,<20.0", allows-prereleases = true}

[tool.poetry.dev-dependencies]
tox = "^3.13"
Expand All @@ -23,6 +22,7 @@ pre-commit = "^1.18"
codecov = "^2.0"
pytest-cov = "^2.8"
sphinx = "^2.3"
black = {version = ">=18.3,<20.0", allow-prereleases = true}

[build-system]
requires = ["poetry>=0.12"]
Expand Down

0 comments on commit 6847f36

Please sign in to comment.