luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-06 01:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch from the deprecated distutils module to the packaging module

Browse Source 
The distutils module was removed in Python 3.12.
This commit is contained in:
Jordan Williams 2023-12-01 09:53:50 -06:00 committed by Philip Withnall
parent 9cd7cccdd3
commit 6ef967a0f9
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -11,11 +11,11 @@ cache:
- _ccache/ - _ccache/
variables: 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" 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" 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 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
@ -607,6 +607,7 @@ macos-x86_64:
- source .venv/bin/activate - source .venv/bin/activate
- pip3 install meson==1.2.3 - pip3 install meson==1.2.3
- pip3 install ninja==1.11.1 - pip3 install ninja==1.11.1
- pip3 install packaging==23.2
script: script:
# FIXME: Use --wrap-mode=default so we download dependencies each time, # 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 # until the macOS runner is a VM where we can use a pre-made image which

1
.gitlab-ci/debian-stable.Dockerfile
View File

@ -35,6 +35,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
locales \ locales \
ninja-build \ ninja-build \
python3 \ python3 \
python3-packaging \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-wheel \ python3-wheel \

1
.gitlab-ci/fedora.Dockerfile
View File

@ -47,6 +47,7 @@ RUN dnf -y update \
ninja-build \ ninja-build \
pcre2-devel \ pcre2-devel \
"python3-dbusmock >= 0.18.3-2" \ "python3-dbusmock >= 0.18.3-2" \
python3-packaging \
python3-pip \ python3-pip \
python3-pygments \ python3-pygments \
python3-wheel \ python3-wheel \

2
.gitlab-ci/mingw.Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v23 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v24
USER root USER root

4
gio/gdbus-2.0/codegen/utils.py
View File

@ -19,7 +19,7 @@
# #
# Author: David Zeuthen <davidz@redhat.com> # Author: David Zeuthen <davidz@redhat.com>
import distutils.version import packaging.version
import os import os
import sys import sys
@ -166,4 +166,4 @@ def version_cmp_key(key):
v = str(key[0]) v = str(key[0])
else: else:
v = "0" v = "0"
return (distutils.version.LooseVersion(v), key[1]) return (packaging.version.Version(v), key[1])