mirror of
https://github.com/wassname/catalyst.git
synced 2026-07-26 13:18:31 +08:00
DOC: merging branches
This commit is contained in:
+14
-2
@@ -79,7 +79,10 @@
|
||||
<li class="toctree-l4"><a class="reference internal" href="#osx-virtualenv-matplotlib">OSX + virtualenv + matplotlib</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="toctree-l3"><a class="reference internal" href="#windows">Windows</a></li>
|
||||
<li class="toctree-l3"><a class="reference internal" href="#windows">Windows</a><ul>
|
||||
<li class="toctree-l4"><a class="reference internal" href="#troubleshooting-visual-c-compiler-install">Troubleshooting Visual C++ Compiler Install</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="toctree-l3"><a class="reference internal" href="#amazon-linux-ami">Amazon Linux AMI</a></li>
|
||||
<li class="toctree-l3"><a class="reference internal" href="#troubleshooting-pip-install">Troubleshooting <code class="docutils literal"><span class="pre">pip</span></code> Install</a></li>
|
||||
</ul>
|
||||
@@ -192,7 +195,8 @@ your particular platform), you should be able to simply run</p>
|
||||
that you install in a <a class="reference external" href="https://virtualenv.readthedocs.org/en/latest">virtualenv</a>. The <a class="reference external" href="http://docs.python-guide.org/en/latest/">Hitchhiker’s Guide to
|
||||
Python</a> provides an <a class="reference external" href="http://docs.python-guide.org/en/latest/dev/virtualenvs/">excellent tutorial on virtualenv</a>. Here’s a summarized
|
||||
version:</p>
|
||||
<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>virtualenv catalyst-venv
|
||||
<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>pip install virtualenv
|
||||
<span class="nv">$ </span>virtualenv catalyst-venv
|
||||
<span class="nv">$ </span><span class="nb">source</span> ./catalyst-venv/bin/activate
|
||||
<span class="nv">$ </span>pip install enigma-catalyst
|
||||
</pre></div>
|
||||
@@ -255,6 +259,14 @@ binary wheels for Python 2.7 packages. If it’s not already in your system,
|
||||
it and install it before proceeding to the next step.</p>
|
||||
<p>For windows, the easiest and best supported way to install Catalyst is to use
|
||||
<a class="reference internal" href="#conda"><span>Conda</span></a>.</p>
|
||||
<div class="section" id="troubleshooting-visual-c-compiler-install">
|
||||
<h4>Troubleshooting Visual C++ Compiler Install<a class="headerlink" href="#troubleshooting-visual-c-compiler-install" title="Permalink to this headline">¶</a></h4>
|
||||
<p>We run into two different errors when trying to install the the <cite>Microsoft Visual C++
|
||||
Compiler for Python 2.7</cite> mentioned above:</p>
|
||||
<ul class="simple">
|
||||
<li></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section" id="amazon-linux-ami">
|
||||
<h3>Amazon Linux AMI<a class="headerlink" href="#amazon-linux-ami" title="Permalink to this headline">¶</a></h3>
|
||||
|
||||
Reference in New Issue
Block a user