Skip to content

Commit daebf78

Browse files
committed
Merge branch 'pdf' into docs
2 parents f3b7b8a + 09741a3 commit daebf78

File tree

6 files changed

+12298
-0
lines changed

6 files changed

+12298
-0
lines changed

.github/workflows/ci-testing.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,19 @@ jobs:
4747
shell: bash
4848
run: python -m pip install --upgrade pip
4949

50+
- name: Setup conda
51+
uses: s-weigand/setup-conda@v1
52+
if: runner.os == 'Windows'
53+
with:
54+
update-conda: true
55+
python-version: ${{ matrix.python-version }}
56+
conda-channels: conda-forge
57+
58+
- name: Install libcblas for pdffit on Windows
59+
shell: bash
60+
if: runner.os == 'Windows'
61+
run: conda install -y -c conda-forge libcblas
62+
5063
- name: Install Python dependencies
5164
shell: bash
5265
run: python -m pip install -r requirements.txt

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ Development playground for the new EasyDiffraction API.
3333
python -c "from pycrysfml import cfml_py_utilities"
3434
```
3535

36+
- Install CBLAS library, required for using the Pair Distribution Function feature.
37+
This step is required only on Windows.
38+
```bash
39+
# Install from the conda-forge channel
40+
conda install libcblas -c conda-forge
41+
42+
# Try to import the module
43+
python -c "import diffpy.pdffit2"
44+
```
45+
3646
## Testing
3747

3848
- Functional tests:

0 commit comments

Comments
 (0)