Skip to content

Commit 3f085e4

Browse files
JacksonBurnsJacksonBurns
committed
revise conda recipe and associated CI
1 parent 24284bc commit 3f085e4

File tree

5 files changed

+162
-110
lines changed

5 files changed

+162
-110
lines changed

‎.conda/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
# Install RMG
21
make install
3-
4-
# lazy "install" of everything in our 'external' folder.
5-
# most of which should probably be elsewhere
6-
cp -R ${SRC_DIR}/external ${SP_DIR}

‎.conda/conda_build_config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@ python:
22
- 3.7
33
numpy:
44
- 1.15
5-
6-
# Specifically for Travis build. Should change if building locally.
7-
CONDA_BUILD_SYSROOT:
8-
- /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk # [osx]

‎.conda/meta.yaml

Lines changed: 139 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -11,76 +11,155 @@ build:
1111

1212
requirements:
1313
build:
14-
- {{ compiler('c') }} # [unix]
14+
- {{ compiler('c') }}
1515
host:
16-
- cython >=0.25.2
17-
- lpsolve55
18-
- numpy
19-
- openbabel >=3
20-
- pydas >=1.0.2
21-
- pydqed >=1.0.1
22-
- pyrdl
23-
- python
24-
- quantities
25-
- rdkit >=2018
26-
- scipy
27-
- setuptools
16+
- conda-forge::cairo
17+
- conda-forge::cairocffi
18+
- conda-forge::ffmpeg
19+
- conda-forge::xlrd
20+
- conda-forge::xlwt
21+
- conda-forge::h5py
22+
- conda-forge::graphviz
23+
- conda-forge::markupsafe
24+
- conda-forge::psutil
25+
- conda-forge::ncurses
26+
- conda-forge::suitesparse
27+
- conda-forge::coolprop
28+
- cantera::cantera =2.6
29+
- conda-forge::mopac
30+
- conda-forge::cclib >=1.6.3,!=1.8.0
31+
- conda-forge::openbabel >=3
32+
- conda-forge::rdkit >=2022.09.1
33+
- conda-forge::python >=3.7
34+
- conda-forge::coverage
35+
- conda-forge::cython >=0.25.2
36+
- conda-forge::scikit-learn
37+
- conda-forge::scipy <1.11
38+
- conda-forge::numpy >=1.10.0
39+
- conda-forge::pydot
40+
- conda-forge::jinja2
41+
- conda-forge::jupyter
42+
- conda-forge::pymongo
43+
- conda-forge::pyparsing
44+
- conda-forge::pyyaml
45+
- conda-forge::networkx
46+
- conda-forge::pytest
47+
- conda-forge::pytest-cov
48+
- conda-forge::matplotlib >=1.5
49+
- conda-forge::mpmath
50+
- conda-forge::pandas
51+
- conda-forge::gprof2dot
52+
- conda-forge::numdifftools
53+
- conda-forge::quantities
54+
- rmg::lpsolve55
55+
- rmg::muq2
56+
- rmg::pydas >=1.0.3
57+
- rmg::pydqed >=1.0.3
58+
- rmg::pyrdl
59+
- rmg::symmetry
60+
- conda-forge::nomkl
2861
run:
29-
- cairo
30-
- cairocffi
31-
- cantera >=2.3.0
32-
- cclib >=1.6.3
33-
- coolprop
34-
- coverage
35-
- cython >=0.25.2
36-
- ffmpeg
37-
- gprof2dot
38-
- graphviz
39-
- h5py
40-
- jinja2
41-
- jupyter
42-
- lpsolve55
43-
- markupsafe
44-
- matplotlib >=1.5
45-
- mopac
46-
- mpmath
47-
- muq2
48-
- networkx
49-
- nose
50-
- numdifftools
51-
- {{ pin_compatible('numpy') }}
52-
- openbabel >=3
53-
- pandas
54-
- psutil
55-
- pydas >=1.0.2
56-
- pydot
57-
- pydqed >=1.0.1
58-
- pymongo
59-
- pyparsing
60-
- pyrdl
61-
- python
62-
- pyyaml
63-
- pyzmq
64-
- quantities
65-
- rdkit >=2018
66-
- rmgdatabase >=3.2.0
67-
- scikit-learn
68-
- scipy
69-
- symmetry
70-
- xlrd
71-
- xlwt
62+
- conda-forge::cairo
63+
- conda-forge::cairocffi
64+
- conda-forge::ffmpeg
65+
- conda-forge::xlrd
66+
- conda-forge::xlwt
67+
- conda-forge::h5py
68+
- conda-forge::graphviz
69+
- conda-forge::markupsafe
70+
- conda-forge::psutil
71+
- conda-forge::ncurses
72+
- conda-forge::suitesparse
73+
- conda-forge::coolprop
74+
- cantera::cantera =2.6
75+
- conda-forge::mopac
76+
- conda-forge::cclib >=1.6.3,!=1.8.0
77+
- conda-forge::openbabel >=3
78+
- conda-forge::rdkit >=2022.09.1
79+
- conda-forge::python >=3.7
80+
- conda-forge::coverage
81+
- conda-forge::cython >=0.25.2
82+
- conda-forge::scikit-learn
83+
- conda-forge::scipy <1.11
84+
- conda-forge::numpy >=1.10.0
85+
- conda-forge::pydot
86+
- conda-forge::jinja2
87+
- conda-forge::jupyter
88+
- conda-forge::pymongo
89+
- conda-forge::pyparsing
90+
- conda-forge::pyyaml
91+
- conda-forge::networkx
92+
- conda-forge::pytest
93+
- conda-forge::pytest-cov
94+
- conda-forge::matplotlib >=1.5
95+
- conda-forge::mpmath
96+
- conda-forge::pandas
97+
- conda-forge::gprof2dot
98+
- conda-forge::numdifftools
99+
- conda-forge::quantities
100+
- rmg::lpsolve55
101+
- rmg::muq2
102+
- rmg::pydas >=1.0.3
103+
- rmg::pydqed >=1.0.3
104+
- rmg::pyrdl
105+
- rmg::symmetry
106+
- conda-forge::nomkl
72107
test:
108+
requires:
109+
- conda-forge::cairo
110+
- conda-forge::cairocffi
111+
- conda-forge::ffmpeg
112+
- conda-forge::xlrd
113+
- conda-forge::xlwt
114+
- conda-forge::h5py
115+
- conda-forge::graphviz
116+
- conda-forge::markupsafe
117+
- conda-forge::psutil
118+
- conda-forge::ncurses
119+
- conda-forge::suitesparse
120+
- conda-forge::coolprop
121+
- cantera::cantera =2.6
122+
- conda-forge::mopac
123+
- conda-forge::cclib >=1.6.3,!=1.8.0
124+
- conda-forge::openbabel >=3
125+
- conda-forge::rdkit >=2022.09.1
126+
- conda-forge::python >=3.7
127+
- conda-forge::coverage
128+
- conda-forge::cython >=0.25.2
129+
- conda-forge::scikit-learn
130+
- conda-forge::scipy <1.11
131+
- conda-forge::numpy >=1.10.0
132+
- conda-forge::pydot
133+
- conda-forge::jinja2
134+
- conda-forge::jupyter
135+
- conda-forge::pymongo
136+
- conda-forge::pyparsing
137+
- conda-forge::pyyaml
138+
- conda-forge::networkx
139+
- conda-forge::pytest
140+
- conda-forge::pytest-cov
141+
- conda-forge::matplotlib >=1.5
142+
- conda-forge::mpmath
143+
- conda-forge::pandas
144+
- conda-forge::gprof2dot
145+
- conda-forge::numdifftools
146+
- conda-forge::quantities
147+
- rmg::lpsolve55
148+
- rmg::muq2
149+
- rmg::pydas >=1.0.3
150+
- rmg::pydqed >=1.0.3
151+
- rmg::pyrdl
152+
- rmg::symmetry
153+
- conda-forge::nomkl
73154
source_files:
74155
- 'examples/rmg/superminimal'
75156
- 'examples/arkane/networks/n-butanol'
76157
imports:
77158
- rmgpy
78159
- arkane
79160
commands:
80-
- rmg.py examples/rmg/superminimal/input.py # [unix]
81-
- Arkane.py examples/arkane/networks/n-butanol/input.py # [unix]
82-
- python %SCRIPTS%\rmg.py examples\rmg\superminimal\input.py # [win]
83-
- python %SCRIPTS\Arkane.py examples\arkane\networks\n-butanol\input.py # [win]
161+
- rmg.py examples/rmg/superminimal/input.py
162+
- Arkane.py examples/arkane/networks/n-butanol/input.py
84163

85164
about:
86165
home: https://github.com/ReactionMechanismGenerator/RMG-Py

‎.github/workflows/conda_build.yml

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,40 @@
11
name: Conda Build
22

33
on:
4+
pull_request:
45
push:
56
branches:
67
- stable
78
jobs:
8-
build-linux:
9-
runs-on: ubuntu-latest
9+
build:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
os: [ubuntu-latest, macos-latest]
14+
runs-on: ${{ matrix.os }}
1015
defaults:
1116
run:
1217
shell: bash -l {0}
1318
steps:
14-
- uses: actions/checkout@v2
15-
- uses: conda-incubator/setup-miniconda@v2
19+
- uses: actions/checkout@v4
20+
- name: Setup Conda
21+
uses: conda-incubator/setup-miniconda@v3
1622
with:
17-
environment-file: environment.yml
18-
python-version: 3.7
19-
activate-environment: rmg_env
20-
- name: Conda info
23+
auto-update-conda: false
24+
conda-solver: libmamba
25+
auto-activate-base: true
26+
activate-environment: ""
27+
- name: Install Build Tools
28+
run: conda install python=3.10* anaconda-client conda-build=3.28.4
29+
- name: Configure Auto-Upload
30+
if: github.ref == 'refs/heads/stable'
2131
run: |
22-
conda info
23-
conda list
32+
conda config --set anaconda_upload yes
2433
- name: Build Binary
2534
env:
26-
CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
35+
CONDA_TOKEN: "need_to_add_this_secret" # ${{ secrets.ANACONDA_TOKEN }}
2736
run: |
28-
conda install -y conda-build
29-
conda install -y anaconda-client
3037
conda config --add channels rmg
31-
conda config --set anaconda_upload yes
38+
conda config --add channels cantera
39+
conda config --add channels conda-forge
3240
conda build --token $CONDA_TOKEN --user rmg .conda
33-
build-osx:
34-
runs-on: macos-latest
35-
defaults:
36-
run:
37-
shell: bash -l {0}
38-
steps:
39-
- uses: actions/checkout@v2
40-
- uses: conda-incubator/setup-miniconda@v2
41-
with:
42-
environment-file: environment.yml
43-
python-version: 3.7
44-
activate-environment: rmg_env
45-
- name: Conda info
46-
run: |
47-
conda info
48-
conda list
49-
- name: Build Binary
50-
env:
51-
CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
52-
run: |
53-
conda install -y conda-build
54-
conda install -y anaconda-client
55-
conda config --add channels rmg
56-
conda config --set anaconda_upload yes
57-
xcrun --show-sdk-path
58-
conda build --token $CONDA_TOKEN --user rmg .conda

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
'scripts/standardizeModelSpeciesNames.py',
216216
'scripts/thermoEstimator.py',
217217
'scripts/isotopes.py',
218-
'testing/databaseTest.py',
218+
'test/database/databaseTest.py',
219219
]
220220

221221
modules = []

0 commit comments

Comments
 (0)