From 2cfd159c8aaaf012fed3e18c3c7f487013fb64e6 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 1 Apr 2024 19:51:16 +0000 Subject: [PATCH] pypi-inflect: Autospec creation for update from version 7.0.0 to version 7.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Anderson Bravalheri (7): Replace pydantic...validate_call with typeguard.typecheck Use a metaclass for Word Replace same_method with regular comparisson Fix black error Remove pydantic imports Remove pydantic compatibility modules Remove dependency on pydantic Avasam (1): Allow mypy on PyPy (jaraco/skeleton#111) Bartosz Sławecki (1): Tweak coverage configuration for type checking (jaraco/skeleton#97) Christian Clauss (2): Upgrade GitHub Actions checkout (jaraco/skeleton#94) GitHub Actions: Combine tox jobs diffcov and docs (jaraco/skeleton#95) Dimitri Papadopoulos Orfanos (2): Use the ruff formatter (jaraco/skeleton#99) ruff: extended-ignore → ignore (jaraco/skeleton#105) James Addison (1): Revert "Remove copyright - copyright is automatic and based on history in version control." Jason R. Coombs (57): Prefer 3.x for Python version (latest stable). Collapse skeleton history. Workaround for jaraco/skeleton#87. Limit the workaround to the Pydantic 2.0.0.0 release. Add links to project home page and pypi. Fixes jaraco/skeleton#77. Replace redundant step names with simple 'Run'. Increase visibility of security policy. (#4) Remove TOX_WORK_DIR workaround, no longer necessary with tox 4. Ref tox-dev/tox#3050. Add changelog Finalize 🧎‍♀️ Genuflect to the types. Refactor to have a single return expression. Remove check on word length (unused). Use windowed_complete to iterate over the windowed words. Rename 'function' to 'inflection' for precision. Remove noqa C901 now that the function is simpler. Pin against sphinx 7.2.5 as workaround for sphinx/sphinx-doc#11662. Closes jaraco/skeleton#88. Allow GITHUB_* settings to pass through to tests. Remove spinner disablement. If it's not already fixed upstream, that's where it should be fixed. Clean up 'color' environment variables. Add diff-cover check to Github Actions CI. Closes jaraco/skeleton#90. Add descriptions to the tox environments. Closes jaraco/skeleton#91. Add FORCE_COLOR to the TOX_OVERRIDE for GHA. Requires tox 4.11.1. Closes jaraco/skeleton#89. Prefer ``pass_env`` in tox config. Preferred failure mode for tox-dev/tox#3127 and closes jaraco/skeleton#92. Limit sphinxlint jobs to 1. Workaround for sphinx-contrib/sphinx-lint#83. Remove news fragment after allowing time to be processed downstream. Suppress deprecation warning in dateutil. Workaround for dateutil/dateutil#1284. Update Github Actions badge per actions/starter-workflows#1525. Separate collateral jobs on different lines for easier override/extension. Drop minimum requirement on pytest-mypy as most environments are already running much later. Closes jaraco/skeleton#96. Remove sole entry for branches-ignore. Workaround for and closes jaraco/skeleton#103. Bump year on badge Remove build and dist from excludes. It appears they are not needed and their presence blocks the names of packages like 'builder' and 'distutils'. Ref pypa/distutils#224. Exclude docs and tests directories properly per Setuptools behavior. Rely on default discovery for good heuristics for finding packages. Enable preview to enable preserving quotes. Use latest versions in RTD boilerplate. Remove Sphinx pin. Ref sphinx-doc/sphinx#11662. Include deps from the base config in diffcov. Registering project with tea. Enable complexity check and pycodestyle warnings. Closes jaraco/skeleton#110. Use 'extend-select' to avoid disabling the default config. Ref jaraco/skeleton#110. Re-enable ignoring of temporary merge queue branches. Closes jaraco/skeleton#103. Fetch unshallow clones in readthedocs. Closes jaraco/skeleton#114. Move Python 3.11 out of the test matrix. 👹 Feed the hobgoblins (delint). One more level deep, pydantic now inflects the error message. 👹 Feed the hobgoblins (delint). Prefer f-strings 👹 Feed the hobgoblins (delint). Catch more specific exception (B017). 👹 Feed the hobgoblins (delint). Fix pointless comparison (B015). 👹 Feed the hobgoblins (delint). 👹 Feed the hobgoblins (delint). Add news fragment. Mark type checking block as uncovered. Finalize Paul (7): Handle "pair of ..." when word in `pl_sb_uninflected_complete` "octopi" as plural form for "octopus" Reverted "octopi" Reverted "syringe" test Created function Added examples to `_handle_long_compounds` Use `noqa: C901` Sviatoslav Sydorenko (1): Enable testing merge queues @ GitHub Actions CI/CD (jaraco/skeleton#93) --- Makefile | 2 +- options.conf | 6 +++- pypi-inflect.spec | 73 +++++++++++++++++++++++++++++++---------------- release | 2 +- upstream | 2 +- 5 files changed, 56 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 1d7cef2..2903ff3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := pypi-inflect -URL = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz +URL = https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/options.conf b/options.conf index b2b021d..7b1b202 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = pypi-inflect -url = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz +url = https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz archives = giturl = https://github.com/jaraco/inflect/ domain = @@ -9,6 +9,8 @@ alias = [autospec] # build 32 bit libraries 32bit = false +# allow windows executables (*.exe, *.dll) to be packaged +allow_exe = false # allow package to build with test failures allow_test_failures = false # unset %build ld_as_needed variable @@ -59,6 +61,8 @@ server = false skip_tests = false # add .so files to the lib package instead of dev so_to_lib = false +# configure build for apx +use_apx = false # configure build for avx2 use_avx2 = true # configure build for avx512 diff --git a/pypi-inflect.spec b/pypi-inflect.spec index fa3e1a1..1f0bb08 100644 --- a/pypi-inflect.spec +++ b/pypi-inflect.spec @@ -2,12 +2,14 @@ # This file is auto-generated. DO NOT EDIT # Generated by: autospec.py # Using build pattern: pyproject +# autospec version: v7 +# autospec commit: f56f1fa # Name : pypi-inflect -Version : 7.0.0 -Release : 26 -URL : https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz -Source0 : https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz +Version : 7.2.0 +Release : 27 +URL : https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz +Source0 : https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz Summary : Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words Group : Development/Tools License : MIT @@ -52,7 +54,8 @@ Summary: python3 components for the pypi-inflect package. Group: Default Requires: python3-core Provides: pypi(inflect) -Requires: pypi(pydantic) +Requires: pypi(more_itertools) +Requires: pypi(typeguard) Requires: pypi(typing_extensions) %description python3 @@ -60,10 +63,10 @@ python3 components for the pypi-inflect package. %prep -%setup -q -n inflect-7.0.0 -cd %{_builddir}/inflect-7.0.0 +%setup -q -n inflect-7.2.0 +cd %{_builddir}/inflect-7.2.0 pushd .. -cp -a inflect-7.0.0 buildavx2 +cp -a inflect-7.2.0 buildavx2 popd %build @@ -71,43 +74,63 @@ export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1688571673 +export SOURCE_DATE_EPOCH=1712001075 export GCC_IGNORE_WERROR=1 export AR=gcc-ar export RANLIB=gcc-ranlib export NM=gcc-nm -export CFLAGS="$CFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " -export FCFLAGS="$FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " -export FFLAGS="$FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " -export CXXFLAGS="$CXXFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_FCFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS" +CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS" +FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS" +FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS" +ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS" +LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS" export MAKEFLAGS=%{?_smp_mflags} python3 -m build --wheel --skip-dependency-check --no-isolation pushd ../buildavx2/ -export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 " -export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 " +CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 " +LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 " python3 -m build --wheel --skip-dependency-check --no-isolation popd %install +export GCC_IGNORE_WERROR=1 +export AR=gcc-ar +export RANLIB=gcc-ranlib +export NM=gcc-nm +CLEAR_INTERMEDIATE_CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_FCFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CLEAR_INTERMEDIATE_CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz=zstd " +CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS" +CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS" +FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS" +FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS" +ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS" +LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS" export MAKEFLAGS=%{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/pypi-inflect cp %{_builddir}/inflect-%{version}/LICENSE %{buildroot}/usr/share/package-licenses/pypi-inflect/0445ed0f69910eeaee036f09a39a13c6e1f37e12 || : -pip install --root=%{buildroot} --no-deps --ignore-installed dist/*.whl +python3 -m installer --destdir=%{buildroot} dist/*.whl echo ----[ mark ]---- cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : echo ----[ mark ]---- pushd ../buildavx2/ -export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 " -export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 " -export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 " -pip install --root=%{buildroot}-v3 --no-deps --ignore-installed dist/*.whl +CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 " +LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 " +python3 -m installer --destdir=%{buildroot}-v3 dist/*.whl popd /usr/bin/elf-move.py avx2 %{buildroot}-v3 %{buildroot} %{buildroot}/usr/share/clear/filemap/filemap-%{name} diff --git a/release b/release index 6f4247a..f64f5d8 100644 --- a/release +++ b/release @@ -1 +1 @@ -26 +27 diff --git a/upstream b/upstream index 175155e..60cba95 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -76f85aad316b5db576c873ce24e99e6b7ac80356/inflect-7.0.0.tar.gz +b75c711d9bd2380cc083c52367a997efa04353b4/inflect-7.2.0.tar.gz