From f1aa35fd70034989e08c1d2dac9a152ed15b94f9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 18 Mar 2022 21:33:07 +0100 Subject: [PATCH 01/32] update dependency --- vdirsyncer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index f25eb31..03d05b3 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -23,7 +23,7 @@ Obsoletes: python2-%{srcname} <= 0.12.1 BuildRequires: make BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 -BuildRequires: python3-click-log >= 0.3 +BuildRequires: python3-click-log >= 0.4 BuildRequires: python3-click-threading >= 0.4.0 BuildRequires: python3-devel BuildRequires: python3-icalendar @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Mar 18 2022 David Kaufmann - 0.18.0-3 +- Update click-log dependency + * Sat Jan 22 2022 Fedora Release Engineering - 0.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 812b4eb878cc4cdd2ce8db4ca46426757598874c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 15:23:55 +0200 Subject: [PATCH 02/32] Rebuilt for Python 3.11 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 03d05b3..bb18499 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jun 15 2022 Python Maint - 0.18.0-4 +- Rebuilt for Python 3.11 + * Fri Mar 18 2022 David Kaufmann - 0.18.0-3 - Update click-log dependency From af08e1c804ed272e33f4c7b56b6f1bafb9025aa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:43:41 +0000 Subject: [PATCH 03/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index bb18499..cb7acb5 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.18.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Python Maint - 0.18.0-4 - Rebuilt for Python 3.11 From f8b9d53993d688e849006e3c78b20831e78ebf3c Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 15 Aug 2022 04:03:14 +0200 Subject: [PATCH 04/32] update dependencies at all locations --- vdirsyncer.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index cb7acb5..a713111 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD @@ -38,7 +38,7 @@ BuildRequires: python3-sphinx_rtd_theme Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.3 +Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -61,7 +61,7 @@ Summary: %{sum} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.3 +Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 15 2022 David Kaufmann - 0.18.0-6 +- Update click-log dependency in all places + * Sat Jul 23 2022 Fedora Release Engineering - 0.18.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 10e8118755ca55ebcc5e7c90ce86e48f39d61d0b Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 17 Aug 2022 19:11:42 +0200 Subject: [PATCH 05/32] fix autogenerated dependency --- vdirsyncer-click-log-dependency-version.patch | 12 ++++++++++++ vdirsyncer.spec | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 vdirsyncer-click-log-dependency-version.patch diff --git a/vdirsyncer-click-log-dependency-version.patch b/vdirsyncer-click-log-dependency-version.patch new file mode 100644 index 0000000..965093d --- /dev/null +++ b/vdirsyncer-click-log-dependency-version.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -12,7 +12,7 @@ + requirements = [ + # https://github.com/mitsuhiko/click/issues/200 + "click>=5.0,<9.0", +- "click-log>=0.3.0, <0.4.0", ++ "click-log>=0.3.0, <0.5.0", + # https://github.com/pimutils/vdirsyncer/issues/478 + "click-threading>=0.5", + "requests >=2.20.0", + diff --git a/vdirsyncer.spec b/vdirsyncer.spec index a713111..356ea0d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,12 +10,13 @@ Name: vdirsyncer Version: 0.18.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} +Patch0: vdirsyncer-click-log-dependency-version.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -85,7 +86,7 @@ The vdirsyncer-doc package provides all the documentation for the vdirsyncer calendar/address-book synchronization utility. %prep -%setup -q +%autosetup -p1 %build # Here we set upstream version based on setuptools_scm documentation @@ -145,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Aug 17 2022 David Kaufmann - 0.18.0-7 +- Fix autogenerated dependency + * Mon Aug 15 2022 David Kaufmann - 0.18.0-6 - Update click-log dependency in all places From c14fa17a527c70d42e5b0dd1512752403da2383b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:08:53 +0000 Subject: [PATCH 06/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 356ea0d..af79093 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.18.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Aug 17 2022 David Kaufmann - 0.18.0-7 - Fix autogenerated dependency From 8787f05bd02c4b5deabf16131ea565f6c331fb9b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 12:07:27 +0200 Subject: [PATCH 07/32] Rebuilt for Python 3.12 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index af79093..733175a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Jun 15 2023 Python Maint - 0.18.0-9 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 0.18.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6f9ea41c92064ef378589a796a0adfb2faba0807 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:27:54 +0000 Subject: [PATCH 08/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 733175a..d38bf81 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.18.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 0.18.0-9 - Rebuilt for Python 3.12 From eaeec6512f6bf1043c420e2c0b1889b75a9ae580 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:34:24 +0000 Subject: [PATCH 09/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index d38bf81..8c86236 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.18.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.18.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 84a3ebd404087cd2b4467fded816e644812ee3c8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 3 Feb 2024 04:11:41 +0100 Subject: [PATCH 10/32] updated version --- vdirsyncer-click-log-dependency-version.patch | 12 ------------ vdirsyncer.spec | 17 +++++++++++------ 2 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 vdirsyncer-click-log-dependency-version.patch diff --git a/vdirsyncer-click-log-dependency-version.patch b/vdirsyncer-click-log-dependency-version.patch deleted file mode 100644 index 965093d..0000000 --- a/vdirsyncer-click-log-dependency-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -12,7 +12,7 @@ - requirements = [ - # https://github.com/mitsuhiko/click/issues/200 - "click>=5.0,<9.0", -- "click-log>=0.3.0, <0.4.0", -+ "click-log>=0.3.0, <0.5.0", - # https://github.com/pimutils/vdirsyncer/issues/478 - "click-threading>=0.5", - "requests >=2.20.0", - diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 8c86236..dfe733e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,14 +9,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.18.0 -Release: 11%{?dist} +Version: 0.19.2 +Release: 1%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} -Patch0: vdirsyncer-click-log-dependency-version.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -30,12 +29,15 @@ BuildRequires: python3-devel BuildRequires: python3-icalendar BuildRequires: python3-lxml BuildRequires: python3-requests >= 2.10 -BuildRequires: python3-requests-oauthlib BuildRequires: python3-requests-toolbelt >= 0.4.0 BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-aiohttp-oauthlib +BuildRequires: python3-trustme +BuildRequires: python3-pytest-httpserver +BuildRequires: python3-pytest-localserver Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 @@ -44,8 +46,8 @@ Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.10 -Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 +Requires: python3-aiohttp-oauthlib Requires: python3-vdirsyncer = %{version} Requires: sqlite @@ -67,8 +69,8 @@ Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.10 -Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 +Requires: python3-aiohttp-oauthlib %description -n python3-%{srcname} vdirsyncer synchronizes your calendars and address books between two entities. @@ -146,6 +148,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Feb 03 2024 David Kaufmann - 0.19.2-1 +- Update to v0.19.2 + * Sat Jan 27 2024 Fedora Release Engineering - 0.18.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 122b9c44456ca0c4e2a6b1aac1c5c031786d014e Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 4 Feb 2024 00:56:59 +0100 Subject: [PATCH 11/32] and add sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 74fbcff..4deca4d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /vdirsyncer-0.16.7.tar.gz /vdirsyncer-0.16.8.tar.gz /vdirsyncer-0.18.0.tar.gz +/vdirsyncer-0.19.2.tar.gz diff --git a/sources b/sources index 271e235..cbc9e85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.18.0.tar.gz) = 0daefdc57f5562a7cdddba014fdeae9f1e68ec08568753073040dfc52e1740662b367df35a8f45e31d0672df5717b257fc0293eb4bd4c9bb10bad7cc79b12556 +SHA512 (vdirsyncer-0.19.2.tar.gz) = 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce From b4d39fa52afe665deef152a5e283ff558e0204a9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 1 Mar 2024 23:54:04 +0100 Subject: [PATCH 12/32] fix version from github PR: Bump constraint for aiostream #1112 --- aiostream-version-bump.patch | 11 +++++++++++ vdirsyncer.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 aiostream-version-bump.patch diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch new file mode 100644 index 0000000..1fb3798 --- /dev/null +++ b/aiostream-version-bump.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2024-02-06 23:47:09.556664674 +0100 ++++ b/setup.py 2024-02-06 23:47:24.707810178 +0100 +@@ -19,7 +19,7 @@ + # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa + "atomicwrites>=0.1.7", + "aiohttp>=3.8.0,<4.0.0", +- "aiostream>=0.4.3,<0.5.0", ++ "aiostream>=0.4.3,<0.6.0", + ] + + diff --git a/vdirsyncer.spec b/vdirsyncer.spec index dfe733e..cf640e8 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,13 +10,15 @@ Name: vdirsyncer Version: 0.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} +Patch0: aiostream-version-bump.patch + BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 From 3e4fba79b2557a1bb101c86d4a91ff312fe1153a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 11:39:20 +0200 Subject: [PATCH 13/32] Rebuilt for Python 3.13 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index cf640e8..89652a4 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Jun 09 2024 Python Maint - 0.19.2-3 +- Rebuilt for Python 3.13 + * Sat Feb 03 2024 David Kaufmann - 0.19.2-1 - Update to v0.19.2 From 0ec040f4f684b7f7871d04fefe9bbd694792d0d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:37:04 +0000 Subject: [PATCH 14/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 89652a4..da4d000 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.19.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 0.19.2-3 - Rebuilt for Python 3.13 From f77b1c8e800ffcdc1ea37dc3dd81d979e1ee496f Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 26 Aug 2024 22:35:24 -0500 Subject: [PATCH 15/32] Bump allowed version of aiostream again Fixes: RHBZ#2308075 Signed-off-by: Michel Lind --- aiostream-version-bump.patch | 8 ++++---- vdirsyncer.spec | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch index 1fb3798..97a1e87 100644 --- a/aiostream-version-bump.patch +++ b/aiostream-version-bump.patch @@ -1,11 +1,11 @@ ---- a/setup.py 2024-02-06 23:47:09.556664674 +0100 -+++ b/setup.py 2024-02-06 23:47:24.707810178 +0100 -@@ -19,7 +19,7 @@ +--- a/setup.py ++++ b/setup.py +@@ -19,7 +19,7 @@ requirements = [ # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa "atomicwrites>=0.1.7", "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.5.0", -+ "aiostream>=0.4.3,<0.6.0", ++ "aiostream>=0.4.3,<0.7.0", ] diff --git a/vdirsyncer.spec b/vdirsyncer.spec index da4d000..62ea804 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD @@ -22,7 +22,7 @@ Patch0: aiostream-version-bump.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 -BuildRequires: make +BuildRequires: make BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.4 @@ -150,6 +150,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 26 2024 Michel Lind - 0.19.2-5 +- Bump allowed version of aiostream again +- Fixes: RHBZ#2308075 + * Sat Jul 20 2024 Fedora Release Engineering - 0.19.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f592c241cfef9e15c8e32e32301ff216fa920da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:37:49 +0200 Subject: [PATCH 16/32] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdirsyncer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 62ea804..6d61fb6 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,10 +10,11 @@ Name: vdirsyncer Version: 0.19.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} @@ -150,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Sep 04 2024 Miroslav Suchý - 0.19.2-6 +- convert license to SPDX + * Mon Aug 26 2024 Michel Lind - 0.19.2-5 - Bump allowed version of aiostream again - Fixes: RHBZ#2308075 From 16805cd0d442242b42a2e36a429c381045ad3a2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:09:46 +0000 Subject: [PATCH 17/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6d61fb6..deb3dc4 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} # Automatically converted from old format: BSD - review is highly recommended. @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.19.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 0.19.2-6 - convert license to SPDX From a87dcbdf53f45142b327a48569e15125875954f7 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 01:10:27 +0200 Subject: [PATCH 18/32] review licence, bump to v0.19.3 --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4deca4d..59e214c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /vdirsyncer-0.16.8.tar.gz /vdirsyncer-0.18.0.tar.gz /vdirsyncer-0.19.2.tar.gz +/vdirsyncer-0.19.3.tar.gz diff --git a/sources b/sources index cbc9e85..dd8f01b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.19.2.tar.gz) = 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce +SHA512 (vdirsyncer-0.19.3.tar.gz) = 8651282302ad62b2bb6f7655429492dcff959cedc25e932d2e72deb2bb54406c6b5333fecdb14ae8c08ba3c20602856e8466198e24caee298fc9a08545fd3751 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index deb3dc4..336fdb1 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,12 +9,11 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.19.2 -Release: 7%{?dist} +Version: 0.19.3 +Release: 1%{?dist} Summary: %{sum} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} @@ -151,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed May 21 2025 David Kaufmann - 0.19.3-1 +- Update to v0.19.3 + * Sun Jan 19 2025 Fedora Release Engineering - 0.19.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ea96c3b1d2f150025fa3bfb8e4a25617d0219449 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 20:36:53 +0200 Subject: [PATCH 19/32] Rebuilt for Python 3.14 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 336fdb1..53f9b68 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Jun 03 2025 Python Maint - 0.19.3-2 +- Rebuilt for Python 3.14 + * Wed May 21 2025 David Kaufmann - 0.19.3-1 - Update to v0.19.3 From bc417a7321112e6f4f6cfbed6163802d3d915011 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 9 Jul 2025 20:50:15 -0400 Subject: [PATCH 20/32] Modernize RPM macros (rhbz#2378494) --- vdirsyncer.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 53f9b68..df3decb 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -32,7 +32,6 @@ BuildRequires: python3-icalendar BuildRequires: python3-lxml BuildRequires: python3-requests >= 2.10 BuildRequires: python3-requests-toolbelt >= 0.4.0 -BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme @@ -62,7 +61,6 @@ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. %package -n python3-%{srcname} Summary: %{sum} -%{?python_provide:%python_provide python3-%{srcname}} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 @@ -92,6 +90,9 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %autosetup -p1 +%generate_buildrequires +%pyproject_buildrequires + %build # Here we set upstream version based on setuptools_scm documentation # this is done to avoid the following error: @@ -99,7 +100,7 @@ for the vdirsyncer calendar/address-book synchronization utility. # since we are not importing a .git repository in the tarball # From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_build +%pyproject_wheel # Custom sphinx docs need to import vdirsyncer classes from the untarred # source tree @@ -122,21 +123,21 @@ rm -fv docs/_build/html/{.buildinfo,objects.inv} # since we are not importing a .git repository in the tarball # From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_install +%pyproject_install +%pyproject_save_files -l %{srcname} install -d "$RPM_BUILD_ROOT%{_mandir}/man1" cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" %check +%pyproject_check_import + %if %{with tests} sh build.sh tests %endif -%files -n python3-%{srcname} -%license LICENSE +%files -n python3-%{srcname} -f %{pyproject_files} %doc AUTHORS.rst README.rst CONTRIBUTING.rst -%{python3_sitelib}/%{srcname}-*.egg-info -%{python3_sitelib}/%{srcname} %files @@ -150,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jul 09 2025 Ben Boeckel - 0.19.3-3 +- Modernize RPM macros (rhbz#2378494) + * Tue Jun 03 2025 Python Maint - 0.19.3-2 - Rebuilt for Python 3.14 From b13b1fa81906a3e8b17ac1d22b7bc3d22560400d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:59:40 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index df3decb..d1d0652 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.19.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 09 2025 Ben Boeckel - 0.19.3-3 - Modernize RPM macros (rhbz#2378494) From e7abc5458e9faf865e17af423bfddf6650c85e45 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:54 +0200 Subject: [PATCH 22/32] Rebuilt for Python 3.14.0rc2 bytecode --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index d1d0652..3055454 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Aug 15 2025 Python Maint - 0.19.3-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 0.19.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From dc27ee49efa5a78fc1624a3a7a7e4764607f0854 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 12:14:55 -0400 Subject: [PATCH 23/32] Remove atomicwrites dependency (see rhbz#2385436) --- remove-atomicwrites-dep.patch | 178 ++++++++++++++++++++++++++++++++++ vdirsyncer.spec | 9 +- 2 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 remove-atomicwrites-dep.patch diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch new file mode 100644 index 0000000..c42fd10 --- /dev/null +++ b/remove-atomicwrites-dep.patch @@ -0,0 +1,178 @@ +From 8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Thu, 13 Feb 2025 09:00:58 +0100 +Subject: [PATCH] atomicwrites: remove dependency on abandoned library + +--- + .builds/tests-archlinux.yml | 1 - + .pre-commit-config.yaml | 1 - + CHANGELOG.rst | 5 +++++ + setup.py | 2 -- + vdirsyncer/cli/utils.py | 2 +- + vdirsyncer/storage/filesystem.py | 3 +-- + vdirsyncer/storage/google.py | 2 +- + vdirsyncer/storage/singlefile.py | 3 +-- + vdirsyncer/utils.py | 26 ++++++++++++++++++++++++++ + 9 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml +index b11fe30d2..494f6c73c 100644 +--- a/.builds/tests-archlinux.yml ++++ b/.builds/tests-archlinux.yml +@@ -10,7 +10,6 @@ packages: + - python-installer + - python-setuptools-scm + # Runtime dependencies: +- - python-atomicwrites + - python-click + - python-click-log + - python-click-threading +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index 7304056b9..6beb3a4ca 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -21,7 +21,6 @@ repos: + - types-setuptools + - types-docutils + - types-requests +- - types-atomicwrites + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: 'v0.2.2' + hooks: +diff --git a/CHANGELOG.rst b/CHANGELOG.rst +index b43a33de9..bc32cfda0 100644 +--- a/CHANGELOG.rst ++++ b/CHANGELOG.rst +@@ -9,6 +9,11 @@ Package maintainers and users who have to manually update their installation + may want to subscribe to `GitHub's tag feed + `_. + ++Version 0.19.4 ++============== ++ ++- Remove dependency on abandoned ``atomicwrites`` library. ++ + Version 0.19.3 + ============== + +diff --git a/setup.py b/setup.py +index 47f45a4cc..30cdc9c3b 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,8 +16,6 @@ + "click>=5.0,<9.0", + "click-log>=0.3.0, <0.5.0", + "requests >=2.20.0", +- # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa +- "atomicwrites>=0.1.7", + "aiohttp>=3.8.2,<4.0.0", + "aiostream>=0.4.3,<0.5.0", + ] +diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py +index 428a9c9a3..97f48edc2 100644 +--- a/vdirsyncer/cli/utils.py ++++ b/vdirsyncer/cli/utils.py +@@ -10,7 +10,6 @@ + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import BUGTRACKER_HOME + from .. import DOCS_HOME +@@ -21,6 +20,7 @@ + from ..sync.exceptions import StorageEmpty + from ..sync.exceptions import SyncConflict + from ..sync.status import SqliteStatus ++from ..utils import atomic_write + from ..utils import expand_path + from ..utils import get_storage_init_args + from . import cli_logger +diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py +index ec0ab52e3..8785acc30 100644 +--- a/vdirsyncer/storage/filesystem.py ++++ b/vdirsyncer/storage/filesystem.py +@@ -5,9 +5,8 @@ + import os + import subprocess + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import generate_href +diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py +index 93b784872..ed496a06b 100644 +--- a/vdirsyncer/storage/google.py ++++ b/vdirsyncer/storage/google.py +@@ -11,9 +11,9 @@ + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import open_graphical_browser +diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py +index 982763295..41e7e330e 100644 +--- a/vdirsyncer/storage/singlefile.py ++++ b/vdirsyncer/storage/singlefile.py +@@ -8,9 +8,8 @@ + import os + from typing import Iterable + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkfile + from ..utils import expand_path + from ..utils import get_etag_from_file +diff --git a/vdirsyncer/utils.py b/vdirsyncer/utils.py +index 2e0fd9ce4..657d2d6a5 100644 +--- a/vdirsyncer/utils.py ++++ b/vdirsyncer/utils.py +@@ -1,8 +1,10 @@ + from __future__ import annotations + ++import contextlib + import functools + import os + import sys ++import tempfile + import uuid + from inspect import getfullargspec + from typing import Callable +@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True): + return + + raise RuntimeError("No graphical browser found. Please open the URL " "manually.") ++ ++ ++@contextlib.contextmanager ++def atomic_write(dest, mode="wb", overwrite=False): ++ if "w" not in mode: ++ raise RuntimeError("`atomic_write` requires write access") ++ ++ fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest)) ++ file = os.fdopen(fd, mode=mode) ++ ++ try: ++ yield file ++ except Exception: ++ os.unlink(src) ++ raise ++ else: ++ file.flush() ++ file.close() ++ ++ if overwrite: ++ os.rename(src, dest) ++ else: ++ os.link(src, dest) ++ os.unlink(src) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 3055454..991616c 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -18,12 +18,12 @@ URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} Patch0: aiostream-version-bump.patch +Patch1: remove-atomicwrites-dep.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 BuildRequires: make -BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.4 BuildRequires: python3-click-threading >= 0.4.0 @@ -40,7 +40,6 @@ BuildRequires: python3-trustme BuildRequires: python3-pytest-httpserver BuildRequires: python3-pytest-localserver -Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 @@ -62,7 +61,6 @@ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. %package -n python3-%{srcname} Summary: %{sum} -Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 @@ -151,6 +149,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 18 2025 Ben Boeckel - 0.19.3-6 +- Remove atomicwrites dependency (see rhbz#2385436) + * Fri Aug 15 2025 Python Maint - 0.19.3-5 - Rebuilt for Python 3.14.0rc2 bytecode From ab2928be81fee48f512e5a1a43a68c68e44a6543 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 12:42:28 -0400 Subject: [PATCH 24/32] atomicwrites: munge patch for backporting --- remove-atomicwrites-dep.patch | 19 +------------------ vdirsyncer.spec | 1 + 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch index c42fd10..d7d23d1 100644 --- a/remove-atomicwrites-dep.patch +++ b/remove-atomicwrites-dep.patch @@ -1,20 +1,3 @@ -From 8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Thu, 13 Feb 2025 09:00:58 +0100 -Subject: [PATCH] atomicwrites: remove dependency on abandoned library - ---- - .builds/tests-archlinux.yml | 1 - - .pre-commit-config.yaml | 1 - - CHANGELOG.rst | 5 +++++ - setup.py | 2 -- - vdirsyncer/cli/utils.py | 2 +- - vdirsyncer/storage/filesystem.py | 3 +-- - vdirsyncer/storage/google.py | 2 +- - vdirsyncer/storage/singlefile.py | 3 +-- - vdirsyncer/utils.py | 26 ++++++++++++++++++++++++++ - 9 files changed, 35 insertions(+), 10 deletions(-) - diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml index b11fe30d2..494f6c73c 100644 --- a/.builds/tests-archlinux.yml @@ -65,7 +48,7 @@ index 47f45a4cc..30cdc9c3b 100644 "requests >=2.20.0", - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", - "aiohttp>=3.8.2,<4.0.0", + "aiohttp>=3.8.0,<4.0.0", "aiostream>=0.4.3,<0.5.0", ] diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 991616c..c15f5e6 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,6 +18,7 @@ URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} Patch0: aiostream-version-bump.patch +# https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Patch1: remove-atomicwrites-dep.patch BuildArch: noarch From 07d8c8ea92369b77f5ae7dce84855142f4edab96 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 13:45:41 -0400 Subject: [PATCH 25/32] atomicwrites: tweak context again --- remove-atomicwrites-dep.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch index d7d23d1..5a37153 100644 --- a/remove-atomicwrites-dep.patch +++ b/remove-atomicwrites-dep.patch @@ -49,7 +49,7 @@ index 47f45a4cc..30cdc9c3b 100644 - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.5.0", + "aiostream>=0.4.3,<0.7.0", ] diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py index 428a9c9a3..97f48edc2 100644 From 7c091a3f8a7435964cbd2cfac045abf90f8da718 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 28 Aug 2025 21:19:25 -0400 Subject: [PATCH 26/32] Update to 0.20.0 --- .gitignore | 1 + aiostream-version-bump.patch | 11 --- remove-atomicwrites-dep.patch | 161 ---------------------------------- sources | 1 + vdirsyncer.spec | 11 ++- 5 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 aiostream-version-bump.patch delete mode 100644 remove-atomicwrites-dep.patch diff --git a/.gitignore b/.gitignore index 59e214c..131b402 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /vdirsyncer-0.18.0.tar.gz /vdirsyncer-0.19.2.tar.gz /vdirsyncer-0.19.3.tar.gz +/vdirsyncer-0.20.0.tar.gz diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch deleted file mode 100644 index 97a1e87..0000000 --- a/aiostream-version-bump.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ requirements = [ - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", - "aiohttp>=3.8.0,<4.0.0", -- "aiostream>=0.4.3,<0.5.0", -+ "aiostream>=0.4.3,<0.7.0", - ] - - diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch deleted file mode 100644 index 5a37153..0000000 --- a/remove-atomicwrites-dep.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml -index b11fe30d2..494f6c73c 100644 ---- a/.builds/tests-archlinux.yml -+++ b/.builds/tests-archlinux.yml -@@ -10,7 +10,6 @@ packages: - - python-installer - - python-setuptools-scm - # Runtime dependencies: -- - python-atomicwrites - - python-click - - python-click-log - - python-click-threading -diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml -index 7304056b9..6beb3a4ca 100644 ---- a/.pre-commit-config.yaml -+++ b/.pre-commit-config.yaml -@@ -21,7 +21,6 @@ repos: - - types-setuptools - - types-docutils - - types-requests -- - types-atomicwrites - - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.2.2' - hooks: -diff --git a/CHANGELOG.rst b/CHANGELOG.rst -index b43a33de9..bc32cfda0 100644 ---- a/CHANGELOG.rst -+++ b/CHANGELOG.rst -@@ -9,6 +9,11 @@ Package maintainers and users who have to manually update their installation - may want to subscribe to `GitHub's tag feed - `_. - -+Version 0.19.4 -+============== -+ -+- Remove dependency on abandoned ``atomicwrites`` library. -+ - Version 0.19.3 - ============== - -diff --git a/setup.py b/setup.py -index 47f45a4cc..30cdc9c3b 100644 ---- a/setup.py -+++ b/setup.py -@@ -16,8 +16,6 @@ - "click>=5.0,<9.0", - "click-log>=0.3.0, <0.5.0", - "requests >=2.20.0", -- # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa -- "atomicwrites>=0.1.7", - "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.7.0", - ] -diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py -index 428a9c9a3..97f48edc2 100644 ---- a/vdirsyncer/cli/utils.py -+++ b/vdirsyncer/cli/utils.py -@@ -10,7 +10,6 @@ - - import aiohttp - import click --from atomicwrites import atomic_write - - from .. import BUGTRACKER_HOME - from .. import DOCS_HOME -@@ -21,6 +20,7 @@ - from ..sync.exceptions import StorageEmpty - from ..sync.exceptions import SyncConflict - from ..sync.status import SqliteStatus -+from ..utils import atomic_write - from ..utils import expand_path - from ..utils import get_storage_init_args - from . import cli_logger -diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py -index ec0ab52e3..8785acc30 100644 ---- a/vdirsyncer/storage/filesystem.py -+++ b/vdirsyncer/storage/filesystem.py -@@ -5,9 +5,8 @@ - import os - import subprocess - --from atomicwrites import atomic_write -- - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkdir - from ..utils import expand_path - from ..utils import generate_href -diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py -index 93b784872..ed496a06b 100644 ---- a/vdirsyncer/storage/google.py -+++ b/vdirsyncer/storage/google.py -@@ -11,9 +11,9 @@ - - import aiohttp - import click --from atomicwrites import atomic_write - - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkdir - from ..utils import expand_path - from ..utils import open_graphical_browser -diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py -index 982763295..41e7e330e 100644 ---- a/vdirsyncer/storage/singlefile.py -+++ b/vdirsyncer/storage/singlefile.py -@@ -8,9 +8,8 @@ - import os - from typing import Iterable - --from atomicwrites import atomic_write -- - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkfile - from ..utils import expand_path - from ..utils import get_etag_from_file -diff --git a/vdirsyncer/utils.py b/vdirsyncer/utils.py -index 2e0fd9ce4..657d2d6a5 100644 ---- a/vdirsyncer/utils.py -+++ b/vdirsyncer/utils.py -@@ -1,8 +1,10 @@ - from __future__ import annotations - -+import contextlib - import functools - import os - import sys -+import tempfile - import uuid - from inspect import getfullargspec - from typing import Callable -@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True): - return - - raise RuntimeError("No graphical browser found. Please open the URL " "manually.") -+ -+ -+@contextlib.contextmanager -+def atomic_write(dest, mode="wb", overwrite=False): -+ if "w" not in mode: -+ raise RuntimeError("`atomic_write` requires write access") -+ -+ fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest)) -+ file = os.fdopen(fd, mode=mode) -+ -+ try: -+ yield file -+ except Exception: -+ os.unlink(src) -+ raise -+ else: -+ file.flush() -+ file.close() -+ -+ if overwrite: -+ os.rename(src, dest) -+ else: -+ os.link(src, dest) -+ os.unlink(src) diff --git a/sources b/sources index dd8f01b..c25ba16 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (vdirsyncer-0.19.3.tar.gz) = 8651282302ad62b2bb6f7655429492dcff959cedc25e932d2e72deb2bb54406c6b5333fecdb14ae8c08ba3c20602856e8466198e24caee298fc9a08545fd3751 +SHA512 (vdirsyncer-0.20.0.tar.gz) = 8499440ce8ba036d40f5bbff9d7cadb485be8bb2419d1fbad947f244259dabba9f2527ffff24298f697dd10e6ccd39155ea9547a480c584f64da0eadb993dad7 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index c15f5e6..61a051e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,18 +9,14 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.19.3 -Release: 6%{?dist} +Version: 0.20.0 +Release: 1%{?dist} Summary: %{sum} License: BSD-3-Clause URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} -Patch0: aiostream-version-bump.patch -# https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac -Patch1: remove-atomicwrites-dep.patch - BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -150,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Aug 28 2025 Ben Boeckel - 0.20.0-1 +- Update to 0.20.0 + * Mon Aug 18 2025 Ben Boeckel - 0.19.3-6 - Remove atomicwrites dependency (see rhbz#2385436) From 3cc425bd460a80e8ad02cc3774819cc714e1b98b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:01 +0200 Subject: [PATCH 27/32] Rebuilt for Python 3.14.0rc3 bytecode --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 61a051e..23abe0d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Sep 19 2025 Python Maint - 0.20.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Aug 28 2025 Ben Boeckel - 0.20.0-1 - Update to 0.20.0 From accb86a950fc7b0f6d54f2c9f58b155d5e688ee3 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 16 Dec 2025 16:35:00 +0000 Subject: [PATCH 28/32] Support building with old setuptools (pre-PEP 639) Signed-off-by: Michel Lind --- series | 1 + ...syncer-revert-license-metadata-update.diff | 19 +++++++++++++++ vdirsyncer.spec | 23 ++++++++++++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 series create mode 100644 vdirsyncer-revert-license-metadata-update.diff diff --git a/series b/series new file mode 100644 index 0000000..7526468 --- /dev/null +++ b/series @@ -0,0 +1 @@ +vdirsyncer-revert-license-metadata-update.diff diff --git a/vdirsyncer-revert-license-metadata-update.diff b/vdirsyncer-revert-license-metadata-update.diff new file mode 100644 index 0000000..919b5aa --- /dev/null +++ b/vdirsyncer-revert-license-metadata-update.diff @@ -0,0 +1,19 @@ +Reverting changes in 03d1c4666d701283ceba479174925963fa607f3b but with improvements + +See https://github.com/pimutils/vdirsyncer/pull/1204 for bumping the required setuptools to actually work with the new declarations +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -16,11 +16,11 @@ description = "Synchronize calendars and + readme = "README.rst" + requires-python = ">=3.8" + keywords = ["todo", "task", "icalendar", "cli"] +-license = "BSD-3-Clause" +-license-files = ["LICENSE"] ++license = {file = "LICENSE"} + classifiers = [ + "Development Status :: 4 - Beta", + "Environment :: Console", ++ "License :: OSI Approved :: BSD License", + "Operating System :: POSIX", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 23abe0d..6c31c00 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -2,6 +2,14 @@ # as we need to package both wsgi_intercept and pytest-localserver # for them to work. Will also need BR: pystest once the two # above packages exist in Fedora +%bcond tests 0 + +%if (%{defined fedora} && 0%{?fedora} <= 42) || (%{defined rhel} && 0%{?rhel} <= 10) +# setuptools < 77 does not support PEP 639 +%bcond old_setuptools 1 +%else +%bcond old_setuptools 0 +%endif %global sum Synchronize calendars and contacts %global srcname vdirsyncer @@ -10,12 +18,14 @@ Name: vdirsyncer Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD-3-Clause URL: https://github.com/pimutils/%{name} -Source0: %{pypi_source} +Source: %{pypi_source} +# conditional patches +Patch1000: vdirsyncer-revert-license-metadata-update.diff BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -83,7 +93,11 @@ The vdirsyncer-doc package provides all the documentation for the vdirsyncer calendar/address-book synchronization utility. %prep -%autosetup -p1 +%autosetup -N +%autopatch -p1 -M 999 +%if %{with old_setuptools} +%autopatch -p1 1000 +%endif %generate_buildrequires %pyproject_buildrequires @@ -146,6 +160,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Dec 16 2025 Michel Lind - 0.20.0-3 +- Support building with old setuptools (pre-PEP 639) + * Fri Sep 19 2025 Python Maint - 0.20.0-2 - Rebuilt for Python 3.14.0rc3 bytecode From 5090882e1682915406f801963bd0e207e3153b77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:48:58 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6c31c00..c95f009 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -160,6 +160,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 16 2025 Michel Lind - 0.20.0-3 - Support building with old setuptools (pre-PEP 639) From da001d76bcc47e2bc761151117a6d112cb27ef32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 4 May 2026 11:25:45 +0200 Subject: [PATCH 30/32] Add BuildRequires on python3-pkg-resources for setuptools 82 compatibility Setuptools 82 dropped pkg_resources from the setuptools distribution. Add explicit build dependency on the compat package. Assisted-by: Cursor --- vdirsyncer.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index c95f009..97a0d57 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -46,6 +46,7 @@ BuildRequires: python3-aiohttp-oauthlib BuildRequires: python3-trustme BuildRequires: python3-pytest-httpserver BuildRequires: python3-pytest-localserver +BuildRequires: python3-pkg-resources Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 @@ -160,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu May 07 2026 Tomáš Hrnčiar - 0.20.0-5 +- Add BR on python3-pkg-resources, setuptools 82 dropped pkg_resources + * Sat Jan 17 2026 Fedora Release Engineering - 0.20.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7db9d7666bd4ca001ab9ff4e884ff862078c02b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 15:56:10 +0200 Subject: [PATCH 31/32] Rebuilt for Python 3.15 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 97a0d57..14cea51 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -161,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Jun 04 2026 Python Maint - 0.20.0-6 +- Rebuilt for Python 3.15 + * Thu May 07 2026 Tomáš Hrnčiar - 0.20.0-5 - Add BR on python3-pkg-resources, setuptools 82 dropped pkg_resources From 195ab5d0cc7202f4287b4252f68a573c009f71de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:23:42 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 14cea51..4f7147d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -161,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.20.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 0.20.0-6 - Rebuilt for Python 3.15