Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisleaman committed Dec 3, 2019
2 parents f713146 + d734a1b commit 40e8139
Show file tree
Hide file tree
Showing 7 changed files with 184 additions and 151 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ dist: "xenial"
python:
- 3.7
- 3.6
- 3.5

stages:
- lint
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ update-requirements:
poetry run pip freeze --exclude-editable > ./docs/requirements.txt

test:
pytest --cov=py_wave_runup --cov-report term-missing -W ignore::DeprecationWarning
poetry run pytest --cov=py_wave_runup --cov-report term-missing -W ignore::DeprecationWarning

docs:
poetry run sphinx-build -M html ".\docs" ".\docs\_build"
Expand Down
66 changes: 35 additions & 31 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,52 @@
alabaster==0.7.12
aspy.yaml==1.2.0
appdirs==1.4.3
aspy.yaml==1.3.0
atomicwrites==1.3.0
attrs==19.1.0
Babel==2.6.0
certifi==2019.3.9
cfgv==1.6.0
attrs==19.3.0
Babel==2.7.0
black==18.9b0
certifi==2019.11.28
cfgv==2.0.1
chardet==3.0.4
Click==7.0
codecov==2.0.15
colorama==0.4.1
coverage==4.5.3
docutils==0.14
filelock==3.0.10
identify==1.4.2
coverage==4.5.4
docutils==0.15.2
filelock==3.0.12
identify==1.4.7
idna==2.8
imagesize==1.1.0
importlib-metadata==0.9
Jinja2==2.10.1
importlib-metadata==1.1.0
Jinja2==2.10.3
MarkupSafe==1.1.1
more-itertools==7.0.0
more-itertools==8.0.0
nodeenv==1.3.3
numpy==1.16.3
packaging==19.0
pluggy==0.9.0
pre-commit==1.15.2
numpy==1.17.4
packaging==19.2
pluggy==0.13.1
pre-commit==1.20.0
py==1.8.0
Pygments==2.3.1
pyparsing==2.4.0
pytest==4.4.1
pytest-cov==2.7.1
pytest-runner==4.4
pytz==2019.1
PyYAML==5.1
requests==2.21.0
six==1.12.0
snowballstemmer==1.2.1
Sphinx==2.0.1
Pygments==2.5.2
pyparsing==2.4.5
pytest==4.6.6
pytest-cov==2.8.1
pytest-runner==5.2
pytz==2019.3
PyYAML==5.2
requests==2.22.0
six==1.13.0
snowballstemmer==2.0.0
Sphinx==2.2.2
sphinxcontrib-applehelp==1.0.1
sphinxcontrib-devhelp==1.0.1
sphinxcontrib-htmlhelp==1.0.2
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.2
sphinxcontrib-serializinghtml==1.1.3
toml==0.10.0
tox==3.9.0
urllib3==1.24.3
virtualenv==16.5.0
zipp==0.4.0
tox==3.14.2
urllib3==1.25.7
virtualenv==16.7.8
wcwidth==0.1.7
zipp==0.6.0
Loading

0 comments on commit 40e8139

Please sign in to comment.