From 7d8365c10a9fb4aa562ce3770b2e106a1ffe113d Mon Sep 17 00:00:00 2001 From: Mikael Mortensen Date: Thu, 21 Apr 2022 13:54:19 +0200 Subject: [PATCH] Move tests to python >= 3.7 because of quadpy --- .github/workflows/main.yml | 2 +- azure-pipelines.yml | 13 +++++++------ conf/conda/component-requirements.txt | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 13ec4cca..ed76803b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - python-version: [3.6, 3.7, 3.8] + python-version: [3.7, 3.8, 3.9] name: Python ${{ matrix.python-version }} example steps: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ff53413..5a80afc7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,12 +5,12 @@ jobs: vmImage: 'macOS-latest' strategy: matrix: - Python36: - python.version: '3.6' Python37: python.version: '3.7' Python38: python.version: '3.8' + Python39: + python.version: '3.9' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -35,12 +35,13 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - Python36: - python.version: '3.6' Python37: python.version: '3.7' Python38: python.version: '3.8' + Python39: + python.version: '3.9' + steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH @@ -55,7 +56,7 @@ jobs: conda build --no-test --python $PYTHON_VERSION ./conf/conda conda create --name shenfun pip shenfun python=$PYTHON_VERSION --use-local source activate shenfun - pip install pytest-cov pytest quadpy>=0.16.9 + pip install pytest-cov pytest quadpy pytest tests/ --junitxml=junit/test-results.xml --cov=$(python -c "import site; print(site.getsitepackages()[0]+'/shenfun')") --cov-report=xml --cov-report=html displayName: Build and test @@ -72,7 +73,7 @@ jobs: reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov' - bash: | - if [ $PYTHON_VERSION == 3.7 ]; then + if [ $PYTHON_VERSION == 3.9 ]; then source activate shenfun pip install codecov bash <(curl -s https://codecov.io/bash) diff --git a/conf/conda/component-requirements.txt b/conf/conda/component-requirements.txt index 13f9c623..21e0241f 100644 --- a/conf/conda/component-requirements.txt +++ b/conf/conda/component-requirements.txt @@ -1 +1 @@ -quadpy >=0.16.9 +quadpy