diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ee542384b..bffac5f5c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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: @@ -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: @@ -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: @@ -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 diff --git a/pyproject.toml b/pyproject.toml index eb1c1d072..02267b6e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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]