Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-adblock for openSUSE:Factory
checked in at 2023-03-28 17:51:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-adblock (Old)
and /work/SRC/openSUSE:Factory/.python-adblock.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-adblock"
Tue Mar 28 17:51:08 2023 rev:8 rq:1074916 version:0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-adblock/python-adblock.changes
2022-07-26 19:44:35.146309000 +0200
+++ /work/SRC/openSUSE:Factory/.python-adblock.new.31432/python-adblock.changes
2023-03-28 17:51:18.095535397 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 08:09:55 UTC 2023 - Mia Herkt <m...@0x0.st>
+
+- Update vendor tarball
+- Add python-adblock-maturin-0-14-compat.patch
+ Allow building with newer maturin, which is pedantic about
+ PEP 621
+
+-------------------------------------------------------------------
New:
----
cargo_config
python-adblock-maturin-0-14-compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-adblock.spec ++++++
--- /var/tmp/diff_new_pack.uAVPcq/_old 2023-03-28 17:51:18.899539276 +0200
+++ /var/tmp/diff_new_pack.uAVPcq/_new 2023-03-28 17:51:18.903539296 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-adblock
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
%define skip_python36 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-adblock
Version: 0.6.0
Release: 0
@@ -26,6 +25,9 @@
URL: https://pypi.org/project/adblock/
Source:
https://github.com/ArniDagur/python-adblock/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: vendor.tar.xz
+Source2: cargo_config
+# PATCH-FIX-OPENSUSE allow building with newer maturin, which is pedantic
about PEP 621
+Patch0: python-adblock-maturin-0-14-compat.patch
BuildRequires: %{python_module maturin}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
@@ -41,11 +43,11 @@
Python wrapper for Brave's adblocking library.
%prep
-%setup -q
+%autosetup -a1 -p1
# build flavor-specific versions -- otherwise wheels will not work
sed -i 's/"abi3-py37", //' Cargo.toml
-
-tar xf %{SOURCE1}
+mkdir .cargo
+cp %{SOURCE2} .cargo/config
%build
%pyproject_wheel
++++++ _service ++++++
--- /var/tmp/diff_new_pack.uAVPcq/_old 2023-03-28 17:51:18.951539528 +0200
+++ /var/tmp/diff_new_pack.uAVPcq/_new 2023-03-28 17:51:18.955539547 +0200
@@ -1,4 +1,9 @@
<services>
+ <service name="cargo_vendor" mode="disabled">
+ <param name="srcdir">python-adblock</param>
+ <param name="compression">xz</param>
+ <param name="update">true</param>
+ </service>
<service name="cargo_audit" mode="disabled">
</service>
</services>
++++++ cargo_config ++++++
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"
(No newline at EOF)
++++++ python-adblock-maturin-0-14-compat.patch ++++++
diff -ru python-adblock-0.6.0/Cargo.toml python-adblock/Cargo.toml
--- python-adblock-0.6.0/Cargo.toml 2022-07-18 00:57:45.000000000 +0200
+++ python-adblock/Cargo.toml 2023-03-28 09:56:10.191554072 +0200
@@ -9,15 +9,6 @@
homepage = "https://github.com/ArniDagur/python-adblock";
repository = "https://github.com/ArniDagur/python-adblock";
-[package.metadata.maturin]
-classifier = [
- "Programming Language :: Python",
- "Programming Language :: Rust",
- "License :: OSI Approved :: MIT License",
- "License :: OSI Approved :: Apache Software License",
-]
-requires-python = ">=3.7"
-
[profile.release]
debug = true
diff -ru python-adblock-0.6.0/pyproject.toml python-adblock/pyproject.toml
--- python-adblock-0.6.0/pyproject.toml 2022-07-18 00:57:45.000000000 +0200
+++ python-adblock/pyproject.toml 2023-03-28 09:56:06.079472470 +0200
@@ -15,3 +15,12 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
build-backend = "maturin"
+
+[package.metadata.maturin]
+classifier = [
+ "Programming Language :: Python",
+ "Programming Language :: Rust",
+ "License :: OSI Approved :: MIT License",
+ "License :: OSI Approved :: Apache Software License",
+]
+requires-python = ">=3.7"
diff -ru python-adblock-0.6.0/tests/test_metadata.py
python-adblock/tests/test_metadata.py
--- python-adblock-0.6.0/tests/test_metadata.py 2022-07-18 00:57:45.000000000
+0200
+++ python-adblock/tests/test_metadata.py 2023-03-28 10:07:26.104151881
+0200
@@ -57,7 +57,7 @@
Make sure that the Python interpreter we're running this test suite on
falls into the required Python range.
"""
- with open("Cargo.toml", encoding="utf-8") as f:
+ with open("pyproject.toml", encoding="utf-8") as f:
cargo_toml = toml.loads(f.read())
required_python =
cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/python-adblock/vendor.tar.xz
/work/SRC/openSUSE:Factory/.python-adblock.new.31432/vendor.tar.xz differ: char
26, line 1
