From 1f55e74ffe298912f461cf3a39281f8709a53f01 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner <inform@tiker.net> Date: Mon, 9 Sep 2019 14:06:32 -0500 Subject: [PATCH] Azure pipelines, attempt 1 --- .gitlab-ci.yml | 2 - .test-conda-env-py3-requirements.txt | 3 -- .test-conda-env-py3.yml | 8 +++- README.rst | 11 +++-- azure-pipelines.yml | 66 ++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 9 deletions(-) delete mode 100644 .test-conda-env-py3-requirements.txt create mode 100644 azure-pipelines.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d44dd000..93239ec9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,6 @@ Python 3.6 Conda: - export SUMPY_NO_CACHE=1 - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" tags: @@ -105,7 +104,6 @@ Flake8: Benchmarks: script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - PROJECT=sumpy - PYOPENCL_TEST=portable - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-benchmark-py-project.sh diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt deleted file mode 100644 index 45c20c1f..00000000 --- a/.test-conda-env-py3-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -git+https://gitlab.tiker.net/inducer/boxtree -git+https://github.com/inducer/pymbolic -git+https://github.com/inducer/loopy diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index a696dc8d..ec8e85a0 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -3,6 +3,7 @@ channels: - inducer - conda-forge - defaults + dependencies: - git - conda-forge::numpy @@ -13,4 +14,9 @@ dependencies: - python=3.6 - symengine=0.3.0 - python-symengine=0.3.0 -# things not in here: loopy boxtree pymbolic pyfmmlib + +- pip +- pip: + - git+https://gitlab.tiker.net/inducer/boxtree + - git+https://github.com/inducer/pymbolic + - git+https://github.com/inducer/loopy diff --git a/README.rst b/README.rst index 1f6e76d1..884bef17 100644 --- a/README.rst +++ b/README.rst @@ -2,9 +2,14 @@ sumpy: n-body kernels and translation operators =============================================== .. image:: https://gitlab.tiker.net/inducer/sumpy/badges/master/pipeline.svg - :target: https://gitlab.tiker.net/inducer/sumpy/commits/master + :alt: Gitlab Build Status + :target: https://gitlab.tiker.net/inducer/sumpy/commits/master +.. image:: https://dev.azure.com/ak-spam/inducer/_apis/build/status/inducer.sumpy?branchName=master + :alt: Azure Build Status + :target: https://dev.azure.com/ak-spam/inducer/_build/latest?definitionId=17&branchName=master .. image:: https://badge.fury.io/py/sumpy.png - :target: http://pypi.python.org/pypi/sumpy + :alt: Python Package Index Release Page + :target: https://pypi.org/project/sumpy/ Sumpy is mainly a 'scaffolding' package for Fast Multipole and quadrature methods. If you're building one of those and need code generation for the required Multipole @@ -32,4 +37,4 @@ Resources: * `source code via git <http://github.com/inducer/sumpy>`_ If you can see inside the UIUC firewall, you may browse -`benchmark results <http://koelsch.d.tiker.net/benchmarks/asv/sumpy/>`_. \ No newline at end of file +`benchmark results <http://koelsch.d.tiker.net/benchmarks/asv/sumpy/>`_. diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..68588d42 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,66 @@ +jobs: +- + job: 'Python2' + pool: + vmImage: 'ubuntu-latest' + + steps: + - + script: | + set -e + sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml + cat .test-conda-env-py2.yml + CONDA_ENVIRONMENT=.test-conda-env-py2.yml + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + . ./build-and-test-py-project-within-miniconda.sh + + displayName: 'Pytest Conda' + - + task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'test/pytest.xml' + +- + job: 'Python3' + pool: + vmImage: 'ubuntu-latest' + + steps: + - + script: | + set -e + CONDA_ENVIRONMENT=.test-conda-env-py3.yml + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + . ./build-and-test-py-project-within-miniconda.sh + + displayName: 'Pytest Conda' + + - + task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'test/pytest.xml' + +- + job: 'Flake8' + pool: + vmImage: 'ubuntu-latest' + strategy: + matrix: + Python37: + python.version: '3.7' + + steps: + - + task: UsePythonVersion@0 + inputs: + versionSpec: '$(python.version)' + + - + script: | + set -e + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + . ./prepare-and-run-flake8.sh sumpy test + + displayName: 'Flake8' -- GitLab