Skip to content

Commit 494623c

Browse files
authored
Merge pull request #267 from sbillinge/install_tweak
install tweak
2 parents 894b2a4 + 9a0cf41 commit 494623c

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

README.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ macOS (Arm64)
9595

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

98-
conda create -n diffpy.pdfgui_env python=3.13
98+
conda config --add channels conda-forge
99+
conda create -n diffpy.pdfgui_env python=3.13
99100

100101
Activate the environment: ::
101102

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

108+
conda install wxpython diffpy.utils diffpy.structure matplotlib-base pycifrw numpy
107109
pip install diffpy.pdffit2
108110

109-
Confirm that the installation was successful: ::
110-
111-
python -c "import diffpy.pdffit2; print(diffpy.pdffit2.__version__)"
112-
113-
Now we want to install PDFgui and dependencies from conda-forge: ::
111+
Now we want to install PDFgui from conda-forge: ::
114112

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

118115

news/tweak-install.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* no-news needed: just tweaking installation instructions
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

0 commit comments

Comments
 (0)