From 32f1bfdab3621c4479c7028fef201bfba2d4da52 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 11 Mar 2022 11:50:44 +0100
Subject: [PATCH] Do not force a specific version of meson.

We were forcing a spcefic version has a workaround to meson issue.
We don't need now, and recent version is needed to compile on armhf.
---
 .github/ci_images/bionic_builder.dockerfile | 2 +-
 .github/ci_images/f35_builder.dockerfile    | 2 +-
 .github/ci_images/focal_builder.dockerfile  | 2 +-
 .github/ci_images/xenial_builder.dockerfile | 2 +-
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/releaseNigthly.yml        | 6 +++---
 setup.py                                    | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/ci_images/bionic_builder.dockerfile b/.github/ci_images/bionic_builder.dockerfile
index c1e76f6..89291eb 100644
--- a/.github/ci_images/bionic_builder.dockerfile
+++ b/.github/ci_images/bionic_builder.dockerfile
@@ -30,7 +30,7 @@ RUN apt update -q \
 #    vim less grep \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
-  && pip3 install meson==0.52.1 pytest gcovr requests distro
+  && pip3 install meson pytest gcovr requests distro
 
 # Create user
 RUN useradd --create-home runner
diff --git a/.github/ci_images/f35_builder.dockerfile b/.github/ci_images/f35_builder.dockerfile
index 62d8f83..bb3fc95 100644
--- a/.github/ci_images/f35_builder.dockerfile
+++ b/.github/ci_images/f35_builder.dockerfile
@@ -19,7 +19,7 @@ RUN dnf install -y --nodocs \
   && dnf remove -y "*-doc" \
   && dnf autoremove -y \
   && dnf clean all \
-  && pip3 install meson==0.52.1 pytest requests distro
+  && pip3 install meson pytest requests distro
 
 # Create user
 RUN useradd --create-home runner
diff --git a/.github/ci_images/focal_builder.dockerfile b/.github/ci_images/focal_builder.dockerfile
index 302ee13..3998210 100644
--- a/.github/ci_images/focal_builder.dockerfile
+++ b/.github/ci_images/focal_builder.dockerfile
@@ -25,7 +25,7 @@ RUN apt update -q \
 #    vim less grep \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
-  && pip3 install meson==0.52.1 pytest gcovr requests distro
+  && pip3 install meson pytest gcovr requests distro
 
 # Create user
 RUN useradd --create-home runner
diff --git a/.github/ci_images/xenial_builder.dockerfile b/.github/ci_images/xenial_builder.dockerfile
index 7b7ce9a..bb7c9a2 100644
--- a/.github/ci_images/xenial_builder.dockerfile
+++ b/.github/ci_images/xenial_builder.dockerfile
@@ -21,7 +21,7 @@ RUN apt update -q \
 #    vim less grep \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
-  && pip3 install meson==0.52.1 pytest 'markupsafe<2.0.0' 'jinja2<3.0.0' 'gcovr<5.0' requests distro
+  && pip3 install meson pytest 'markupsafe<2.0.0' 'jinja2<3.0.0' 'gcovr<5.0' requests distro
 
 # Create user
 RUN useradd --create-home runner
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7baebb1..8363df8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
    - cron: '0 1 * * *'
 
 env:
-  DOCKER_VERSION: 31
+  DOCKER_VERSION: 32
 
 jobs:
   Docker:
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: Docker
     container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-32"
       options: "--device /dev/fuse --privileged"
     steps:
     - name: Checkout code
@@ -182,7 +182,7 @@ jobs:
         brew install pkg-config ninja automake autoconf
     - name: Install python modules
       run: |
-        pip3 install meson==0.52.1 pytest requests distro
+        pip3 install meson pytest requests distro
         pip3 install --no-deps $GITHUB_WORKSPACE
     - name: secret
       shell: bash
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index bf11e6f..f11bc78 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.github/workflows/releaseNigthly.yml
@@ -8,7 +8,7 @@ on:
    - cron: '0 1 * * *'
 
 env:
-  DOCKER_VERSION: 31
+  DOCKER_VERSION: 32
 
 jobs:
   Docker:
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: Docker
     container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-32"
       options: "--device /dev/fuse --privileged"
     steps:
     - name: Checkout code
@@ -187,7 +187,7 @@ jobs:
         brew install pkg-config ninja automake autoconf
     - name: Install python modules
       run: |
-        pip3 install meson==0.52.1 pytest requests distro
+        pip3 install meson pytest requests distro
         pip3 install --no-deps $GITHUB_WORKSPACE
     - name: secret
       shell: bash
diff --git a/setup.py b/setup.py
index c53a024..e3fad6c 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'meson==0.52.1',
+        'meson',
         'distro'
     ],
     entry_points={