Skip to content

Commit

Permalink
Merge pull request #548 from avaldebe/conda-gh-ci
Browse files Browse the repository at this point in the history
update conda CI jobs
  • Loading branch information
avaldebe authored Jan 17, 2022
2 parents 52fa403 + 551dfec commit a889120
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
env:
PYTHON: 3.8
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON }}
uses: actions/setup-python@v2
with:
Expand All @@ -34,7 +34,7 @@ jobs:
env:
PYTHON: 3.8
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON }}
uses: actions/setup-python@v2
with:
Expand All @@ -52,13 +52,14 @@ jobs:
- name: Build docs
run: tox -e docs

build:
venv:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
Expand Down Expand Up @@ -86,34 +87,34 @@ jobs:
run: tox -e py

conda:
# needs: lint
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9]
python-version: [3.8, 3.9, '3.10']
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: s-weigand/setup-conda@v1.0.5
uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
activate-environment: pya
environment-file: pyaerocom_env.yml
- name: Conda info
run: |
conda --version
conda info --envs
which python
python --version
- name: Update test environment
run: |
conda env update -n base -f ./pyaerocom_env.yml
- name: Install pyaerocom
run: |
python -m pip install --upgrade pip
python -m pip install . --no-deps
run: python -m pip install . --no-deps
- name: Run pytest
run: pytest --cov=pyaerocom/ --cov-report xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1.0.3
uses: codecov/codecov-action@v2
with:
file: ./coverage.xml
flags: unittests
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ filterwarnings = [
"ignore:distutils Version classes are deprecated:DeprecationWarning",
# numpy calling distutils.sysconfig.customize_compiler on Python 3.10
"ignore:The distutils.sysconfig module is deprecated:DeprecationWarning",
# tornado calling asyncio.get_event_loop on Python 3.10
"ignore:There is no current event loop:DeprecationWarning",
]

[tool.coverage.run]
Expand Down

0 comments on commit a889120

Please sign in to comment.