Merge pull request #11 from MStarmans91/development

Release 2.1.3 as PREDICT updated.
MStarmans91 · Apr 8, 2019 · 1eee05b · 1eee05b
2 parents 2d45d7a + 231ae8e
commit 1eee05b
Show file tree

Hide file tree

Showing 35 changed files with 787 additions and 171 deletions.
diff --git a/.eggs/PREDICT-2.1.2-py2.7.egg b/.eggs/PREDICT-2.1.2-py2.7.egg
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_
 and this project adheres to `Semantic Versioning <http://semver.org/>`_
 
+2.1.3 - 2019-04-08
+------------------
+
+Changed
+~~~~~~~
+- PREDICT was updated, so had to update the requirements. Changed it
+  to a minimum of PREDICT to prevent these issues in the future.
+
+
 2.1.2 - 2019-04-02
 ------------------
 

diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 [![Build Status](https://travis-ci.com/MStarmans91/WORC.svg?token=qyvaeq7Cpwu7hJGB98Gp&branch=master)](https://travis-ci.com/MStarmans91/WORC)
 
-# WORC v2.1.2
+# WORC v2.1.3
 
 ## Workflow for Optimal Radiomics Classification
 
 WORC is an open-source python package for the easy execution of full Radiomics pipelines.
 
+<img src="images/WORC.jpg" alt="Overview"/>
+
 We aim to establish a general Radiomics platform supporting easy integration of other tools. With our modular build
 and support of different software languages (python, MATLAB, ruby, java etc.), we want to facilitate and stimulate
 collaboration, standardisation and comparison of different Radiomics approaches. By combining this in a single framework,

diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 |Build Status|
 
-WORC v2.1.2
+WORC v2.1.3
 ===========
 
 Workflow for Optimal Radiomics Classification

diff --git a/WORC.egg-info/PKG-INFO b/WORC.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 1.1
 Name: WORC
-Version: 2.1.2
+Version: 2.1.3
 Summary: Workflow for Optimal Radiomics Classification.
 Home-page: https://github.com/MStarmans91/WORC
 Author: M. Starmans
 Author-email: [email protected]
 License: Apache License, Version 2.0
 Description: |Build Status|
 
-        WORC v2.1.2
+        WORC v2.1.3
         ===========
 
         Workflow for Optimal Radiomics Classification

diff --git a/WORC.egg-info/SOURCES.txt b/WORC.egg-info/SOURCES.txt
@@ -154,6 +154,7 @@ docs/_build/html/genindex.html
 docs/_build/html/index.html
 docs/_build/html/modules.html
 docs/_build/html/objects.inv
+docs/_build/html/py-modindex.html
 docs/_build/html/search.html
 docs/_build/html/searchindex.js
 docs/_build/html/_sources/WORC.IOparser.rst.txt

diff --git a/WORC.egg-info/requires.txt b/WORC.egg-info/requires.txt
@@ -11,5 +11,5 @@ six>=1.10.0
 sphinx>=1.4
 pyOpenSSL>=16.2.0
 boto3>=1.7.74
-PREDICT==2.1.2
+PREDICT>=2.1.3
 pandas>=0.19.0
diff --git a/dist/WORC-2.1.2.tar.gz b/dist/WORC-2.1.2.tar.gz
diff --git a/dist/WORC-2.1.3.tar.gz b/dist/WORC-2.1.3.tar.gz
diff --git a/docs/_build/doctrees/WORC.IOparser.doctree b/docs/_build/doctrees/WORC.IOparser.doctree
diff --git a/docs/_build/doctrees/WORC.doctree b/docs/_build/doctrees/WORC.doctree
diff --git a/docs/_build/doctrees/WORC.processing.doctree b/docs/_build/doctrees/WORC.processing.doctree
diff --git a/docs/_build/doctrees/WORC.tools.doctree b/docs/_build/doctrees/WORC.tools.doctree
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/doctrees/modules.doctree b/docs/_build/doctrees/modules.doctree
diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: c855b12527d2594c111c86ed8bdc3505
+config: 164438d6645e777600c9bc16dfd6132d
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_build/html/WORC.IOparser.html b/docs/_build/html/WORC.IOparser.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>WORC.IOparser package &#8212; WORC 2.1.2 documentation</title>
+    <title>WORC.IOparser package &#8212; WORC 2.1.3 documentation</title>
 
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '2.1.2',
+        VERSION:     '2.1.3',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true,
@@ -46,17 +46,53 @@ <h1>WORC.IOparser package<a class="headerlink" href="#worc-ioparser-package" tit
 <div class="section" id="submodules">
 <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this headline">¶</a></h2>
 </div>
-<div class="section" id="worc-ioparser-config-worc-module">
-<h2>WORC.IOparser.config_WORC module<a class="headerlink" href="#worc-ioparser-config-worc-module" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="module-WORC.IOparser.config_WORC">
+<span id="worc-ioparser-config-worc-module"></span><h2>WORC.IOparser.config_WORC module<a class="headerlink" href="#module-WORC.IOparser.config_WORC" title="Permalink to this headline">¶</a></h2>
+<dl class="function">
+<dt id="WORC.IOparser.config_WORC.load_config">
+<code class="descclassname">WORC.IOparser.config_WORC.</code><code class="descname">load_config</code><span class="sig-paren">(</span><em>config_file_path</em><span class="sig-paren">)</span><a class="headerlink" href="#WORC.IOparser.config_WORC.load_config" title="Permalink to this definition">¶</a></dt>
+<dd><p>Parse a WORC configuration file.</p>
+<dl class="docutils">
+<dt>Arguments:</dt>
+<dd>config_file_path: path to the configuration file to be parsed.</dd>
+<dt>Returns:</dt>
+<dd>settings_dict: dictionary containing all parsed settings.</dd>
+</dl>
+</dd></dl>
+
 </div>
-<div class="section" id="worc-ioparser-config-preprocessing-module">
-<h2>WORC.IOparser.config_preprocessing module<a class="headerlink" href="#worc-ioparser-config-preprocessing-module" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="module-WORC.IOparser.config_preprocessing">
+<span id="worc-ioparser-config-preprocessing-module"></span><h2>WORC.IOparser.config_preprocessing module<a class="headerlink" href="#module-WORC.IOparser.config_preprocessing" title="Permalink to this headline">¶</a></h2>
+<dl class="function">
+<dt id="WORC.IOparser.config_preprocessing.load_config">
+<code class="descclassname">WORC.IOparser.config_preprocessing.</code><code class="descname">load_config</code><span class="sig-paren">(</span><em>config_file_path</em><span class="sig-paren">)</span><a class="headerlink" href="#WORC.IOparser.config_preprocessing.load_config" title="Permalink to this definition">¶</a></dt>
+<dd><p>Parse a WORC configuration file.</p>
+<dl class="docutils">
+<dt>Arguments:</dt>
+<dd>config_file_path: path to the configuration file to be parsed.</dd>
+<dt>Returns:</dt>
+<dd>settings_dict: dictionary containing all parsed settings.</dd>
+</dl>
+</dd></dl>
+
 </div>
-<div class="section" id="worc-ioparser-config-segmentix-module">
-<h2>WORC.IOparser.config_segmentix module<a class="headerlink" href="#worc-ioparser-config-segmentix-module" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="module-WORC.IOparser.config_segmentix">
+<span id="worc-ioparser-config-segmentix-module"></span><h2>WORC.IOparser.config_segmentix module<a class="headerlink" href="#module-WORC.IOparser.config_segmentix" title="Permalink to this headline">¶</a></h2>
+<dl class="function">
+<dt id="WORC.IOparser.config_segmentix.load_config">
+<code class="descclassname">WORC.IOparser.config_segmentix.</code><code class="descname">load_config</code><span class="sig-paren">(</span><em>config_file_path</em><span class="sig-paren">)</span><a class="headerlink" href="#WORC.IOparser.config_segmentix.load_config" title="Permalink to this definition">¶</a></dt>
+<dd><p>Parse a segmentix configuration file.</p>
+<dl class="docutils">
+<dt>Arguments:</dt>
+<dd>config_file_path: path to the configuration file to be parsed.</dd>
+<dt>Returns:</dt>
+<dd>settings_dict: dictionary containing all parsed settings.</dd>
+</dl>
+</dd></dl>
+
 </div>
-<div class="section" id="module-contents">
-<h2>Module contents<a class="headerlink" href="#module-contents" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="module-WORC.IOparser">
+<span id="module-contents"></span><h2>Module contents<a class="headerlink" href="#module-WORC.IOparser" title="Permalink to this headline">¶</a></h2>
 </div>
 </div>
 
@@ -70,10 +106,10 @@ <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
 <li><a class="reference internal" href="#">WORC.IOparser package</a><ul>
 <li><a class="reference internal" href="#submodules">Submodules</a></li>
-<li><a class="reference internal" href="#worc-ioparser-config-worc-module">WORC.IOparser.config_WORC module</a></li>
-<li><a class="reference internal" href="#worc-ioparser-config-preprocessing-module">WORC.IOparser.config_preprocessing module</a></li>
-<li><a class="reference internal" href="#worc-ioparser-config-segmentix-module">WORC.IOparser.config_segmentix module</a></li>
-<li><a class="reference internal" href="#module-contents">Module contents</a></li>
+<li><a class="reference internal" href="#module-WORC.IOparser.config_WORC">WORC.IOparser.config_WORC module</a></li>
+<li><a class="reference internal" href="#module-WORC.IOparser.config_preprocessing">WORC.IOparser.config_preprocessing module</a></li>
+<li><a class="reference internal" href="#module-WORC.IOparser.config_segmentix">WORC.IOparser.config_segmentix module</a></li>
+<li><a class="reference internal" href="#module-WORC.IOparser">Module contents</a></li>
 </ul>
 </li>
 </ul>