From 6314b6e3f372abbee53d4072557e08cff3418c68 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Thu, 04 Apr 2024 18:45:41 +0200
Subject: [PATCH] python/PyQt-builder: update to 1.16.0
---
components/python/PyQt-builder/pkg5 | 7 +-
/dev/null | 50 ----------------
components/python/PyQt-builder/PyQt-builder.license | 22 +++++++
components/python/PyQt-builder/manifests/sample-manifest.p5m | 6 -
components/python/PyQt-builder/python-integrate-project.conf | 18 ++++++
components/python/PyQt-builder/Makefile | 15 ++---
components/python/PyQt-builder/PyQt-builder-PYVER.p5m | 4 -
7 files changed, 53 insertions(+), 69 deletions(-)
diff --git a/components/python/PyQt-builder/Makefile b/components/python/PyQt-builder/Makefile
index 0df7ca9..9b9ff80 100644
--- a/components/python/PyQt-builder/Makefile
+++ b/components/python/PyQt-builder/Makefile
@@ -19,23 +19,20 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = PyQt-builder
-HUMAN_VERSION = 1.15.4
-COMPONENT_SUMMARY = PyQt-builder - The PEP 517 compliant PyQt build system
-COMPONENT_PROJECT_URL = https://www.riverbankcomputing.com/software/pyqt-builder/
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/c0/75/a3384eea8770c17e77821368618a5140c4ae0c37f9c05a84ef55f4807172/PyQt-builder-1.15.4.tar.gz
+HUMAN_VERSION = 1.16.0
+COMPONENT_SUMMARY = PyQt-builder - The PyQt build system
COMPONENT_ARCHIVE_HASH = \
- sha256:39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1
-COMPONENT_LICENSE = GPL-3.0-only
-COMPONENT_LICENSE_FILE = LICENSE-GPL3
+ sha256:47bbd2cfa5430020108f9f40301e166cbea98b6ef3e53953350bdd4c6b31ab18
+COMPONENT_LICENSE = BSD-2-Clause
-TEST_STYLE = setup.py
+TEST_STYLE = none
include $(WS_MAKE_RULES)/common.mk
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/packaging
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
+PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
PYTHON_REQUIRED_PACKAGES += library/python/sip
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
diff --git a/components/python/PyQt-builder/PyQt-builder-PYVER.p5m b/components/python/PyQt-builder/PyQt-builder-PYVER.p5m
index a1c4f7d..796adf3 100644
--- a/components/python/PyQt-builder/PyQt-builder-PYVER.p5m
+++ b/components/python/PyQt-builder/PyQt-builder-PYVER.p5m
@@ -25,14 +25,12 @@
file path=usr/bin/pyqt-bundle-$(PYVER)
file path=usr/bin/pyqt-qt-wheel-$(PYVER)
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE-GPL2
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE-GPL3
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/_version.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/bindings.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/builder.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/bundle/__init__.py
diff --git a/components/python/PyQt-builder/PyQt-builder.license b/components/python/PyQt-builder/PyQt-builder.license
new file mode 100644
index 0000000..fdf66ca
--- /dev/null
+++ b/components/python/PyQt-builder/PyQt-builder.license
@@ -0,0 +1,22 @@
+Copyright (c) <year> <owner>.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/components/python/PyQt-builder/manifests/sample-manifest.p5m b/components/python/PyQt-builder/manifests/sample-manifest.p5m
index 79260d0..a5a5e17 100644
--- a/components/python/PyQt-builder/manifests/sample-manifest.p5m
+++ b/components/python/PyQt-builder/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)
@@ -25,14 +25,12 @@
file path=usr/bin/pyqt-bundle-$(PYVER)
file path=usr/bin/pyqt-qt-wheel-$(PYVER)
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE-GPL2
-file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/LICENSE-GPL3
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/PyQt_builder-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/_version.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/bindings.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/builder.py
file path=usr/lib/python$(PYVER)/vendor-packages/pyqtbuild/bundle/__init__.py
diff --git a/components/python/PyQt-builder/pkg5 b/components/python/PyQt-builder/pkg5
index 959a458..38787c1 100644
--- a/components/python/PyQt-builder/pkg5
+++ b/components/python/PyQt-builder/pkg5
@@ -2,13 +2,14 @@
"dependencies": [
"library/python/packaging-39",
"library/python/setuptools-39",
+ "library/python/setuptools-scm-39",
"library/python/sip-39",
"library/python/wheel-39",
"runtime/python-39"
],
"fmris": [
- "library/python/pyqt-builder-39",
- "library/python/pyqt-builder"
+ "library/python/pyqt-builder",
+ "library/python/pyqt-builder-39"
],
"name": "PyQt-builder"
-}
\ No newline at end of file
+}
diff --git a/components/python/PyQt-builder/python-integrate-project.conf b/components/python/PyQt-builder/python-integrate-project.conf
new file mode 100644
index 0000000..f283c6f
--- /dev/null
+++ b/components/python/PyQt-builder/python-integrate-project.conf
@@ -0,0 +1,18 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2024 Marcel Telka
+#
+
+%hook-no-license%
+# https://github.com/Python-PyQt/PyQt-builder/issues/7
+cat "$WS_TOP/tools/licenses/license.BSD-2-Clause" > "$DISTRIBUTION.license"
diff --git a/components/python/PyQt-builder/test/results-all.master b/components/python/PyQt-builder/test/results-all.master
deleted file mode 100644
index 905b88f..0000000
--- a/components/python/PyQt-builder/test/results-all.master
+++ /dev/null
@@ -1,50 +0,0 @@
-running test
-WARNING: Testing via this command is deprecated and will be removed in a future version. Users looking for a generic test entry point independent of test runner are encouraged to use tox.
-$(PYTHON_DIR)/vendor-packages/setuptools/command/test.py:193: _DeprecatedInstaller: setuptools.installer and fetch_build_eggs are deprecated.
-!!
-
- ********************************************************************************
- Requirements should be satisfied by a PEP 517 installer.
- If you are using pip, you can try `pip install --use-pep517`.
- ********************************************************************************
-
-!!
- ir_d = dist.fetch_build_eggs(dist.install_requires)
-$(PYTHON_DIR)/vendor-packages/setuptools/command/test.py:194: _DeprecatedInstaller: setuptools.installer and fetch_build_eggs are deprecated.
-!!
-
- ********************************************************************************
- Requirements should be satisfied by a PEP 517 installer.
- If you are using pip, you can try `pip install --use-pep517`.
- ********************************************************************************
-
-!!
- tr_d = dist.fetch_build_eggs(dist.tests_require or [])
-$(PYTHON_DIR)/vendor-packages/setuptools/command/test.py:195: _DeprecatedInstaller: setuptools.installer and fetch_build_eggs are deprecated.
-!!
-
- ********************************************************************************
- Requirements should be satisfied by a PEP 517 installer.
- If you are using pip, you can try `pip install --use-pep517`.
- ********************************************************************************
-
-!!
- er_d = dist.fetch_build_eggs(
-running egg_info
-writing PyQt_builder.egg-info/PKG-INFO
-writing dependency_links to PyQt_builder.egg-info/dependency_links.txt
-writing entry points to PyQt_builder.egg-info/entry_points.txt
-writing requirements to PyQt_builder.egg-info/requires.txt
-writing top-level names to PyQt_builder.egg-info/top_level.txt
-reading manifest file 'PyQt_builder.egg-info/SOURCES.txt'
-reading manifest template 'MANIFEST.in'
-adding license file 'LICENSE'
-adding license file 'LICENSE-GPL2'
-adding license file 'LICENSE-GPL3'
-writing manifest file 'PyQt_builder.egg-info/SOURCES.txt'
-running build_ext
-
-----------------------------------------------------------------------
-Ran 0 tests
-
-OK
--
Gitblit v1.9.3