Skip to content

Commit 2cfd159

Browse files
committed
pypi-inflect: Autospec creation for update from version 7.0.0 to version 7.2.0
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)
1 parent 4d37c2c commit 2cfd159

File tree

5 files changed

+56
-29
lines changed

5 files changed

+56
-29
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME := pypi-inflect
2-
URL = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz
2+
URL = https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz
33
ARCHIVES =
44

55
include ../common/Makefile.common

options.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = pypi-inflect
3-
url = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz
3+
url = https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz
44
archives =
55
giturl = https://github.com/jaraco/inflect/
66
domain =
@@ -9,6 +9,8 @@ alias =
99
[autospec]
1010
# build 32 bit libraries
1111
32bit = false
12+
# allow windows executables (*.exe, *.dll) to be packaged
13+
allow_exe = false
1214
# allow package to build with test failures
1315
allow_test_failures = false
1416
# unset %build ld_as_needed variable
@@ -59,6 +61,8 @@ server = false
5961
skip_tests = false
6062
# add .so files to the lib package instead of dev
6163
so_to_lib = false
64+
# configure build for apx
65+
use_apx = false
6266
# configure build for avx2
6367
use_avx2 = true
6468
# configure build for avx512

pypi-inflect.spec

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
# This file is auto-generated. DO NOT EDIT
33
# Generated by: autospec.py
44
# Using build pattern: pyproject
5+
# autospec version: v7
6+
# autospec commit: f56f1fa
57
#
68
Name : pypi-inflect
7-
Version : 7.0.0
8-
Release : 26
9-
URL : https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz
10-
Source0 : https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8/inflect-7.0.0.tar.gz
9+
Version : 7.2.0
10+
Release : 27
11+
URL : https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz
12+
Source0 : https://files.pythonhosted.org/packages/5e/82/6f2dac9cc13c9521edbc54ff4154b298c493c7e3b3fa3c7da6b8f57132fb/inflect-7.2.0.tar.gz
1113
Summary : Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words
1214
Group : Development/Tools
1315
License : MIT
@@ -52,62 +54,83 @@ Summary: python3 components for the pypi-inflect package.
5254
Group: Default
5355
Requires: python3-core
5456
Provides: pypi(inflect)
55-
Requires: pypi(pydantic)
57+
Requires: pypi(more_itertools)
58+
Requires: pypi(typeguard)
5659
Requires: pypi(typing_extensions)
5760

5861
%description python3
5962
python3 components for the pypi-inflect package.
6063

6164

6265
%prep
63-
%setup -q -n inflect-7.0.0
64-
cd %{_builddir}/inflect-7.0.0
66+
%setup -q -n inflect-7.2.0
67+
cd %{_builddir}/inflect-7.2.0
6568
pushd ..
66-
cp -a inflect-7.0.0 buildavx2
69+
cp -a inflect-7.2.0 buildavx2
6770
popd
6871

6972
%build
7073
export http_proxy=http://127.0.0.1:9/
7174
export https_proxy=http://127.0.0.1:9/
7275
export no_proxy=localhost,127.0.0.1,0.0.0.0
7376
export LANG=C.UTF-8
74-
export SOURCE_DATE_EPOCH=1688571673
77+
export SOURCE_DATE_EPOCH=1712001075
7578
export GCC_IGNORE_WERROR=1
7679
export AR=gcc-ar
7780
export RANLIB=gcc-ranlib
7881
export NM=gcc-nm
79-
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 "
80-
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 "
81-
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 "
82-
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 "
82+
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 "
83+
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 "
84+
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 "
85+
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 "
86+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS"
87+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS"
88+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS"
89+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS"
90+
ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS"
91+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS"
8392
export MAKEFLAGS=%{?_smp_mflags}
8493
python3 -m build --wheel --skip-dependency-check --no-isolation
8594
pushd ../buildavx2/
86-
export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
87-
export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
88-
export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
89-
export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 "
90-
export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 "
95+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
96+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
97+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
98+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 "
99+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 "
91100
python3 -m build --wheel --skip-dependency-check --no-isolation
92101

93102
popd
94103

95104
%install
105+
export GCC_IGNORE_WERROR=1
106+
export AR=gcc-ar
107+
export RANLIB=gcc-ranlib
108+
export NM=gcc-nm
109+
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 "
110+
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 "
111+
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 "
112+
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 "
113+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS"
114+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS"
115+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS"
116+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS"
117+
ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS"
118+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS"
96119
export MAKEFLAGS=%{?_smp_mflags}
97120
rm -rf %{buildroot}
98121
mkdir -p %{buildroot}/usr/share/package-licenses/pypi-inflect
99122
cp %{_builddir}/inflect-%{version}/LICENSE %{buildroot}/usr/share/package-licenses/pypi-inflect/0445ed0f69910eeaee036f09a39a13c6e1f37e12 || :
100-
pip install --root=%{buildroot} --no-deps --ignore-installed dist/*.whl
123+
python3 -m installer --destdir=%{buildroot} dist/*.whl
101124
echo ----[ mark ]----
102125
cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || :
103126
echo ----[ mark ]----
104127
pushd ../buildavx2/
105-
export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
106-
export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
107-
export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
108-
export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 "
109-
export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 "
110-
pip install --root=%{buildroot}-v3 --no-deps --ignore-installed dist/*.whl
128+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
129+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
130+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
131+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 "
132+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 "
133+
python3 -m installer --destdir=%{buildroot}-v3 dist/*.whl
111134
popd
112135
/usr/bin/elf-move.py avx2 %{buildroot}-v3 %{buildroot} %{buildroot}/usr/share/clear/filemap/filemap-%{name}
113136

release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
26
1+
27

upstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
76f85aad316b5db576c873ce24e99e6b7ac80356/inflect-7.0.0.tar.gz
1+
b75c711d9bd2380cc083c52367a997efa04353b4/inflect-7.2.0.tar.gz

0 commit comments

Comments
 (0)