Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel' into trivial
Browse files Browse the repository at this point in the history
  • Loading branch information
joshua-cogliati-inl committed Dec 12, 2023
2 parents baf6f9f + 700faf2 commit 3b85cef
Show file tree
Hide file tree
Showing 34 changed files with 5,913 additions and 4,964 deletions.
2 changes: 1 addition & 1 deletion dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Note all install methods after "main" take
<tensorflow source="pip">2.13</tensorflow>
<grpcio source="pip" />
<!-- conda is really slow on windows if the version is not specified.-->
<python skip_check='True' os='windows'>3.8</python>
<python skip_check='True' os='windows'>3.10</python>
<python skip_check='True' os='mac,linux'>3</python>
<hdf5 skip_check='True'/>
<swig skip_check='True'/>
Expand Down
12 changes: 6 additions & 6 deletions developer_tools/check_pip_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ ls -l dist
#python -m pip install -f file://${RAVEN_DIR}/dist raven_framework || exit -1

echo
echo Checking Python 3.8
echo Checking Python 3.9

conda activate python38_pip
conda activate python39_pip
python -m pip uninstall -y raven_framework || echo not installed
python -m pip install dist/raven_framework*cp38*.whl || exit -1
python -m pip install dist/raven_framework*cp39*.whl || exit -1


echo
echo Checking Python 3.9
echo Checking Python 3.10

conda activate python39_pip
conda activate python310_pip
python -m pip uninstall -y raven_framework || echo not installed
python -m pip install dist/raven_framework*cp39*.whl || exit -1
python -m pip install dist/raven_framework*cp310*.whl || exit -1
10 changes: 5 additions & 5 deletions developer_tools/make_pip_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ source $RAVEN_DIR/scripts/read_ravenrc.sh
CONDA_DEFS=$(read_ravenrc "CONDA_DEFS")
source ${CONDA_DEFS}

conda env remove --name python38_pip
conda create -y --name python38_pip python=3.8 swig

conda env remove --name python39_pip
conda create -y --name python39_pip python=3.9 swig

conda env remove --name python310_pip
conda create -y --name python310_pip python=3.10 swig

cd $RAVEN_DIR

rm -f setup.cfg
python ./scripts/library_handler.py pip --action=setup.cfg > setup.cfg

conda activate python38_pip
conda activate python39_pip
command -v python
python -m ensurepip
python -m pip install --upgrade build
python -m build

conda activate python39_pip
conda activate python310_pip
command -v python
python -m ensurepip
python -m pip install --upgrade build
Expand Down
2 changes: 1 addition & 1 deletion plugins/FARM
2 changes: 1 addition & 1 deletion plugins/HERON
123 changes: 59 additions & 64 deletions ravenframework/Distributions.py

Large diffs are not rendered by default.

Loading

0 comments on commit 3b85cef

Please sign in to comment.