Merge branch 'master' into struct-array

.conda-ci-build-configure.sh

+python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"

.github/workflows/ci.yml

@@ -31,7 +31,6 @@ jobs:
         -   uses: actions/checkout@v2
         -   name: "Main Script"
             run: |
-                set -e
                 sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .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
@@ -44,7 +43,6 @@ jobs:
         -   uses: actions/checkout@v2
         -   name: "Main Script"
             run: |
-                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

README.rst

@@ -4,9 +4,9 @@ PyOpenCL: Pythonic Access to OpenCL, with Arrays and Algorithms
 .. image:: https://gitlab.tiker.net/inducer/pyopencl/badges/master/pipeline.svg
     :alt: Gitlab Build Status
     :target: https://gitlab.tiker.net/inducer/pyopencl/commits/master
-.. image:: https://github.com/inducer/pyopencl/workflows/CI/badge.svg?branch=master
+.. image:: https://github.com/inducer/pyopencl/workflows/CI/badge.svg?branch=master&event=push
     :alt: Github Build Status
-    :target: https://github.com/inducer/pyopencl/actions?query=branch%3Amaster+workflow%3ACI
+    :target: https://github.com/inducer/pyopencl/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush
 .. image:: https://badge.fury.io/py/pyopencl.png
     :alt: Python Package Index Release Page
     :target: https://pypi.org/project/pyopencl/