Skip to content

Commit ce013d9

Browse files
committed
Sync with the source at 0188983
1 parent 8101779 commit ce013d9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

products/pdfgui.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ <h2>Installation<a class="headerlink" href="#installation" title="Link to this h
120120
<strong>Miniconda</strong> (<a class="reference external" href="https://docs.conda.io/en/latest/miniconda.html#latest-miniconda-installer-links">https://docs.conda.io/en/latest/miniconda.html#latest-miniconda-installer-links</a>)
121121
or Anaconda Python (<a class="reference external" href="https://www.anaconda.com/download">https://www.anaconda.com/download</a>).</p>
122122
<p>PDFgui is available from the “conda-forge” channel of Anaconda packages.</p>
123-
<p>There are currently two different sets of instructions o install it depending on your platform.
123+
<p>There are currently two different sets of instructions to install it depending on your platform.
124124
If you want to install it on Windows, Linux, or a non-arm64 Mac OSX (i.e., if at the time of writing
125125
your Mac does not have an M1 or M2 chip) use the first set, otherwise the second set of instructions</p>
126126
<section id="windows-macos-non-arm64-linux">
@@ -154,13 +154,13 @@ <h3>macOS (Arm64)<a class="headerlink" href="#macos-arm64" title="Link to this h
154154
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>conda<span class="w"> </span>activate<span class="w"> </span>diffpy.pdfgui_env
155155
</pre></div>
156156
</div>
157-
<p>It is necessary to get versions of pdffit2 built for Mac from Python package index (Pypi). To install
158-
pdffit2 from Pypi using <code class="docutils literal notranslate"><span class="pre">pip</span></code> to download and install the latest version from <a class="reference external" href="https://pypi.python.org">Python Package Index</a>:</p>
157+
<p>It is necessary to get versions of pdffit2 built for Mac from Python package index (Pypi). First we will install all
158+
the dependencies from conda-forge and then the pdffit2 itself from Pypi using the following commands:</p>
159159
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>conda<span class="w"> </span>install<span class="w"> </span>wxpython<span class="w"> </span>diffpy.utils<span class="w"> </span>matplotlib-base<span class="w"> </span>pycifrw
160160
pip<span class="w"> </span>install<span class="w"> </span>diffpy.pdffit2
161161
</pre></div>
162162
</div>
163-
<p>Finally, we want to install PDFgui from conda-forge:</p>
163+
<p>Finally, we want to install PDFgui, again from conda-forge:</p>
164164
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>conda<span class="w"> </span>install<span class="w"> </span>diffpy.pdfgui<span class="w"> </span>--no-deps
165165
</pre></div>
166166
</div>

0 commit comments

Comments
 (0)