From f588fd6d37b07fceb5e43ee40cdcc8bf8e5cca3a Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Thu, 28 Mar 2024 09:00:17 +0100
Subject: [PATCH] python/nh3: update to 0.2.17
---
components/python/nh3/nh3-PYVER.p5m | 2 +-
components/python/nh3/python-integrate-project.conf | 2 --
components/python/nh3/manifests/sample-manifest.p5m | 4 ++--
components/python/nh3/pkg5 | 6 +++---
components/python/nh3/Makefile | 7 ++-----
components/python/nh3/test/results-all.master | 3 ++-
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/components/python/nh3/Makefile b/components/python/nh3/Makefile
index 4f1c852..e91a17e 100644
--- a/components/python/nh3/Makefile
+++ b/components/python/nh3/Makefile
@@ -15,17 +15,14 @@
#
BUILD_STYLE = pyproject
-PYTHON3_SOABI = abi3
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = nh3
-HUMAN_VERSION = 0.2.15
+HUMAN_VERSION = 0.2.17
COMPONENT_SUMMARY = nh3 - Python bindings to the ammonia HTML sanitization library.
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/08/03/506eb477d723da0db7c46d6259ee06bc68243ef40f5626eb66ab72ae4d69/nh3-0.2.15.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:d1e30ff2d8d58fb2a14961f7aac1bbb1c51f9bdd7da727be35c63826060b0bf3
+ sha256:40d0741a19c3d645e54efba71cb0d8c475b59135c1e3c580f879ad5514cbf028
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
diff --git a/components/python/nh3/manifests/sample-manifest.p5m b/components/python/nh3/manifests/sample-manifest.p5m
index e071290..9e8b056 100644
--- a/components/python/nh3/manifests/sample-manifest.p5m
+++ b/components/python/nh3/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,7 +27,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nh3-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.pyi
-file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.so
+file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.abi3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/py.typed
# python modules are unusable without python runtime binary
diff --git a/components/python/nh3/nh3-PYVER.p5m b/components/python/nh3/nh3-PYVER.p5m
index e4e9328..abc8f4e 100644
--- a/components/python/nh3/nh3-PYVER.p5m
+++ b/components/python/nh3/nh3-PYVER.p5m
@@ -27,7 +27,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nh3-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.pyi
-file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.so
+file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.abi3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/py.typed
# python modules are unusable without python runtime binary
diff --git a/components/python/nh3/pkg5 b/components/python/nh3/pkg5
index ba3088c..dbac2d2 100644
--- a/components/python/nh3/pkg5
+++ b/components/python/nh3/pkg5
@@ -6,8 +6,8 @@
"system/library/gcc-13-runtime"
],
"fmris": [
- "library/python/nh3-39",
- "library/python/nh3"
+ "library/python/nh3",
+ "library/python/nh3-39"
],
"name": "nh3"
-}
\ No newline at end of file
+}
diff --git a/components/python/nh3/python-integrate-project.conf b/components/python/nh3/python-integrate-project.conf
index 0216c8c..be9b31f 100644
--- a/components/python/nh3/python-integrate-project.conf
+++ b/components/python/nh3/python-integrate-project.conf
@@ -13,8 +13,6 @@
# Copyright 2023 Marcel Telka
#
-%include-1%
-PYTHON3_SOABI = abi3
%include-3%
# https://www.illumos.org/issues/15767
LD_Z_IGNORE=
diff --git a/components/python/nh3/test/results-all.master b/components/python/nh3/test/results-all.master
index 5cccc97..eb6648d 100644
--- a/components/python/nh3/test/results-all.master
+++ b/components/python/nh3/test/results-all.master
@@ -2,6 +2,7 @@
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
cachedir: .pytest_cache
rootdir: $(@D)
+configfile: pyproject.toml
collecting ... collected 4 items
tests/test_nh3.py::test_clean PASSED
@@ -11,7 +12,7 @@
=============================== warnings summary ===============================
tests/test_nh3.py::test_clean_with_attribute_filter
- $(PYTHON_DIR)/vendor-packages/_pytest/unraisableexception.py:78: PytestUnraisableExceptionWarning: Exception ignored in: ('img', 'src', 'foo')
+ $(PYTHON_DIR)/vendor-packages/_pytest/unraisableexception.py:80: PytestUnraisableExceptionWarning: Exception ignored in: ('img', 'src', 'foo')
Traceback (most recent call last):
File "$(@D)/tests/test_nh3.py", line 71, in test_clean_with_attribute_filter
--
Gitblit v1.9.3