Merge branch 'develop'

chrisleaman · Dec 19, 2019 · 2f93462 · 2f93462
2 parents 40e8139 + cbe8b9d
commit 2f93462
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 19 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 author = "Chris Leaman"
 
 # The full version, including alpha/beta/rc tags
-release = "v0.1.4"
+release = "v0.1.5"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/poetry.lock b/poetry.lock
diff --git a/py_wave_runup/__init__.py b/py_wave_runup/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-wave-runup"
-version = "0.1.4"
+version = "0.1.5"
 description = "Empirical wave runup models implemented in Python"
 authors = ["Chris Leaman"]
 license = "GPL-3.0+"
@@ -12,17 +12,17 @@ documentation = 'https://py-wave-runup.readthedocs.io'
 [tool.poetry.dependencies]
 python = "^3.6 || ^3.7"
 numpy = "^1.16"
-black = {version = "^18.3-alpha.0", allows-prereleases = true}
+black = {version = ">=18.3,<20.0", allows-prereleases = true}
 
 [tool.poetry.dev-dependencies]
 tox = "^3.13"
-coverage = "^4.5"
+coverage = "^5.0"
 pytest-runner = "^5.1"
-pytest = "^5.1"
+pytest = "^5.3"
 pre-commit = "^1.18"
 codecov = "^2.0"
 pytest-cov = "^2.8"
-sphinx = "^2.2"
+sphinx = "^2.3"
 
 [build-system]
 requires = ["poetry>=0.12"]