Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/chrisleaman/py-wave-runup
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
chrisleaman committed Dec 19, 2019
2 parents 0d61691 + 0c88a9a commit cbe8b9d
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 16 deletions.
54 changes: 42 additions & 12 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit cbe8b9d

Please sign in to comment.