Skip to content

Commit

Permalink
remove pycifrw dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
newville committed Sep 25, 2024
1 parent b2bfb8d commit 85e52bf
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion installers/GetLarch.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ echo ## basic mamba installed, running updates
set PATH=%prefix%;%prefix%\bin;%prefix%\condabin;%prefix%\Scripts;%PATH%

echo ## Installing basic python scipy packages
call %prefix%\Scripts\mamba install -yc conda-forge python==3.11.5 numpy scipy matplotlib h5py scikit-image scikit-learn pycifrw pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy
call %prefix%\Scripts\mamba install -yc conda-forge python==3.11.5 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy

echo ## Installing xraylarch and dependencies from PyPI
call %prefix%\Scripts\pip install xraylarch[larix]
Expand Down
2 changes: 1 addition & 1 deletion installers/GetLarch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ condafile="Mambaforge-$uname-x86_64.sh"
logfile=GetLarch.log

## set list of conda packages to install from conda-forge
cforge_pkgs="python=>3.12.3 numpy scipy matplotlib h5py scikit-image scikit-learn pycifrw pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy"
cforge_pkgs="python=>3.12.3 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy"

unset CONDA_EXE CONDA_PYTHON_EXE CONDA_PREFIX PROJ_LIB

Expand Down
1 change: 0 additions & 1 deletion installers/conda_constructor/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,4 @@ specs:
- wxpython>=4.2.0
- tomopy
- pymatgen
- pycifrw
- numdifftools

0 comments on commit 85e52bf

Please sign in to comment.