Skip to content

Commit

Permalink
Merge pull request #72 from singularityhub/fix/env-emptyvalue
Browse files Browse the repository at this point in the history
Fix/env emptyvalue
  • Loading branch information
vsoch committed Oct 29, 2018
2 parents 0f28a00 + 4cdc636 commit 9dfef9d
Show file tree
Hide file tree
Showing 53 changed files with 109 additions and 135 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- ENV variables in Dockerfile can be empty (like unsetting) (0.0.46)
- COPY can handle multiple sources to one destination for Dockerfile parser (0.0.45)
- Adding DockerRecipe, SingularityRecipe "load" action to load file
- issue #64 bug with hanging instances (0.0.44)
Expand Down
2 changes: 2 additions & 0 deletions docs/api/_sources/changelog.md.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- ENV variables in Dockerfile can be empty (like unsetting) (0.0.46)
- COPY can handle multiple sources to one destination for Dockerfile parser (0.0.45)
- Adding DockerRecipe, SingularityRecipe "load" action to load file
- issue #64 bug with hanging instances (0.0.44)
- flexible error printing given command to terminal fails (0.0.43)
- adding name_by_commit and name_by_hash to pull (0.0.42)
Expand Down
6 changes: 4 additions & 2 deletions docs/api/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<link rel="stylesheet" href="assets/pygments.css" type="text/css" />
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="prev" title="spython.utils Module" href="source/spython.utils.html" />
<link rel="prev" title="spython.utils package" href="source/spython.utils.html" />


<script src="assets/js/modernizr.min.js"></script>
Expand Down Expand Up @@ -171,7 +171,9 @@
<div class="section" id="master">
<span id="master"></span><h2><a class="reference external" href="https://github.com/singularityhub/singularity-cli/tree/master">master</a><a class="headerlink" href="#master" title="Permalink to this headline"></a></h2>
<ul class="simple">
<li>ENV variables in Dockerfile can be empty (like unsetting) (0.0.46)</li>
<li>COPY can handle multiple sources to one destination for Dockerfile parser (0.0.45)</li>
<li>Adding DockerRecipe, SingularityRecipe “load” action to load file</li>
<li>issue #64 bug with hanging instances (0.0.44)</li>
<li>flexible error printing given command to terminal fails (0.0.43)</li>
<li>adding name_by_commit and name_by_hash to pull (0.0.42)</li>
Expand Down Expand Up @@ -209,7 +211,7 @@
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">


<a href="source/spython.utils.html" class="btn btn-neutral" title="spython.utils Module" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
<a href="source/spython.utils.html" class="btn btn-neutral" title="spython.utils package" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>

</div>

Expand Down
2 changes: 2 additions & 0 deletions docs/api/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ <h2 id="L">L</h2>

<ul>
<li><a href="source/spython.main.base.html#spython.main.base.Client.load">(spython.main.base.Client method)</a>
</li>
<li><a href="source/spython.main.parse.html#spython.main.parse.recipe.Recipe.load">(spython.main.parse.recipe.Recipe method)</a>
</li>
</ul></li>
</ul></td>
Expand Down
3 changes: 0 additions & 3 deletions docs/api/modules/spython/client.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,6 @@
<h1>Source code for spython.client</h1><div class="highlight"><pre>
<span></span><span class="ch">#!/usr/bin/env python</span>


<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/client/recipe.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@

<h1>Source code for spython.client.recipe</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/client/shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@

<h1>Source code for spython.client.shell</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/client/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@

<h1>Source code for spython.client.test</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/image.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@

<h1>Source code for spython.image</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
5 changes: 2 additions & 3 deletions docs/api/modules/spython/image/cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.image.cmd</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand All @@ -166,7 +165,7 @@ <h1>Source code for spython.image.cmd</h1><div class="highlight"><pre>
<span class="c1"># along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.</span>


<div class="viewcode-block" id="generate_image_commands"><a class="viewcode-back" href="../../../source/spython.image.cmd.html#spython.main.base.generate_image_commands">[docs]</a><span class="k">def</span> <span class="nf">generate_image_commands</span><span class="p">():</span>
<div class="viewcode-block" id="generate_image_commands"><a class="viewcode-back" href="../../../source/spython.image.cmd.html#spython.image.cmd.generate_image_commands">[docs]</a><span class="k">def</span> <span class="nf">generate_image_commands</span><span class="p">():</span>
<span class="sd">&#39;&#39;&#39; The Image client holds the Singularity image command group, mainly</span>
<span class="sd"> deprecated commands (image.import) and additional command helpers</span>
<span class="sd"> that are commonly use but not provided by Singularity</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/image/cmd/export.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@

<h1>Source code for spython.image.cmd.export</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/image/cmd/importcmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@

<h1>Source code for spython.image.cmd.importcmd</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/image/cmd/utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@

<h1>Source code for spython.image.cmd.utils</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
9 changes: 4 additions & 5 deletions docs/api/modules/spython/instance.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.instance</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand All @@ -167,7 +166,7 @@ <h1>Source code for spython.instance</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">spython.image</span> <span class="k">import</span> <span class="n">ImageBase</span>
<span class="kn">import</span> <span class="nn">os</span>

<div class="viewcode-block" id="Instance"><a class="viewcode-back" href="../../source/spython.instance.html#spython.main.base.Instance">[docs]</a><span class="k">class</span> <span class="nc">Instance</span><span class="p">(</span><span class="n">ImageBase</span><span class="p">):</span>
<div class="viewcode-block" id="Instance"><a class="viewcode-back" href="../../source/spython.instance.html#spython.instance.Instance">[docs]</a><span class="k">class</span> <span class="nc">Instance</span><span class="p">(</span><span class="n">ImageBase</span><span class="p">):</span>

<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">image</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
<span class="sd">&#39;&#39;&#39;An instance is an image running as an instance with services.</span>
Expand All @@ -194,7 +193,7 @@ <h1>Source code for spython.instance</h1><div class="highlight"><pre>

<span class="c1"># Unique resource identifier</span>

<div class="viewcode-block" id="Instance.parse_image_name"><a class="viewcode-back" href="../../source/spython.instance.html#spython.main.base.Instance.parse_image_name">[docs]</a> <span class="k">def</span> <span class="nf">parse_image_name</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">image</span><span class="p">):</span>
<div class="viewcode-block" id="Instance.parse_image_name"><a class="viewcode-back" href="../../source/spython.instance.html#spython.instance.Instance.parse_image_name">[docs]</a> <span class="k">def</span> <span class="nf">parse_image_name</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">image</span><span class="p">):</span>
<span class="sd">&#39;&#39;&#39;</span>
<span class="sd"> simply split the uri from the image. Singularity handles</span>
<span class="sd"> parsing of registry, namespace, image.</span>
Expand All @@ -208,7 +207,7 @@ <h1>Source code for spython.instance</h1><div class="highlight"><pre>
<span class="bp">self</span><span class="o">.</span><span class="n">uri</span> <span class="o">=</span> <span class="s1">&#39;instance://&#39;</span></div>


<div class="viewcode-block" id="Instance.get_uri"><a class="viewcode-back" href="../../source/spython.instance.html#spython.main.base.Instance.get_uri">[docs]</a> <span class="k">def</span> <span class="nf">get_uri</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<div class="viewcode-block" id="Instance.get_uri"><a class="viewcode-back" href="../../source/spython.instance.html#spython.instance.Instance.get_uri">[docs]</a> <span class="k">def</span> <span class="nf">get_uri</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="sd">&#39;&#39;&#39;return the image uri (instance://) along with it&#39;s name</span>
<span class="sd"> &#39;&#39;&#39;</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="fm">__str__</span><span class="p">()</span></div>
Expand Down
3 changes: 1 addition & 2 deletions docs/api/modules/spython/instance/cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.instance.cmd</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
3 changes: 1 addition & 2 deletions docs/api/modules/spython/instance/cmd/iutils.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.instance.cmd.iutils</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
3 changes: 1 addition & 2 deletions docs/api/modules/spython/instance/cmd/start.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.instance.cmd.start</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
3 changes: 1 addition & 2 deletions docs/api/modules/spython/instance/cmd/stop.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
<div itemprop="articleBody">

<h1>Source code for spython.instance.cmd.stop</h1><div class="highlight"><pre>
<span></span><span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span></span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/logger/message.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@

<h1>Source code for spython.logger.message</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2016-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/logger/spinner.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@

<h1>Source code for spython.logger.spinner</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@

<h1>Source code for spython.main</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/main/apps.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@

<h1>Source code for spython.main.apps</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/main/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@

<h1>Source code for spython.main.base</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/main/base/command.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@

<h1>Source code for spython.main.base.command</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/modules/spython/main/base/flags.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@

<h1>Source code for spython.main.base.flags</h1><div class="highlight"><pre>
<span></span>
<span class="c1"># Copyright (C) 2018 The Board of Trustees of the Leland Stanford Junior</span>
<span class="c1"># University.</span>
<span class="c1"># Copyright (C) 2017-2018 Vanessa Sochat.</span>

<span class="c1"># This program is free software: you can redistribute it and/or modify it</span>
Expand Down

0 comments on commit 9dfef9d

Please sign in to comment.