Skip to content

Commit eff587b

Browse files
authored
Merge pull request #1036 from pybamm-team/develop
v0.2.2 into master
2 parents 105714c + 3701026 commit eff587b

File tree

594 files changed

+17607
-9968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+17607
-9968
lines changed

.appveyor.yml

-15
This file was deleted.

.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ exclude=
1212
share,
1313
pyvenv.cfg,
1414
third-party,
15-
sundials-5.0.0,
15+
KLU_module_deps,
1616
ignore=
1717
# False positive for white space before ':' on list slice
1818
# black should format these correctly

.github/workflows/test_on_push.yml

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: PyBaMM
2+
3+
on:
4+
push:
5+
6+
pull_request:
7+
8+
# everyday at 3 am UTC
9+
schedule:
10+
- cron: '0 3 * * *'
11+
12+
jobs:
13+
14+
style:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Check style
19+
uses: actions/setup-python@v1
20+
with:
21+
python-version: 3.7
22+
23+
- name: Install package
24+
run: |
25+
python -m pip install --upgrade pip wheel setuptools
26+
pip install -e .[dev]
27+
28+
- name: Check style
29+
run: python -m flake8
30+
31+
build:
32+
needs: style
33+
runs-on: ${{ matrix.os }}
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
os: [ubuntu-latest, macos-latest, windows-latest]
38+
python-version: [3.6, 3.7]
39+
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Set up Python ${{ matrix.python-version }}
43+
uses: actions/setup-python@v1
44+
with:
45+
python-version: ${{ matrix.python-version }}
46+
47+
- name: Install Linux system dependencies
48+
if: matrix.os == 'ubuntu-latest'
49+
run: |
50+
sudo apt install gfortran gcc libopenblas-dev liblapack-dev graphviz
51+
sudo apt install python${{ matrix.python-version }}.dev
52+
53+
- name: Install MacOS system dependencies
54+
if: matrix.os == 'macos-latest'
55+
run: |
56+
brew update
57+
brew install graphviz
58+
brew install openblas
59+
60+
- name: Install Windows system dependencies
61+
if: matrix.os == 'windows-latest'
62+
run: choco install graphviz
63+
64+
- name: Install standard python dependencies
65+
run: |
66+
python -m pip install --upgrade pip wheel setuptools
67+
pip install -e .
68+
69+
- name: Install SUNDIALS and SuiteSparse
70+
if: matrix.os != 'windows-latest'
71+
run: |
72+
pip install wget
73+
git clone https://github.com/pybind/pybind11.git
74+
python scripts/setup_KLU_module_build.py
75+
export SUNDIALS_INST=$HOME/.local
76+
pip install scikits.odes
77+
pip install -e .
78+
79+
- name: Run unit tests Windows
80+
if: matrix.os == 'windows-latest'
81+
run: |
82+
python run-tests.py --unit --folder all
83+
84+
- name: Run unit tests
85+
if: matrix.os != 'windows-latest'
86+
run: |
87+
export LD_LIBRARY_PATH=$HOME/.local/lib:scikits.odes/sundials5/lib:$LD_LIBRARY_PATH
88+
python run-tests.py --unit --folder all
89+
90+
- name: Install docs dependencies and run doctests
91+
if: matrix.os != 'windows-latest'
92+
run: |
93+
export LD_LIBRARY_PATH=$HOME/.local/lib:scikits.odes/sundials5/lib:$LD_LIBRARY_PATH
94+
pip install -e .[docs]
95+
python run-tests.py --doctest
96+
97+
- name: Install dev dependencies and run example tests
98+
if: matrix.os != 'windows-latest'
99+
run: |
100+
export LD_LIBRARY_PATH=$HOME/.local/lib:scikits.odes/sundials5/lib:$LD_LIBRARY_PATH
101+
pip install -e .[dev]
102+
python run-tests.py --examples
103+
104+
- name: Instal and run coverage
105+
if: success() && (matrix.os == 'unbuntu-latest' && matrix.python-version == 3.7)
106+
uses: codecov/codecov-action@v1

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,6 @@ cmake_install.cmake
9696

9797

9898
third-party/pybind11
99+
100+
# Build dependencies/
101+
KLU_module_deps

.travis.yml

-244
This file was deleted.

0 commit comments

Comments
 (0)