Skip to content

Commit 40e8139

Browse files
committed
Merge branch 'refs/heads/develop'
2 parents f713146 + d734a1b commit 40e8139

File tree

7 files changed

+184
-151
lines changed

7 files changed

+184
-151
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ dist: "xenial"
55
python:
66
- 3.7
77
- 3.6
8-
- 3.5
98

109
stages:
1110
- lint

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ update-requirements:
99
poetry run pip freeze --exclude-editable > ./docs/requirements.txt
1010

1111
test:
12-
pytest --cov=py_wave_runup --cov-report term-missing -W ignore::DeprecationWarning
12+
poetry run pytest --cov=py_wave_runup --cov-report term-missing -W ignore::DeprecationWarning
1313

1414
docs:
1515
poetry run sphinx-build -M html ".\docs" ".\docs\_build"

docs/requirements.txt

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,52 @@
11
alabaster==0.7.12
2-
aspy.yaml==1.2.0
2+
appdirs==1.4.3
3+
aspy.yaml==1.3.0
34
atomicwrites==1.3.0
4-
attrs==19.1.0
5-
Babel==2.6.0
6-
certifi==2019.3.9
7-
cfgv==1.6.0
5+
attrs==19.3.0
6+
Babel==2.7.0
7+
black==18.9b0
8+
certifi==2019.11.28
9+
cfgv==2.0.1
810
chardet==3.0.4
11+
Click==7.0
912
codecov==2.0.15
1013
colorama==0.4.1
11-
coverage==4.5.3
12-
docutils==0.14
13-
filelock==3.0.10
14-
identify==1.4.2
14+
coverage==4.5.4
15+
docutils==0.15.2
16+
filelock==3.0.12
17+
identify==1.4.7
1518
idna==2.8
1619
imagesize==1.1.0
17-
importlib-metadata==0.9
18-
Jinja2==2.10.1
20+
importlib-metadata==1.1.0
21+
Jinja2==2.10.3
1922
MarkupSafe==1.1.1
20-
more-itertools==7.0.0
23+
more-itertools==8.0.0
2124
nodeenv==1.3.3
22-
numpy==1.16.3
23-
packaging==19.0
24-
pluggy==0.9.0
25-
pre-commit==1.15.2
25+
numpy==1.17.4
26+
packaging==19.2
27+
pluggy==0.13.1
28+
pre-commit==1.20.0
2629
py==1.8.0
27-
Pygments==2.3.1
28-
pyparsing==2.4.0
29-
pytest==4.4.1
30-
pytest-cov==2.7.1
31-
pytest-runner==4.4
32-
pytz==2019.1
33-
PyYAML==5.1
34-
requests==2.21.0
35-
six==1.12.0
36-
snowballstemmer==1.2.1
37-
Sphinx==2.0.1
30+
Pygments==2.5.2
31+
pyparsing==2.4.5
32+
pytest==4.6.6
33+
pytest-cov==2.8.1
34+
pytest-runner==5.2
35+
pytz==2019.3
36+
PyYAML==5.2
37+
requests==2.22.0
38+
six==1.13.0
39+
snowballstemmer==2.0.0
40+
Sphinx==2.2.2
3841
sphinxcontrib-applehelp==1.0.1
3942
sphinxcontrib-devhelp==1.0.1
4043
sphinxcontrib-htmlhelp==1.0.2
4144
sphinxcontrib-jsmath==1.0.1
4245
sphinxcontrib-qthelp==1.0.2
4346
sphinxcontrib-serializinghtml==1.1.3
4447
toml==0.10.0
45-
tox==3.9.0
46-
urllib3==1.24.3
47-
virtualenv==16.5.0
48-
zipp==0.4.0
48+
tox==3.14.2
49+
urllib3==1.25.7
50+
virtualenv==16.7.8
51+
wcwidth==0.1.7
52+
zipp==0.6.0

0 commit comments

Comments
 (0)