Skip to content

Commit

Permalink
Automatic deploy (build number 553)
Browse files Browse the repository at this point in the history
  • Loading branch information
ConanCI bot committed Sep 27, 2023
1 parent 085020f commit e17e9c3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions 2.0/_sources/reference/tools/env/envvars.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ aggregate and create a ``conanrun.bat|sh|ps1`` script:
.. code:: python
def generate(self):
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
envvars = env1.vars(self, scope="run")
# Will append "my_env_file" to "conanrun.bat|sh|ps1"
Expand All @@ -53,7 +53,7 @@ You can also use ``scope=None`` argument to avoid appending the script to the ag

.. code:: python
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
# Will not append "my_env_file" to "conanbuild.bat|sh|ps1"
envvars = env1.vars(self, scope=None)
Expand Down Expand Up @@ -88,7 +88,7 @@ As an alternative to running a command, environments can be applied in the pytho
from conan.tools.env import Environment
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
envvars = env1.vars(self)
with envvars.apply():
Expand Down
Binary file modified 2.0/conan.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions 2.0/reference/tools/env/envvars.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ <h2>Creating environment files<a class="headerlink" href="#creating-environment-
aggregate them separately. For example, using a <code class="docutils literal notranslate"><span class="pre">scope=&quot;run&quot;</span></code>, like the <code class="docutils literal notranslate"><span class="pre">VirtualRunEnv</span></code> generator does, will
aggregate and create a <code class="docutils literal notranslate"><span class="pre">conanrun.bat|sh|ps1</span></code> script:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="nf">generate</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">scope</span><span class="o">=</span><span class="s2">&quot;run&quot;</span><span class="p">)</span>
<span class="c1"># Will append &quot;my_env_file&quot; to &quot;conanrun.bat|sh|ps1&quot;</span>
<span class="n">envvars</span><span class="o">.</span><span class="n">save_script</span><span class="p">(</span><span class="s2">&quot;my_env_file&quot;</span><span class="p">)</span>
</pre></div>
</div>
<p>You can also use <code class="docutils literal notranslate"><span class="pre">scope=None</span></code> argument to avoid appending the script to the aggregated <code class="docutils literal notranslate"><span class="pre">conanbuild.bat|sh|ps1</span></code>:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="c1"># Will not append &quot;my_env_file&quot; to &quot;conanbuild.bat|sh|ps1&quot;</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">scope</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
Expand Down Expand Up @@ -300,7 +300,7 @@ <h2>Applying the environment variables<a class="headerlink" href="#applying-the-
<p>As an alternative to running a command, environments can be applied in the python environment:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">conan.tools.env</span> <span class="kn">import</span> <span class="n">Environment</span>

<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="k">with</span> <span class="n">envvars</span><span class="o">.</span><span class="n">apply</span><span class="p">():</span>
Expand Down
6 changes: 3 additions & 3 deletions 2/_sources/reference/tools/env/envvars.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ aggregate and create a ``conanrun.bat|sh|ps1`` script:
.. code:: python
def generate(self):
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
envvars = env1.vars(self, scope="run")
# Will append "my_env_file" to "conanrun.bat|sh|ps1"
Expand All @@ -53,7 +53,7 @@ You can also use ``scope=None`` argument to avoid appending the script to the ag

.. code:: python
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
# Will not append "my_env_file" to "conanbuild.bat|sh|ps1"
envvars = env1.vars(self, scope=None)
Expand Down Expand Up @@ -88,7 +88,7 @@ As an alternative to running a command, environments can be applied in the pytho
from conan.tools.env import Environment
env1 = Environment(self)
env1 = Environment()
env1.define("foo", "var")
envvars = env1.vars(self)
with envvars.apply():
Expand Down
Binary file modified 2/conan.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions 2/reference/tools/env/envvars.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ <h2>Creating environment files<a class="headerlink" href="#creating-environment-
aggregate them separately. For example, using a <code class="docutils literal notranslate"><span class="pre">scope=&quot;run&quot;</span></code>, like the <code class="docutils literal notranslate"><span class="pre">VirtualRunEnv</span></code> generator does, will
aggregate and create a <code class="docutils literal notranslate"><span class="pre">conanrun.bat|sh|ps1</span></code> script:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="k">def</span> <span class="nf">generate</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">scope</span><span class="o">=</span><span class="s2">&quot;run&quot;</span><span class="p">)</span>
<span class="c1"># Will append &quot;my_env_file&quot; to &quot;conanrun.bat|sh|ps1&quot;</span>
<span class="n">envvars</span><span class="o">.</span><span class="n">save_script</span><span class="p">(</span><span class="s2">&quot;my_env_file&quot;</span><span class="p">)</span>
</pre></div>
</div>
<p>You can also use <code class="docutils literal notranslate"><span class="pre">scope=None</span></code> argument to avoid appending the script to the aggregated <code class="docutils literal notranslate"><span class="pre">conanbuild.bat|sh|ps1</span></code>:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="c1"># Will not append &quot;my_env_file&quot; to &quot;conanbuild.bat|sh|ps1&quot;</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">scope</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
Expand Down Expand Up @@ -300,7 +300,7 @@ <h2>Applying the environment variables<a class="headerlink" href="#applying-the-
<p>As an alternative to running a command, environments can be applied in the python environment:</p>
<div class="code python highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">conan.tools.env</span> <span class="kn">import</span> <span class="n">Environment</span>

<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="n">env1</span> <span class="o">=</span> <span class="n">Environment</span><span class="p">()</span>
<span class="n">env1</span><span class="o">.</span><span class="n">define</span><span class="p">(</span><span class="s2">&quot;foo&quot;</span><span class="p">,</span> <span class="s2">&quot;var&quot;</span><span class="p">)</span>
<span class="n">envvars</span> <span class="o">=</span> <span class="n">env1</span><span class="o">.</span><span class="n">vars</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
<span class="k">with</span> <span class="n">envvars</span><span class="o">.</span><span class="n">apply</span><span class="p">():</span>
Expand Down

0 comments on commit e17e9c3

Please sign in to comment.