From abb55507900f0364f778610bbf5504fe4745c727 Mon Sep 17 00:00:00 2001 From: "[6~" Date: Sun, 2 Feb 2020 09:09:42 -0600 Subject: [PATCH] No longer pin numpy for pylint after pylint upgrade, for Azure and Gitlab --- .gitlab-ci.yml | 4 +--- azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebf12132..cb732c51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,9 +131,7 @@ Pylint: # Pylint won't find the Cython bits without this - PROJECT_INSTALL_FLAGS="--editable" - export PY_EXE=python3 - # Pin to numpy 1.15 - # See https://github.com/PyCQA/pylint/issues/2721 - - EXTRA_INSTALL="Cython pybind11 numpy==1.15 mako matplotlib" + - EXTRA_INSTALL="Cython pybind11 numpy mako matplotlib" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh pytential test/test_*.py" tags: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a5dd6777..20bf4d14 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -110,7 +110,7 @@ jobs: script: | set -e CONDA_ENVIRONMENT=.test-conda-env-py3-pylint.yml - sed 's/numpy/numpy=1.15/' .test-conda-env-py3.yml > $CONDA_ENVIRONMENT + cp .test-conda-env-py3.yml $CONDA_ENVIRONMENT echo "- matplotlib" >> $CONDA_ENVIRONMENT echo "-------------------------------------------" cat $CONDA_ENVIRONMENT -- GitLab