Skip to content

Commit cbe8b9d

Browse files
committed
Merge branch 'develop' of https://github.com/chrisleaman/py-wave-runup into develop
2 parents 0d61691 + 0c88a9a commit cbe8b9d

File tree

2 files changed

+46
-16
lines changed

2 files changed

+46
-16
lines changed

poetry.lock

Lines changed: 42 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ documentation = 'https://py-wave-runup.readthedocs.io'
1212
[tool.poetry.dependencies]
1313
python = "^3.6 || ^3.7"
1414
numpy = "^1.16"
15-
black = {version = "^18.3-alpha.0", allows-prereleases = true}
15+
black = {version = ">=18.3,<20.0", allows-prereleases = true}
1616

1717
[tool.poetry.dev-dependencies]
1818
tox = "^3.13"
19-
coverage = "^4.5"
19+
coverage = "^5.0"
2020
pytest-runner = "^5.1"
21-
pytest = "^5.1"
21+
pytest = "^5.3"
2222
pre-commit = "^1.18"
2323
codecov = "^2.0"
2424
pytest-cov = "^2.8"
25-
sphinx = "^2.2"
25+
sphinx = "^2.3"
2626

2727
[build-system]
2828
requires = ["poetry>=0.12"]

0 commit comments

Comments
 (0)