Skip to content

Commit

Permalink
fix conda problems + try latest mud release candidate (#55)
Browse files Browse the repository at this point in the history
* use 0.1 mud release candidate

pip install mud~=0.1rc0

* trigger workflow

* pin 0.1rc0

* drop python 3.6

* rc1 + verbose examples

* Update examples.yml

* change analytical sols contract

* Revert "change analytical sols contract"

This reverts commit d237bb9.

* Update examples.yml

* try 3.9 in conda

* try mamba

* typo

* rename mamba env

* default shell

* run conda for 3.7 + 3.10, upload to coveralls

also removes codecov instructions

* try rc2

* deprecate 3.6

* Update build.yml

* try rc3

* revert to 0.0.24
  • Loading branch information
mathematicalmichael authored Jul 5, 2022
1 parent 0e0107a commit 3735a8b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 30 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Test build process
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.7", "3.10"]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -46,16 +46,12 @@ jobs:
python setup.py --version
git describe --dirty --tags --long --match "*[0-9]*"
- name: Test pip install syntax (without wheels)
- name: Test pip install syntax
run: |
pip install .
pip uninstall -y mud-examples
- name: Test install with wheels
- name: Test build
run: |
python setup.py sdist bdist_wheel
pip uninstall -y mud-examples
- name: Test pip install syntax (latest wheels)
run: |
pip install .
44 changes: 23 additions & 21 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ name: examples
on:
push:
branches: [ main ]
paths: '**.py'
paths:
- "**.py"
- ".github/workflows/examples.yml"
pull_request:
paths: '**.py'
paths:
- "**.py"
- ".github/workflows/examples.yml"
schedule:
- cron: "0 0 1 * *"

Expand All @@ -14,7 +18,7 @@ jobs:
name: Default ${{ matrix.python-version }}
strategy:
matrix:
python-version: [3.6, 3.9]
python-version: ["3.7", "3.8", "3.9", "3.10"]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -32,7 +36,7 @@ jobs:
- name: Test CLI
run: |
cd /tmp
mud_run_all
mud_run_all -v
- name: Generate figures using makefile
run: |
Expand All @@ -42,37 +46,41 @@ jobs:
conda-build:
name: Conda ${{ matrix.python-version }}
# mamba environment will not activate without this line
# see: https://github.com/mamba-org/provision-with-micromamba#IMPORTANT
defaults:
run:
shell: bash -l {0}
strategy:
matrix:
python-version: [3.8]
python-version: ["3.7", "3.10"]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
- name: Install Fenics
uses: mamba-org/provision-with-micromamba@main
with:
python-version: ${{ matrix.python-version }}

- name: Fenics install
run: |
echo $CONDA/bin >> $GITHUB_PATH
conda env update --file environment.yml --name base
environment-file: environment.yml
environment-name: test
extra-specs: |
python=${{ matrix.python-version }}
- name: Install Dependencies
run: |
pip install .
pip install mud==0.1rc1
- name: Conda information
run: conda list

- name: Test that command-line scripts installed
run: |
cd /tmp
mud_run_all
mud_run_all -v
- name: Generate figures using Makefile
run: |
Expand All @@ -91,14 +99,8 @@ jobs:
rm src/mud_examples/data/pde_2D/*
pytest
- name: Upload coverage to codecov.io
if: ${{ matrix.python-version }} == 3.8
run: |
export CODECOV_VERSION=${{ secrets.codecov_token }}
bash <(curl -s https://codecov.io/bash)
- name: Upload coverage to coveralls.io
if: ${{ matrix.python-version }} == 3.8
if: ${{ matrix.python-version }} == "3.10"
run: coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ jobs:
name: Run unit tests
strategy:
matrix:
python-version: [3.6, 3.9]
python-version: ["3.7", "3.10"]
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v2
with:
Expand Down

0 comments on commit 3735a8b

Please sign in to comment.