From 5d304bfbed0f66013a680d277ecd7cac0ef4536e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 04:07:49 +0100 Subject: [PATCH 1/6] CI: switch to R4.3 --- .gitlab-ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e8a44..89acaae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,7 @@ include: -- file: /r4.1/gitlab-base.yml +- file: /r4.3/gitlab-base.yml project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-dom0.yml +- file: /r4.3/gitlab-host.yml project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-vm.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-base.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-host.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-vm.yml +- file: /r4.3/gitlab-vm.yml project: QubesOS/qubes-continuous-integration From 628b26feeee4f44c70296e3cc46a36e74a7c9def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 04:10:22 +0100 Subject: [PATCH 2/6] Use VERSION placeholder in .qubesbuilder --- .qubesbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.qubesbuilder b/.qubesbuilder index 3c03166..d3a6d91 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -11,5 +11,5 @@ vm: - debian-pkg/debian source: files: - - url: https://files.pythonhosted.org/packages/source/q/qasync/qasync-0.23.0.tar.gz - sha256: qasync-0.23.0.tar.gz.sha256 + - url: https://files.pythonhosted.org/packages/source/q/qasync/qasync-@VERSION@.tar.gz + sha256: qasync-@VERSION@.tar.gz.sha256 From 6469835fe567550c208db581cd4fca1a035bfc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 04:53:48 +0100 Subject: [PATCH 3/6] deb: Adjust packaging for poetry build And bump dh compat level to 13 (current recommended). --- debian-pkg/debian/compat | 2 +- debian-pkg/debian/control | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian-pkg/debian/compat b/debian-pkg/debian/compat index ec63514..b1bd38b 100644 --- a/debian-pkg/debian/compat +++ b/debian-pkg/debian/compat @@ -1 +1 @@ -9 +13 diff --git a/debian-pkg/debian/control b/debian-pkg/debian/control index 57ea6de..8a24e5b 100644 --- a/debian-pkg/debian/control +++ b/debian-pkg/debian/control @@ -3,8 +3,13 @@ Section: python Priority: optional Maintainer: Marek Marczykowski-Górecki Build-Depends: + pybuild-plugin-pyproject, + python3-poetry-core, python3-pyqt5, - python3-setuptools, python3-all, dh-python, debhelper (>= 9) + python3-setuptools, + python3-all, + dh-python, + debhelper (>= 13) Standards-Version: 3.9.5 Homepage: https://github.com/CabbageDevelopment/qasync Vcs-Git: https://github.com/CabbageDevelopment/qasync From 50726724b295b83cc005cbdd51f0e2826db90506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 04:54:12 +0100 Subject: [PATCH 4/6] rpm: Adjust build for poetry build --- python-qasync.spec.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/python-qasync.spec.in b/python-qasync.spec.in index 9191bd8..dba2f98 100644 --- a/python-qasync.spec.in +++ b/python-qasync.spec.in @@ -12,7 +12,8 @@ Source0: %{pypi_source} BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pip +BuildRequires: python%{python3_pkgversion}-poetry-core >= 1.5.0 %description qasync allows you to use coroutines in PyQt/PySide applications by @@ -36,16 +37,16 @@ predecessors. rm -rf %{pypi_name}.egg-info %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install -%files -n python%{python3_pkgversion}-%{pypi_name} +%pyproject_save_files qasync + +%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files} %license LICENSE %doc README.md -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog @CHANGELOG@ From 9db6f53549ad0c2b9c11458e732347501cbccdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 15:38:36 +0100 Subject: [PATCH 5/6] Disable build on Ubuntu Jammy It doesn't have new enough python3-poetry --- .qubesbuilder | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.qubesbuilder b/.qubesbuilder index d3a6d91..e842345 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -9,6 +9,9 @@ vm: deb: build: - debian-pkg/debian +vm-jammy: + deb: + build: [] source: files: - url: https://files.pythonhosted.org/packages/source/q/qasync/qasync-@VERSION@.tar.gz From e45b762f3e1a59176177f347d0c981faf9b8e5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 29 Oct 2024 15:39:42 +0100 Subject: [PATCH 6/6] version 0.27.1-1 --- debian-pkg/debian/changelog | 10 ++++++++++ qasync-0.23.0.tar.gz.sha256 | 1 - qasync-0.27.1.tar.gz.sha256 | 1 + rel | 2 +- version | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 qasync-0.23.0.tar.gz.sha256 create mode 100644 qasync-0.27.1.tar.gz.sha256 diff --git a/debian-pkg/debian/changelog b/debian-pkg/debian/changelog index 4949c3f..874ea27 100644 --- a/debian-pkg/debian/changelog +++ b/debian-pkg/debian/changelog @@ -1,3 +1,13 @@ +python-qasync (0.27.1-1) unstable; urgency=medium + + * CI: switch to R4.3 + * Use VERSION placeholder in .qubesbuilder + * deb: Adjust packaging for poetry build + * rpm: Adjust build for poetry build + * Disable build on Ubuntu Jammy + + -- Marek Marczykowski-Górecki Tue, 29 Oct 2024 15:39:41 +0100 + python-qasync (0.23.0-2) unstable; urgency=medium [ Frédéric Pierret (fepitre) ] diff --git a/qasync-0.23.0.tar.gz.sha256 b/qasync-0.23.0.tar.gz.sha256 deleted file mode 100644 index 2b21d07..0000000 --- a/qasync-0.23.0.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -8965ec313e0107148d98e8ac1e77a77dce74de3cd97055a1aa62d513a3793a14 diff --git a/qasync-0.27.1.tar.gz.sha256 b/qasync-0.27.1.tar.gz.sha256 new file mode 100644 index 0000000..713cb18 --- /dev/null +++ b/qasync-0.27.1.tar.gz.sha256 @@ -0,0 +1 @@ +8dc768fd1ee5de1044c7c305eccf2d39d24d87803ea71189d4024fb475f4985f diff --git a/rel b/rel index 0cfbf08..d00491f 100644 --- a/rel +++ b/rel @@ -1 +1 @@ -2 +1 diff --git a/version b/version index ca222b7..83b4730 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.23.0 +0.27.1