Added conda installation functionality and updated associated

documentation.

Author: WilcoTerink

.gitignore

@@ -1,4 +1,5 @@
 /.project
 /.pydevproject
 /GlabTop2/test/dem25m.map
-/GlabTop2/test/glacid25m.map
+/GlabTop2/test/glacid25m.map
+/.settings/

GlabTop2/main.py

@@ -20,8 +20,8 @@
 #-Authorship information-########################################################################################################################
 __author__ = 'Wilco Terink'
 __copyright__ = 'Wilco Terink'
-__version__ = '2.0.0'
-__date__ ='June 2018'
+__version__ = '2.0.1'
+__date__ ='July 2019'
 #################################################################################################################################################
 
 import math, time, sys, getopt, os
@@ -299,7 +299,7 @@ def main(argv=None):
 
     tic = time.clock()
     print('\nGlabTop2-py is developed by Wilco Terink\n')
-    print('Version 2.0.0\n')
+    print('Version 2.0.1\n')
     glabtop = GlabTop2(cfgfile)
     glabtop.run()
 

README.rst

@@ -13,15 +13,19 @@ Reference documentation can be found `here <https://glabtop2-py.readthedocs.io/e
 Installation
 ------------
 
-GlabTop2-py can be installed via pip::
+GlabTop2-py can be installed via Anaconda::
+
+   conda install -c WilcoTerink GlabTop2-py
+
+or via pip::
 
    pip install GlabTop2-py
    
    
 Run GlabTop2-py
 ---------------
 
-After installation via pip, the tool can be executed by::
+After installation via Anaconda or pip, the tool can be executed by::
 
    python -m GlabTop2.main -i config.cfg   
    

conda/meta.yaml

@@ -0,0 +1,56 @@
+{% set name = "GlabTop2-py" %}
+{% set version = "2.0.1" %}
+{% set sha256 = "f92203125b16d1ccd5c832db3170b0b6f7179d902d9645f7be2bee1f577dee87" %}
+
+# sha256 is the prefered checksum -- you can get it for a file with:
+#  `openssl sha256 <file name>`.
+# You may need the openssl package, available on conda-forge
+#  `conda install openssl -c conda-forge``
+
+package:
+  name: {{ name|lower }}
+  version: {{ version }}
+
+source:
+  fn: {{ name }}-{{ version }}.tar.gz
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
+  # If getting the source from GitHub remove the line above
+  # uncomment the line below and modify as needed
+  # url: https://github.com/simplejson/{{ name }}/archive/{{ version }}.tar.gz
+  sha256: {{ sha256 }}
+
+build:
+  # Uncomment the following line if the package is pure python and the recipe is exactly the same for all platforms.
+  # It is okay if the dependencies are not built for all platforms/versions, although selectors are still not allowed.
+  # See https://conda-forge.org/docs/meta.html#building-noarch-packages for more details.
+  noarch: python
+  number: 0
+  # If the installation is complex, or different between Unix and Windows, use separate bld.bat and build.sh files instead of this key.
+  # By default, the package will be built for the Python versions supported by conda-forge and for all major OSs.
+  # Add the line "skip: True  # [py<35]" (for example) to limit to Python 3.5 and newer, or "skip: True  # [not win]" to limit to Windows.
+  script: python -m pip install --no-deps --ignore-installed .
+
+requirements:
+  build:
+    - python
+    - setuptools
+  run:
+    - python
+    - pandas
+    - numpy
+    - simpledbf
+    - scipy
+
+test:
+  imports:
+    - GlabTop2
+
+about:
+  home: https://github.com/WilcoTerink/GlabTop2-py
+  license: GNU General Public License v3 (GPL-3.0)
+  license_family: GPL
+  summary: GlabTop2 (Glacier bed Topography) model
+  description: "Repository for the GlabTop2 model\r\n=============================================================\r\n\r\nThe documentation can be found here: https://glabtop2-py.readthedocs.io/en/latest/.\r\
+    \n"
+  doc_url: ''
+  dev_url: ''

docs/build/doctrees/environment.pickle

@@ -13,16 +13,72 @@ Installation
    GlabTop2-py was developed using PCRaster version 4.2.1 and Python 3.6 (both 64 bits).
 
 
-This page describes how you can install GlabTop2-py. There are two ways of installing GlabTop2-py:
+This page describes how you can install GlabTop2-py. There are three ways of installing GlabTop2-py:
 
-   1. Install via :ref:`pip <installation_pip>`::
+   1. Install via :ref:`Anaconda <installation_anaconda>`::
+   
+       conda install -c WilcoTerink GlabTop2-py
+   
+   2. Install via :ref:`pip <installation_pip>`::
    
        pip install GlabTop2-py
    
    2. Downloading the source code from the `GlabTop2-py GitHub repository <https://github.com/WilcoTerink/GlabTop2-py>`_
 
 Each of these installation methods is described in detail in the sections below. The recommended installation is the
-**pip** method.
+**Anaconda** method.
+
+
+.. _anaconda:
+
+Anaconda
+--------
+
+About Anaconda
+^^^^^^^^^^^^^^
+
+Anaconda is the world's most popular Python/R data science platform. The open-source Anaconda distribution is the easiest way
+to perform Python/R data science and machine learning on Linux, Windows, and Mac OS X. With over 11 million users worldwide, it
+is the industry standard for developing, testing, and training on a single machine, enabling individual data scientists to:
+
+    + Quickly download 1,500+ Python/R data science packages
+    + Manage libraries, dependencies, and environments with Conda
+    + Develop and train machine learning and deep learning models with scikit-learn, TensorFlow, and Theano
+    + Analyze data with scalability and performance with Dask, NumPy, pandas, and Numba
+    + Visualize results with Matplotlib, Bokeh, Datashader, and Holoviews
+    
+More information about the Anaconda distribution can be found `here <https://www.anaconda.com/distribution/>`_.
+
+Download Anaconda
+^^^^^^^^^^^^^^^^^
+
+It is strongly recommended to use the Anaconda Python distribution to install and manage all your Python packages. The reason for
+this is because Anaconda checks for dependencies, installs missing dependencies or updates old depencies if required. Use the link below to
+download Anaconda Python:
+
+    + `Python <https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe>`_
+    
+By default this installs Python version 3.7. Momentarily, PCRaster only works with Python version 3.6. Therefore, you need to downgrade the Python installation using::
+
+   conda install python=3.6 
+    
+.. _installation_anaconda:
+
+Install GlabTop2-py using Anaconda
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Once you have PCRaster and Anaconda installed you can easily install GlabTop2-py via the command prompt::
+
+    conda install -c WilcoTerink GlabTop2-py
+    
+The command above will always install the most recent GlabTop2-py release. Upgrading an already installed GlabTop2-py distribution
+to the most recent release can be achieved by::
+
+    conda update -c WilcoTerink GlabTop2-py
+
+After you have installed GlabTop2-py, the package resides under::
+
+    PATH-TO-YOUR-ANACONDA-INSTALLATION\Lib\site-packages\GlabTop2
 
 
 .. _pip:
@@ -70,7 +126,7 @@ Alternatively, you can download GlabTop2-py from my GitHub repository:
 You can download the release you want, and extract the contents to a folder on your hard drive.
 GlabTop2-py can then be run from inside this folder.
 
-Installation by this method, however, is not recommended because it does not check for the dependencies that are required to run GlabTop2-py, whereas the :ref:`pip <pip>`
+Installation by this method, however, is not recommended because it does not check for the dependencies that are required to run GlabTop2-py, whereas the :ref:`Anaconda <anaconda>`
 installation method does.
 
 

docs/build/doctrees/installation.doctree

@@ -7,16 +7,16 @@ Running GlabTop2-py
 This section describes how you can run GlabTop2-py. How-to run the tool depends on the way you have installed
 GlabTop2-py:
 
-    1. Installation via :ref:`pip <installation_pip>`
+    1. Installation via :ref:`Anaconda <installation_anaconda>` or :ref:`pip <installation_pip>`
 
     2. Installation using the download from the :ref:`GitHub repository <installation_github>`
 
 See ONE of the sections below for how-to run GlabTop2-py depending on the chosen installation method.
 
-Run via pip installation
-------------------------
+Run via Anaconda or pip installation
+------------------------------------
 
-If you have installed GlabTop2-py via pip, then you can run GlabTop2-py from any location
+If you have installed GlabTop2-py via Anaconda or pip, then you can run GlabTop2-py from any location
 on your PC; i.e. you do not need to refer to the physical address where the GlabTop2-py source code resides.
 This is an advantage, because you do not need to copy all the source code files everytime you start
 a new project.

docs/build/doctrees/running.doctree

@@ -170,12 +170,13 @@ <h1>Contents<a class="headerlink" href="#contents" title="Permalink to this head
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="installation.html">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation.html#anaconda">Anaconda</a></li>
 <li class="toctree-l2"><a class="reference internal" href="installation.html#pip">pip</a></li>
 <li class="toctree-l2"><a class="reference internal" href="installation.html#download-from-github-repository">Download from GitHub repository</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="running.html">Running GlabTop2-py</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="running.html#run-via-pip-installation">Run via pip installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="running.html#run-via-anaconda-or-pip-installation">Run via Anaconda or pip installation</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running.html#run-via-the-github-download-installation">Run via the GitHub download installation</a></li>
 </ul>
 </li>