[gobject-introspection: 2/2] Merge branch 'ci-meson-python2' into 'master'

[Christoph Reiter <creiter src gnome org>]

commit d2d3450a403500d2c1c355685bc0a2678af5bd6b
Merge: c49f744e 2dbf8f4e
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Mon Jul 16 15:26:13 2018 +0000

    Merge branch 'ci-meson-python2' into 'master'
    
    meson: Add a "python" option to make the python to build against configurable
    
    See merge request GNOME/gobject-introspection!50

 .gitlab-ci.yml                  | 23 +++++++++++++++++++++--
 .gitlab-ci/Dockerfile           |  3 +++
 .gitlab-ci/test-msys2.sh        |  5 ++++-
 gir/meson.build                 | 16 ++++++++--------
 giscanner/introspectablepass.py |  2 +-
 giscanner/meson.build           |  4 ++--
 meson.build                     |  6 +++---
 meson_options.txt               |  4 ++++
 tests/scanner/meson.build       |  2 +-
 tests/warn/meson.build          |  2 +-
 tools/meson.build               |  3 +--
 11 files changed, 49 insertions(+), 21 deletions(-)
---