Merge branch 'develop'

chrisleaman · May 4, 2019 · 70e55f2 · 70e55f2
2 parents af99f05 + 7cfc260
commit 70e55f2
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ script:
 jobs:
  include:
  - stage: lint
- python: 3.6
+ python: 3.7
  install:
  - pip install pre-commit
  - pre-commit install-hooks

diff --git a/Makefile b/Makefile
@@ -5,10 +5,10 @@ docs:
  poetry run sphinx-build -M html ".\docs" ".\docs\_build"
 
 # Requirements.txt needed to build docs on readthedocs.io
-freeze-requirements:
+update-requirements:
+ poetery update
  poetry run pip freeze --exclude-editable > ./docs/requirements.txt
 
-#
 bump:
  poetry version
  @echo "Remember to increase version in py_wave_runup/__init__.py"

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -11,24 +11,23 @@ colorama==0.4.1
 coverage==4.5.3
 docutils==0.14
 filelock==3.0.10
-identify==1.4.1
+identify==1.4.2
 idna==2.8
 imagesize==1.1.0
 importlib-metadata==0.9
-importlib-resources==1.0.2
 Jinja2==2.10.1
 MarkupSafe==1.1.1
-more-itertools==5.0.0
+more-itertools==7.0.0
 nodeenv==1.3.3
-numpy==1.16.2
+numpy==1.16.3
 packaging==19.0
 pluggy==0.9.0
-pre-commit==1.15.1
+pre-commit==1.15.2
 py==1.8.0
 Pygments==2.3.1
 pyparsing==2.4.0
-pytest==4.4.0
-pytest-cov==2.6.1
+pytest==4.4.1
+pytest-cov==2.7.1
 pytest-runner==4.4
 pytz==2019.1
 PyYAML==5.1
@@ -38,12 +37,12 @@ snowballstemmer==1.2.1
 Sphinx==2.0.1
 sphinxcontrib-applehelp==1.0.1
 sphinxcontrib-devhelp==1.0.1
-sphinxcontrib-htmlhelp==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.8.6
-urllib3==1.24.1
-virtualenv==16.4.3
-zipp==0.3.3
+tox==3.9.0
+urllib3==1.24.3
+virtualenv==16.5.0
+zipp==0.4.0