From e783101812f11b368635f32d46892fb1bd65027c Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Mon, 11 Dec 2023 06:44:09 +0100
Subject: [PATCH] python/isort: update to 5.13.0; obsolete package for Python 3.7
---
components/python/isort/history | 1 +
components/python/isort/manifests/sample-manifest.p5m | 1 +
components/python/isort/isort-PYVER.p5m | 1 +
components/python/isort/patches/01-requirements.patch | 16 ++++++++++++++++
components/python/isort/Makefile | 9 +++------
components/python/isort/python-integrate-project.conf | 16 ++++++++++++++++
components/python/isort/pkg5 | 5 +----
7 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/components/python/isort/Makefile b/components/python/isort/Makefile
index bb7f1a2..cb9fad9 100644
--- a/components/python/isort/Makefile
+++ b/components/python/isort/Makefile
@@ -19,20 +19,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = isort
-HUMAN_VERSION = 5.12.0
+HUMAN_VERSION = 5.13.0
COMPONENT_SUMMARY = isort - A Python utility / library to sort Python imports.
COMPONENT_PROJECT_URL = https://pycqa.github.io/isort/
COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/a9/c4/dc00e42c158fc4dda2afebe57d2e948805c06d5169007f1724f0683010a9/isort-5.12.0.tar.gz
+ https://files.pythonhosted.org/packages/42/c5/e8a34dace89624d27c31c67140362cfe07562c450c52984419ee242f0fcb/isort-5.13.0.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504
+ sha256:d67f78c6a1715f224cca46b29d740037bdb6eea15323a133e897cda15876147b
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
TEST_STYLE = pytest
-
-# isort >= 5.12.0 requires Python >= 3.8
-PYTHON_VERSIONS := $(filter-out 3.7, $(PYTHON_VERSIONS))
include $(WS_MAKE_RULES)/common.mk
diff --git a/components/python/isort/history b/components/python/isort/history
new file mode 100644
index 0000000..102f948
--- /dev/null
+++ b/components/python/isort/history
@@ -0,0 +1 @@
+library/python/isort-37@5.11.5,5.11-2023.0.0.1
diff --git a/components/python/isort/isort-PYVER.p5m b/components/python/isort/isort-PYVER.p5m
index bab2610..7ddd198 100644
--- a/components/python/isort/isort-PYVER.p5m
+++ b/components/python/isort/isort-PYVER.p5m
@@ -68,6 +68,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py3.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py310.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py311.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py312.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py36.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py37.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py38.py
diff --git a/components/python/isort/manifests/sample-manifest.p5m b/components/python/isort/manifests/sample-manifest.p5m
index e55461b..fd81bff 100644
--- a/components/python/isort/manifests/sample-manifest.p5m
+++ b/components/python/isort/manifests/sample-manifest.p5m
@@ -68,6 +68,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py3.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py310.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py311.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py312.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py36.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py37.py
file path=usr/lib/python$(PYVER)/vendor-packages/isort/stdlibs/py38.py
diff --git a/components/python/isort/patches/01-requirements.patch b/components/python/isort/patches/01-requirements.patch
new file mode 100644
index 0000000..6d04ab3
--- /dev/null
+++ b/components/python/isort/patches/01-requirements.patch
@@ -0,0 +1,16 @@
+https://github.com/PyCQA/isort/pull/2207
+
+--- isort-5.13.0/pyproject.toml.orig
++++ isort-5.13.0/pyproject.toml
+@@ -41,11 +41,6 @@
+
+ [tool.poetry.dependencies]
+ python = ">=3.8.0"
+-pipreqs = {version = "*", optional = true}
+-requirementslib = {version = "*", optional = true}
+-pip-api = {version = "*", optional = true}
+-colorama = {version = ">=0.4.6", optional = true}
+-setuptools = {version = "*", optional = true}
+
+ [tool.poetry.extras]
+ colors = ["colorama"]
diff --git a/components/python/isort/pkg5 b/components/python/isort/pkg5
index d915c4d..224136c 100644
--- a/components/python/isort/pkg5
+++ b/components/python/isort/pkg5
@@ -1,10 +1,7 @@
{
"dependencies": [
- "SUNWcs",
"library/python/poetry-core-39",
- "runtime/python-39",
- "shell/ksh93",
- "system/library"
+ "runtime/python-39"
],
"fmris": [
"library/python/isort-39",
diff --git a/components/python/isort/python-integrate-project.conf b/components/python/isort/python-integrate-project.conf
new file mode 100644
index 0000000..8c449b9
--- /dev/null
+++ b/components/python/isort/python-integrate-project.conf
@@ -0,0 +1,16 @@
+#
+# 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 2023 Marcel Telka
+#
+
+%patch% 01-requirements.patch
--
Gitblit v1.9.3