Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: Build using Python 3.10 limited API (LP: #2050881) #448

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
# Installs the build dependencies
- name: Install build depends
run: |
echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee /etc/apt/apt.conf.d/90phased-updates
sudo sed -i 's/Types: deb/Types: deb deb-src/g' /etc/apt/sources.list.d/ubuntu.sources
sudo apt update
sudo apt install meson python3-coverage python3-pytest python3-pytest-cov libcmocka-dev python3-cffi libpython3-dev
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/rpmbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@ jobs:
container:
- fedora:latest
# - fedora:rawhide
- rockylinux:9
- almalinux:10-kitten
# - rockylinux:10
container:
image: ${{ matrix.container }}
steps:
- name: Install Build-Dependencies
run: |
# for 'dnf builddep' and 'dnf config-manager'
dnf -y install git rpmdevtools 'dnf-command(config-manager)'
dnf config-manager --set-enabled crb || true # Meson/CMocka on EL10
dnf config-manager --set-enabled nfv || true # OVS on EL10
dnf -y install epel-release || true # Pandoc, python-rich, ...
- uses: actions/checkout@v2
- name: Build & Test
run: |
cat /etc/os-release
dnf -y install dnf-plugins-core rpmdevtools # for 'dnf builddep'
dnf -y install epel-release || true
dnf config-manager --set-enabled crb || true # Meson/CMocka on EL9
dnf -y install centos-release-nfv-openvswitch || true # OVS on EL9
dnf -y builddep rpm/netplan.spec
adduser test
chown -R test:test .
dnf -y builddep rpm/netplan.spec
su test -c 'rpmbuild -bi -D "debug_package %{nil}" --build-in-place rpm/netplan.spec'
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ project('netplan', 'c',
'warning_level=2',
'werror=true',
],
meson_version: '>= 0.61.0',
meson_version: '>= 1.3.0',
)

glib = dependency('glib-2.0')
Expand Down
1 change: 1 addition & 0 deletions python-cffi/netplan/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ cffi_pyext = python.extension_module(
link_with: [libnetplan],
subdir: 'netplan',
install: true,
limited_api: '3.10',
)

bindings_sources = [
Expand Down
5 changes: 2 additions & 3 deletions rpm/netplan.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
%endif

Name: netplan
Version: 0.106
Version: 1.1
Release: 0%{?dist}
Summary: Network configuration tool using YAML
Group: System Environment/Base
Expand All @@ -24,7 +24,7 @@ URL: http://netplan.io/
Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz

BuildRequires: gcc
BuildRequires: meson >= 0.61
BuildRequires: meson >= 1.3
BuildRequires: pkgconfig(bash-completion)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gio-2.0)
Expand All @@ -42,7 +42,6 @@ BuildRequires: %{_sbindir}/ip
BuildRequires: pkgconfig(cmocka)
BuildRequires: python3dist(coverage)
BuildRequires: dbus-x11
BuildRequires: python3dist(netifaces)
BuildRequires: python3dist(pycodestyle)
BuildRequires: python3dist(pyflakes)
BuildRequires: python3dist(pytest)
Expand Down
Loading