Skip to content

Commit

Permalink
Merge pull request #267 from sbillinge/install_tweak
Browse files Browse the repository at this point in the history
install tweak
  • Loading branch information
sbillinge authored Jan 29, 2025
2 parents 894b2a4 + 9a0cf41 commit 494623c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
11 changes: 4 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ macOS (Arm64)

Create a new conda environment ``diffpy.pdfgui_env``: ::

conda create -n diffpy.pdfgui_env python=3.13
conda config --add channels conda-forge
conda create -n diffpy.pdfgui_env python=3.13

Activate the environment: ::

Expand All @@ -104,15 +105,11 @@ Activate the environment: ::
It is necessary to get versions of pdffit2 built for Mac from Python package index (Pypi). To install
pdffit2 from Pypi using ``pip`` to download and install the latest version from `Python Package Index <https://pypi.python.org>`_: ::

conda install wxpython diffpy.utils diffpy.structure matplotlib-base pycifrw numpy
pip install diffpy.pdffit2

Confirm that the installation was successful: ::

python -c "import diffpy.pdffit2; print(diffpy.pdffit2.__version__)"

Now we want to install PDFgui and dependencies from conda-forge: ::
Now we want to install PDFgui from conda-forge: ::

conda install wxpython diffpy.utils matplotlib-base
conda install diffpy.pdfgui --no-deps


Expand Down
23 changes: 23 additions & 0 deletions news/tweak-install.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* no-news needed: just tweaking installation instructions

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>

0 comments on commit 494623c

Please sign in to comment.