Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: "3.9"
python-version: "3.12"

# Install and run pre-commit
- run: |
Expand All @@ -28,15 +28,15 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: [3.12]
config:
- {
name: "Linux",
os: ubuntu-latest
}
# Moose is not working on x86_64 Mac because the following command has
# dependency conflicts in the solver between Moose and ParaView:
# micromamba create -n moose python=3.9 moose paraview -y -c https://conda.software.inl.gov/public
# micromamba create -n moose python=3.12 moose paraview -y -c https://conda.software.inl.gov/public
# - {
# name: "MacOSX",
# os: macos-latest
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Install Moose and ParaView
run: |
micromamba create -n moose python=3.9 moose paraview -y -c https://conda.software.inl.gov/public
micromamba create -n moose python=3.12 moose paraview -y -c https://conda.software.inl.gov/public

- name: Install and Run Tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ repos:
- id: codespell

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
rev: 7.3.0
hooks:
- id: flake8
6 changes: 3 additions & 3 deletions setup-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ mkdir peacock-work
cd peacock-work
git clone --recursive git@github.com:Kitware/peacock.git
git clone --recursive https://github.com/idaholab/moose.git
curl -LO https://www.paraview.org/files/v5.11/ParaView-5.11.0-MPI-OSX11.0-Python3.9-arm64.dmg
curl -LO https://www.paraview.org/files/v6.0/ParaView-6.0.1-MPI-OSX11.0-Python3.12-arm64.dmg
# Mount and copy ParaView-5.11.0.app/ in the current directory


mamba install python=3.9
mamba create -p ./venv python=3.9 moose-tools moose-libmesh
mamba install python=3.12
mamba create -p ./venv python=3.12 moose-tools moose-libmesh
mamba activate ./venv
pip install ./peacock

Expand Down
Loading