| Message ID | 20201124211925.4194-1-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] configure: remove python pkg_resources check | expand |
On 24/11/2020 22.19, Olaf Hering wrote: > Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not required anymore. That commit was part of meson 0.55.1. We require at least meson 0.55.3. So right, this should be fine. > Signed-off-by: Olaf Hering <olaf@aepfle.de> > --- > configure | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/configure b/configure > index 8c5d2f9a69..ce9b3c0a33 100755 > --- a/configure > +++ b/configure > @@ -1913,9 +1913,6 @@ fi > > case "$meson" in > git | internal) > - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then > - error_exit "Python setuptools not found" > - fi > meson="$python ${source_path}/meson/meson.py" > ;; > *) meson=$(command -v "$meson") ;; Reviewed-by: Thomas Huth <thuth@redhat.com> I guess we could now also remove the corresponding package from the docker and vm files? $ grep -r setuptool tests/ tests/docker/dockerfiles/debian10.docker: python3-setuptools \ tests/docker/dockerfiles/fedora-win32-cross.docker: python3-setuptools \ tests/docker/dockerfiles/fedora-win64-cross.docker: python3-setuptools \ tests/vm/freebsd: "py37-setuptools", tests/vm/openbsd: "py3-setuptools", tests/vm/haiku.x86_64: "setuptools_python3" tests/vm/netbsd: "py37-setuptools",
On 25/11/20 05:19, Thomas Huth wrote: > On 24/11/2020 22.19, Olaf Hering wrote: >> Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not required anymore. > > That commit was part of meson 0.55.1. We require at least meson 0.55.3. So > right, this should be fine. > >> Signed-off-by: Olaf Hering <olaf@aepfle.de> >> --- >> configure | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/configure b/configure >> index 8c5d2f9a69..ce9b3c0a33 100755 >> --- a/configure >> +++ b/configure >> @@ -1913,9 +1913,6 @@ fi >> >> case "$meson" in >> git | internal) >> - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then >> - error_exit "Python setuptools not found" >> - fi >> meson="$python ${source_path}/meson/meson.py" >> ;; >> *) meson=$(command -v "$meson") ;; > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > I guess we could now also remove the corresponding package from the docker > and vm files? > > $ grep -r setuptool tests/ > tests/docker/dockerfiles/debian10.docker: python3-setuptools \ > tests/docker/dockerfiles/fedora-win32-cross.docker: python3-setuptools \ > tests/docker/dockerfiles/fedora-win64-cross.docker: python3-setuptools \ > tests/vm/freebsd: "py37-setuptools", > tests/vm/openbsd: "py3-setuptools", > tests/vm/haiku.x86_64: "setuptools_python3" > tests/vm/netbsd: "py37-setuptools", > Yes, it should. I sent a patch for this. Paolo
diff --git a/configure b/configure index 8c5d2f9a69..ce9b3c0a33 100755 --- a/configure +++ b/configure @@ -1913,9 +1913,6 @@ fi case "$meson" in git | internal) - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then - error_exit "Python setuptools not found" - fi meson="$python ${source_path}/meson/meson.py" ;; *) meson=$(command -v "$meson") ;;
Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not required anymore. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- configure | 3 --- 1 file changed, 3 deletions(-)