Merge pull request #106 from bird-house/refresh-cookiecutter-unpin-pywps

Refresh cookiecutter and undo pywps source pin
bird-house · Aug 7, 2020 · 56def26 · 56def26
2 parents f8605c3 + 3190e5b
commit 56def26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
     "template": "https://github.com/bird-house/cookiecutter-birdhouse.git",
-    "commit": "7ec7b8b69bbb900d6a300854af0e2a7357b83cdf",
+    "commit": "f157ea8419fd4e32a9e4d52e613c90c807190e7e",
     "skip": [
         "emu/processes/wps_say_hello.py",
         "tests/test_wps_hello.py",
@@ -33,4 +33,4 @@
             "_template": "https://github.com/bird-house/cookiecutter-birdhouse.git"
         }
     }
-}
+}
diff --git a/Makefile b/Makefile
@@ -72,7 +72,6 @@ install:
 develop:
 	@echo "Installing development requirements for tests and docs ..."
 	@-bash -c 'pip install -e ".[dev]"'
-	@-bash -c 'pip install git+https://github.com/Ouranosinc/pywps@2a55b6e95f51c648dc94bf3c89db7370b56c1c9c#egg=pywps --upgrade'
 
 .PHONY: start
 start:

diff --git a/environment-docs.yml b/environment-docs.yml
@@ -4,12 +4,7 @@ channels:
 - conda-forge
 - defaults
 dependencies:
-# restore once an official pywps release contain the fix
-#- pywps>=4.2
+- pywps>=4.2.7
 - sphinx
 - nbsphinx
 - ipython
-- pip
-- pip:
-  # delete once an official pywps release contain this fix, also delete in Makefile
-  - https://github.com/Ouranosinc/pywps/archive/2a55b6e95f51c648dc94bf3c89db7370b56c1c9c.zip
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,10 +1,10 @@
-pytest
+pytest>=6.0
 flake8
 pytest-flake8
 ipython
 pytest-notebook
 nbsphinx
-nbval
+nbval>=0.9.6
 nbconvert
 sphinx>=1.7
 bumpversion