Skip to content

Commit e511770

Browse files
blucappisar
authored andcommitted
CI: drop dependency on python-six
No longer used
1 parent 4e697f0 commit e511770

4 files changed

Lines changed: 1 addition & 6 deletions

File tree

.ci/archlinux/Dockerfile.deps.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN pacman -Syu --needed --noconfirm \
1313
libyaml \
1414
meson \
1515
python-gobject \
16-
python-six \
1716
&& pacman -Scc --noconfirm
1817

1918
RUN ln -sf /builddir/bindings/python/gi/overrides/Modulemd.py $(python3 -c "import gi; import os; os.makedirs(gi._overridesdir, exist_ok=True); print(gi._overridesdir)")/Modulemd.py

.ci/centos/Dockerfile.deps.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ ifelse(eval(cosrelease == 8), 1, `dnl
3131
pkgconfig \
3232
ifelse(eval(cosrelease < 9), 1, `dnl
3333
python2-devel \
34-
python2-six \
3534
python36-devel \
3635
',`dnl
3736
python3-devel \
38-
python3-six \
3937
')dnl
4038
ifelse(eval(cosrelease < 8), 1, `dnl
4139
python-gobject-base \

.ci/mageia/Dockerfile.deps.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \
2222
openssl \
2323
pkgconf \
2424
popt-devel \
25-
python3-six \
2625
python3-autopep8 \
2726
python3-devel \
2827
python3-gitpython \

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
run: sed -i -e '\| usr/share/gtk-doc/|d' -e '\| usr/share/doc/|d' /etc/pacman.conf
238238

239239
- name: Install dependencies
240-
run: pacman -Syu --needed --noconfirm base-devel file git glib2 glib2-devel glib2-docs gobject-introspection gtk-doc jq libyaml meson python-gobject python-six valgrind
240+
run: pacman -Syu --needed --noconfirm base-devel file git glib2 glib2-devel glib2-docs gobject-introspection gtk-doc jq libyaml meson python-gobject valgrind
241241

242242
- name: Checkout code
243243
uses: actions/checkout@v4
@@ -300,7 +300,6 @@ jobs:
300300
openssl
301301
pkgconf
302302
popt-devel
303-
python3-six
304303
python3-autopep8
305304
python3-devel
306305
python3-gitpython

0 commit comments

Comments
 (0)