mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-05 17:06:18 +01:00
Switch from the deprecated distutils module to the packaging module
The distutils module was removed in Python 3.12.
This commit is contained in:
parent
9cd7cccdd3
commit
6ef967a0f9
@ -11,11 +11,11 @@ cache:
|
||||
- _ccache/
|
||||
|
||||
variables:
|
||||
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v23"
|
||||
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24"
|
||||
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
|
||||
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v17"
|
||||
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18"
|
||||
ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v0"
|
||||
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v13"
|
||||
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14"
|
||||
MESON_TEST_TIMEOUT_MULTIPLIER: 4
|
||||
G_MESSAGES_DEBUG: all
|
||||
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
|
||||
@ -607,6 +607,7 @@ macos-x86_64:
|
||||
- source .venv/bin/activate
|
||||
- pip3 install meson==1.2.3
|
||||
- pip3 install ninja==1.11.1
|
||||
- pip3 install packaging==23.2
|
||||
script:
|
||||
# FIXME: Use --wrap-mode=default so we download dependencies each time,
|
||||
# until the macOS runner is a VM where we can use a pre-made image which
|
||||
|
@ -35,6 +35,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
|
||||
locales \
|
||||
ninja-build \
|
||||
python3 \
|
||||
python3-packaging \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3-wheel \
|
||||
|
@ -47,6 +47,7 @@ RUN dnf -y update \
|
||||
ninja-build \
|
||||
pcre2-devel \
|
||||
"python3-dbusmock >= 0.18.3-2" \
|
||||
python3-packaging \
|
||||
python3-pip \
|
||||
python3-pygments \
|
||||
python3-wheel \
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v23
|
||||
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v24
|
||||
|
||||
USER root
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#
|
||||
# Author: David Zeuthen <davidz@redhat.com>
|
||||
|
||||
import distutils.version
|
||||
import packaging.version
|
||||
import os
|
||||
import sys
|
||||
|
||||
@ -166,4 +166,4 @@ def version_cmp_key(key):
|
||||
v = str(key[0])
|
||||
else:
|
||||
v = "0"
|
||||
return (distutils.version.LooseVersion(v), key[1])
|
||||
return (packaging.version.Version(v), key[1])
|
||||
|
Loading…
Reference in New Issue
Block a user