Skip to content

Commit

Permalink
moving pip installs from extra.yml into other requirements.txts
Browse files Browse the repository at this point in the history
  • Loading branch information
jlnav committed Aug 30, 2024
1 parent 480dc05 commit 371adcf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 21 deletions.
27 changes: 8 additions & 19 deletions .github/workflows/extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,15 @@ jobs:
- name: Install generator dependencies
run: |
python -m pip install --upgrade pip
pip install mpmath
pip install matplotlib
conda env update --file install/gen_deps_environment.yml
#- name: Install ax-platform
# run: pip install "ax-platform<=0.4.0"

- name: Install gpcam
if: matrix.python-version != '3.12'
run: |
pip install gpcam
- name: Install surmise
if: matrix.os != 'macos-latest'
- name: Install some non-macOS dependencies
if: matrix.os == 'ubuntu-latest'
run: |
pip install git+https://github.com/bandframework/surmise.git
pip install -r install/ubuntu_pypi.txt
- name: Build ytopt and dependencies
if: matrix.python-version <= '3.10' && matrix.os != 'macos-latest'
if: matrix.python-version <= '3.10' && matrix.os == 'ubuntu-latest'
run: |
pip install scikit-learn==1.4.0
pip install pandas==2.2.1
Expand All @@ -133,13 +123,12 @@ jobs:
pip install .
cd ..
- name: Install generator dependencies for Ubuntu tests
- name: Install generator dependencies for Ubuntu tests, not Python 3.12
if: matrix.os == 'ubuntu-latest' && matrix.python-version != '3.12'
run: |
sudo apt-get install bc
pip install git+https://github.com/jlnav/dragonfly.git@fix/remove_npobject
pip install scikit-build packaging Tasmanian --user
pip install -r install/ubuntu_no312.txt
pip install Tasmanian --user
- name: Install Balsam on Pydantic 1
if: matrix.pydantic-version == '1.10.17'
Expand All @@ -165,7 +154,7 @@ jobs:
popd
- name: Build heffte
if: matrix.os != 'macos-latest'
if: matrix.os == 'ubuntu-latest'
run: |
# begin heffte build and dependencies
sudo apt install libfftw3-dev
Expand Down
2 changes: 0 additions & 2 deletions install/gen_deps_pypi.txt

This file was deleted.

1 change: 1 addition & 0 deletions install/testing_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ mock==5.1.0
python-dateutil==2.9.0.post0
anyio==4.4.0
matplotlib==3.9.2
mpmath==1.3.0

0 comments on commit 371adcf

Please sign in to comment.