From 7f60ead52389b75cda2f37804486f52f51b4196a Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 02 Apr 2024 08:08:11 +0200
Subject: [PATCH] python/inflect: update to 7.2.0
---
components/python/inflect/pkg5 | 9 ++--
components/python/inflect/inflect-PYVER.p5m | 6 +--
components/python/inflect/test/results-all.master | 37 +++---------------
components/python/inflect/history | 2
components/python/inflect/Makefile | 10 ++---
components/python/inflect/manifests/sample-manifest.p5m | 8 +--
components/python/inflect/patches/01-no-ruff.patch | 12 +++---
7 files changed, 28 insertions(+), 56 deletions(-)
diff --git a/components/python/inflect/Makefile b/components/python/inflect/Makefile
index 4a34837..7ea7873 100644
--- a/components/python/inflect/Makefile
+++ b/components/python/inflect/Makefile
@@ -19,28 +19,26 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = inflect
-HUMAN_VERSION = 7.0.0
+HUMAN_VERSION = 7.2.0
COMPONENT_SUMMARY = inflect - Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words
COMPONENT_PROJECT_URL = https://github.com/jaraco/inflect
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+ sha256:32feacfacfcae2f22e6fccdea10f0ddf26a638fac434d0dddaafbca0034f3784
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
include $(WS_MAKE_RULES)/common.mk
# Auto-generated dependencies
-PYTHON_REQUIRED_PACKAGES += library/python/pydantic
+PYTHON_REQUIRED_PACKAGES += library/python/more-itertools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
+PYTHON_REQUIRED_PACKAGES += library/python/typeguard
PYTHON_REQUIRED_PACKAGES += library/python/typing-extensions
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/pygments
TEST_REQUIRED_PACKAGES.python += library/python/pytest
-TEST_REQUIRED_PACKAGES.python += library/python/pytest-black
TEST_REQUIRED_PACKAGES.python += library/python/pytest-checkdocs
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
TEST_REQUIRED_PACKAGES.python += library/python/pytest-enabler
diff --git a/components/python/inflect/history b/components/python/inflect/history
index 8c3b508..24befbc 100644
--- a/components/python/inflect/history
+++ b/components/python/inflect/history
@@ -1 +1 @@
-library/python/inflect-37@6.0.4,5.11-2023.0.0.1 noincorporate
+library/python/inflect-37@6.0.4,5.11-2023.0.0.2
diff --git a/components/python/inflect/inflect-PYVER.p5m b/components/python/inflect/inflect-PYVER.p5m
index 83a94a9..3624877 100644
--- a/components/python/inflect/inflect-PYVER.p5m
+++ b/components/python/inflect/inflect-PYVER.p5m
@@ -28,9 +28,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/inflect-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/inflect-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/inflect/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/pydantic.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/pydantic1.py
file path=usr/lib/python$(PYVER)/vendor-packages/inflect/py.typed
# python modules are unusable without python runtime binary
@@ -38,5 +35,6 @@
pkg.debug.depend.path=usr/bin
# Automatically generated dependencies based on distribution metadata
-depend type=require fmri=pkg:/library/python/pydantic-$(PYV)
+depend type=require fmri=pkg:/library/python/more-itertools-$(PYV)
+depend type=require fmri=pkg:/library/python/typeguard-$(PYV)
depend type=require fmri=pkg:/library/python/typing-extensions-$(PYV)
diff --git a/components/python/inflect/manifests/sample-manifest.p5m b/components/python/inflect/manifests/sample-manifest.p5m
index 77682b8..6c58a0f 100644
--- a/components/python/inflect/manifests/sample-manifest.p5m
+++ b/components/python/inflect/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)
@@ -28,9 +28,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/inflect-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/inflect-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/inflect/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/pydantic.py
-file path=usr/lib/python$(PYVER)/vendor-packages/inflect/compat/pydantic1.py
file path=usr/lib/python$(PYVER)/vendor-packages/inflect/py.typed
# python modules are unusable without python runtime binary
@@ -38,5 +35,6 @@
pkg.debug.depend.path=usr/bin
# Automatically generated dependencies based on distribution metadata
-depend type=require fmri=pkg:/library/python/pydantic-$(PYV)
+depend type=require fmri=pkg:/library/python/more-itertools-$(PYV)
+depend type=require fmri=pkg:/library/python/typeguard-$(PYV)
depend type=require fmri=pkg:/library/python/typing-extensions-$(PYV)
diff --git a/components/python/inflect/patches/01-no-ruff.patch b/components/python/inflect/patches/01-no-ruff.patch
index cc76923..970396f 100644
--- a/components/python/inflect/patches/01-no-ruff.patch
+++ b/components/python/inflect/patches/01-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
---- inflect-6.1.0/setup.cfg.orig
-+++ inflect-6.1.0/setup.cfg
-@@ -43,7 +43,6 @@
- pytest-mypy >= 0.9.1; \
- python_implementation != "PyPy"
+--- inflect-7.2.0/setup.cfg.orig
++++ inflect-7.2.0/setup.cfg
+@@ -34,7 +34,6 @@
+ pytest-cov
+ pytest-mypy
pytest-enabler >= 2.2
-- pytest-ruff
+- pytest-ruff >= 0.2.1
pygments
docs =
diff --git a/components/python/inflect/pkg5 b/components/python/inflect/pkg5
index 0a2e4e8..7ca8a2a 100644
--- a/components/python/inflect/pkg5
+++ b/components/python/inflect/pkg5
@@ -1,15 +1,16 @@
{
"dependencies": [
- "library/python/pydantic-39",
+ "library/python/more-itertools-39",
"library/python/setuptools-39",
"library/python/setuptools-scm-39",
+ "library/python/typeguard-39",
"library/python/typing-extensions-39",
"library/python/wheel-39",
"runtime/python-39"
],
"fmris": [
- "library/python/inflect-39",
- "library/python/inflect"
+ "library/python/inflect",
+ "library/python/inflect-39"
],
"name": "inflect"
-}
\ No newline at end of file
+}
diff --git a/components/python/inflect/test/results-all.master b/components/python/inflect/test/results-all.master
index aad751b..8900e62 100644
--- a/components/python/inflect/test/results-all.master
+++ b/components/python/inflect/test/results-all.master
@@ -1,56 +1,39 @@
-ROOT: tox-gh-actions won't override envlist because tox is not running in GitHub Actions
-py$(PYV): remove tox env folder .tox/py$(PYV)
+py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
py$(PYV): commands[0]> python -m pytest
============================= test session starts ==============================
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(@D)/.tox/py$(PYV)/bin/python
cachedir: .tox/py$(PYV)/.pytest_cache
-hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('$(@D)/.hypothesis/examples')
rootdir: $(@D)
configfile: pytest.ini
-asyncio: mode=strict
-collecting ... collected 269 items
+collecting ... collected 248 items
-::project PASSED
-docs/conf.py::BLACK PASSED
+.::project PASSED
+.::project PASSED
docs/conf.py::mypy PASSED
docs/conf.py::mypy-status PASSED
-inflect/__init__.py::BLACK PASSED
inflect/__init__.py::inflect.bysize PASSED
+inflect/__init__.py::inflect.engine._handle_long_compounds PASSED
inflect/__init__.py::inflect.engine._handle_prepositional_phrase PASSED
inflect/__init__.py::inflect.engine.compare PASSED
inflect/__init__.py::inflect.engine.ordinal PASSED
inflect/__init__.py::inflect.engine.singular_noun PASSED
inflect/__init__.py::inflect.joinstem PASSED
inflect/__init__.py::mypy PASSED
-inflect/compat/__init__.py::BLACK PASSED
-inflect/compat/__init__.py::mypy PASSED
-inflect/compat/pydantic.py::BLACK PASSED
-inflect/compat/pydantic.py::mypy PASSED
-inflect/compat/pydantic1.py::BLACK PASSED
-inflect/compat/pydantic1.py::mypy PASSED
-tests/test_an.py::BLACK PASSED
tests/test_an.py::mypy PASSED
tests/test_an.py::test_an PASSED
tests/test_an.py::test_an_abbreviation PASSED
-tests/test_classical_all.py::BLACK PASSED
tests/test_classical_all.py::Test::test_classical PASSED
tests/test_classical_all.py::mypy PASSED
-tests/test_classical_ancient.py::BLACK PASSED
tests/test_classical_ancient.py::mypy PASSED
tests/test_classical_ancient.py::test_ancient_1 PASSED
-tests/test_classical_herd.py::BLACK PASSED
tests/test_classical_herd.py::mypy PASSED
tests/test_classical_herd.py::test_ancient_1 PASSED
-tests/test_classical_names.py::BLACK PASSED
tests/test_classical_names.py::mypy PASSED
tests/test_classical_names.py::test_ancient_1 PASSED
-tests/test_classical_person.py::BLACK PASSED
tests/test_classical_person.py::mypy PASSED
tests/test_classical_person.py::test_ancient_1 PASSED
-tests/test_classical_zero.py::BLACK PASSED
tests/test_classical_zero.py::mypy PASSED
tests/test_classical_zero.py::test_ancient_1 PASSED
-tests/test_compounds.py::BLACK PASSED
tests/test_compounds.py::mypy PASSED
tests/test_compounds.py::test_compound_1 PASSED
tests/test_compounds.py::test_compound_2 PASSED
@@ -61,7 +44,6 @@
tests/test_compounds.py::test_unit_handling_fractional PASSED
tests/test_compounds.py::test_unit_open_compound_nouns PASSED
tests/test_compounds.py::test_unit_open_compound_nouns_classical PASSED
-tests/test_inflections.py::BLACK PASSED
tests/test_inflections.py::mypy PASSED
tests/test_inflections.py::test_NameError_in_strings PASSED
tests/test_inflections.py::test_decimal_ordinals PASSED
@@ -72,22 +54,18 @@
tests/test_inflections.py::test_many PASSED
tests/test_inflections.py::test_ordinal PASSED
tests/test_inflections.py::test_prespart PASSED
-tests/test_join.py::BLACK PASSED
tests/test_join.py::mypy PASSED
tests/test_join.py::test_join PASSED
-tests/test_numwords.py::BLACK PASSED
tests/test_numwords.py::mypy PASSED
tests/test_numwords.py::test_array PASSED
tests/test_numwords.py::test_issue_131 PASSED
tests/test_numwords.py::test_lines PASSED
tests/test_numwords.py::test_loop PASSED
-tests/test_pl_si.py::BLACK PASSED
tests/test_pl_si.py::mypy PASSED
tests/test_pl_si.py::test_pl_si[classical off-Jones] PASSED
tests/test_pl_si.py::test_pl_si[classical off-Times] PASSED
tests/test_pl_si.py::test_pl_si[classical on-Jones] PASSED
tests/test_pl_si.py::test_pl_si[classical on-Times] PASSED
-tests/test_pwd.py::BLACK PASSED
tests/test_pwd.py::Test::test__pl_check_plurals_N PASSED
tests/test_pwd.py::Test::test__pl_check_plurals_adj PASSED
tests/test_pwd.py::Test::test__pl_general_verb PASSED
@@ -275,13 +253,12 @@
tests/test_pwd.py::Test::test_user_input_fns PASSED
tests/test_pwd.py::Test::test_wordlist PASSED
tests/test_pwd.py::mypy PASSED
-tests/test_unicode.py::BLACK PASSED
tests/test_unicode.py::TestUnicode::test_unicode_plural PASSED
tests/test_unicode.py::mypy PASSED
===================================== mypy =====================================
-Success: no issues found in 19 source files
-======== 252 passed, 16 xfailed ========
+Success: no issues found in 16 source files
+======== 232 passed, 16 xfailed ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3