Skip to content

Py39/cantera26 arm #2765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacksonBurns merged 6 commits into from
Feb 25, 2025
Merged

Py39/cantera26 arm #2765

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78f9b80
forbid incompatible numpy version
JacksonBurns Feb 25, 2025
abcd453
run ci on arm macs natively
JacksonBurns Feb 25, 2025
bb62a47
get cantera from conda-forge, which has arm mac binaries
JacksonBurns Feb 25, 2025
784c8e9
remove cantera channel from environment file
JacksonBurns Feb 25, 2025
0e7f839
don't patch the channels in the CI
JacksonBurns Feb 25, 2025
a101ec4
change lt to leq to account for slightly different arm mac floating p…
JacksonBurns Feb 25, 2025
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: 0 additions & 8 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ jobs:
os: [macos-13, macos-latest, ubuntu-latest]
include-rms: ["", "with RMS"]
exclude:
- os: macos-latest # needs Cantera 3 b/c x86 emulation breaks with Julia
include-rms: 'with RMS'
- os: macos-13 # GitHub's runners just aren't up to the task of installing Julia
include-rms: 'with RMS'
runs-on: ${{ matrix.os }}
Expand All @@ -73,10 +71,6 @@ jobs:
- name: Checkout RMG-Py
uses: actions/checkout@v4

- name: Compel Arm-based Mac to use x86
if: matrix.os == 'macos-latest'
run: echo "CONDA_SUBDIR=osx-64" >> $GITHUB_ENV

- name: Setup Miniforge Python ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v3
with:
Expand All @@ -87,7 +81,6 @@ jobs:
activate-environment: rmg_env
auto-update-conda: true
show-channel-urls: true
channels: conda-forge,cantera,rmg
conda-remove-defaults: "true"

# list the environment for debugging purposes
Expand Down Expand Up @@ -164,7 +157,6 @@ jobs:
activate-environment: rmg_env
auto-update-conda: true
show-channel-urls: true
channels: conda-forge,cantera,rmg
conda-remove-defaults: "true"

# list the environment for debugging purposes
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
activate-environment: rmg_env
use-mamba: true
show-channel-urls: true
channels: conda-forge,cantera,rmg

- name: Install sphinx
run: mamba install -y sphinx
Expand Down
5 changes: 2 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
name: rmg_env
channels:
- conda-forge
- cantera
- rmg
dependencies:
# System-level dependencies - we could install these at the OS level
Expand All @@ -46,7 +45,7 @@ dependencies:

# external software tools for chemistry
- conda-forge::coolprop
- cantera::cantera =2.6
- conda-forge::cantera =2.6
- conda-forge::mopac
# see https://github.com/ReactionMechanismGenerator/RMG-Py/pull/2639#issuecomment-2050292972
- conda-forge::cclib >=1.6.3,<1.9
Expand All @@ -59,7 +58,7 @@ dependencies:
- conda-forge::cython >=0.25.2
- conda-forge::scikit-learn
- conda-forge::scipy >=1.9
- conda-forge::numpy >=1.10.0
- conda-forge::numpy >=1.10.0,<2
- conda-forge::pydot
- conda-forge::jinja2
- conda-forge::jupyter
Expand Down