Skip to content

Commit 70e55f2

Browse files
committed
Merge branch 'develop'
2 parents af99f05 + 7cfc260 commit 70e55f2

File tree

4 files changed

+105
-41
lines changed

4 files changed

+105
-41
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ script:
2424
jobs:
2525
include:
2626
- stage: lint
27-
python: 3.6
27+
python: 3.7
2828
install:
2929
- pip install pre-commit
3030
- pre-commit install-hooks

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ docs:
55
poetry run sphinx-build -M html ".\docs" ".\docs\_build"
66

77
# Requirements.txt needed to build docs on readthedocs.io
8-
freeze-requirements:
8+
update-requirements:
9+
poetery update
910
poetry run pip freeze --exclude-editable > ./docs/requirements.txt
1011

11-
#
1212
bump:
1313
poetry version
1414
@echo "Remember to increase version in py_wave_runup/__init__.py"

docs/requirements.txt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@ colorama==0.4.1
1111
coverage==4.5.3
1212
docutils==0.14
1313
filelock==3.0.10
14-
identify==1.4.1
14+
identify==1.4.2
1515
idna==2.8
1616
imagesize==1.1.0
1717
importlib-metadata==0.9
18-
importlib-resources==1.0.2
1918
Jinja2==2.10.1
2019
MarkupSafe==1.1.1
21-
more-itertools==5.0.0
20+
more-itertools==7.0.0
2221
nodeenv==1.3.3
23-
numpy==1.16.2
22+
numpy==1.16.3
2423
packaging==19.0
2524
pluggy==0.9.0
26-
pre-commit==1.15.1
25+
pre-commit==1.15.2
2726
py==1.8.0
2827
Pygments==2.3.1
2928
pyparsing==2.4.0
30-
pytest==4.4.0
31-
pytest-cov==2.6.1
29+
pytest==4.4.1
30+
pytest-cov==2.7.1
3231
pytest-runner==4.4
3332
pytz==2019.1
3433
PyYAML==5.1
@@ -38,12 +37,12 @@ snowballstemmer==1.2.1
3837
Sphinx==2.0.1
3938
sphinxcontrib-applehelp==1.0.1
4039
sphinxcontrib-devhelp==1.0.1
41-
sphinxcontrib-htmlhelp==1.0.1
40+
sphinxcontrib-htmlhelp==1.0.2
4241
sphinxcontrib-jsmath==1.0.1
4342
sphinxcontrib-qthelp==1.0.2
4443
sphinxcontrib-serializinghtml==1.1.3
4544
toml==0.10.0
46-
tox==3.8.6
47-
urllib3==1.24.1
48-
virtualenv==16.4.3
49-
zipp==0.3.3
45+
tox==3.9.0
46+
urllib3==1.24.3
47+
virtualenv==16.5.0
48+
zipp==0.4.0

0 commit comments

Comments
 (0)