Skip to content

Commit d78f08d

Browse files
authored
Merge #622 to get 3.1 release commits into main branch.
These commits were made directly to the stable branch for the 3.1.0 release. This PR rebases them onto main, so that we can get the branches back in sync with each other without losing them.
2 parents 244ea45 + ac0f2d4 commit d78f08d

2 files changed

Lines changed: 51 additions & 2 deletions

File tree

.github/workflows/conda_build.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Conda Build
2+
3+
on:
4+
push:
5+
branches:
6+
- stable
7+
jobs:
8+
build-linux:
9+
runs-on: ubuntu-latest
10+
defaults:
11+
run:
12+
shell: bash -l {0}
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: conda-incubator/setup-miniconda@v2
16+
- name: Conda info
17+
run: |
18+
conda info
19+
conda list
20+
- name: Build Binary
21+
env:
22+
CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
23+
run: |
24+
conda install -y conda-build
25+
conda install -y anaconda-client
26+
conda config --add channels rmg
27+
conda config --set anaconda_upload yes
28+
conda build --token $CONDA_TOKEN --user rmg .conda
29+
build-osx:
30+
runs-on: macos-latest
31+
defaults:
32+
run:
33+
shell: bash -l {0}
34+
steps:
35+
- uses: actions/checkout@v2
36+
- uses: conda-incubator/setup-miniconda@v2
37+
- name: Conda info
38+
run: |
39+
conda info
40+
conda list
41+
- name: Build Binary
42+
env:
43+
CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
44+
run: |
45+
conda install -y conda-build
46+
conda install -y anaconda-client
47+
conda config --add channels rmg
48+
conda config --set anaconda_upload yes
49+
conda build --token $CONDA_TOKEN --user rmg .conda

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242

4343
scripts = ['scripts/' + scriptName for scriptName in scripts]
4444

45-
# Initiate the build and/or installation
45+
# Initiate the installation and/or build
4646
setup(
4747
name='RMG-database',
48-
version='3.0.0',
48+
version='3.1.0',
4949
description='Reaction Mechanism Generator Database',
5050
author='William H. Green and the RMG Team',
5151
author_email='rmg_dev@mit.edu',

0 commit comments

Comments
 (0)