update environment

bird-house · Oct 3, 2020 · 207682a · 207682a
2 parents 1bf3ce4 + 6a88433
commit 207682a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/docs/source/guide_WPS.rst b/docs/source/guide_WPS.rst
@@ -9,7 +9,6 @@ WPS design
     :depth: 1
 
 
-
 Setting up a new WPS
 ====================
 

diff --git a/docs/source/tutorial_wps.rst b/docs/source/tutorial_wps.rst
@@ -2,6 +2,32 @@
 
 
 WPS general usage
+<<<<<<< HEAD:docs/source/tutorial_wps.rst
+=======
+=================
+
+
+General concepts and tutorials for pyWPS:
+
+* `PyWPS 4.0.0 Slides <http://www.slideshare.net/jachym/pywps400>`_
+* `PyWPS Documentation <https://pywps.readthedocs.io/en/master/process.html>`_
+
+You can connect to a WPS service in the following ways:
+
+* using a command-line tool in your terminal.
+* using a web based application from your browser.
+* using a Python library from a jupyter notebook or your Python scripts.
+
+
+Get familliar with WPS (emu):
+-----------------------------
+
+.. todo:: include Emu tutorial
+
+
+Wordcounter Example
+-------------------
+>>>>>>> tutorials:docs/source/tutorial/wps.rst
 
 .. todo:: The WPS tutorial needs to be updated.
 

diff --git a/environment.yml b/environment.yml
@@ -7,5 +7,10 @@ dependencies:
 - sphinx
 - nbsphinx
 - nb_conda_kernels
+<<<<<<< HEAD
+=======
+- pywps
+- jupyter-client 
+>>>>>>> tutorials
 - pip:
   - sphinxcontrib-bibtex