Skip to content

Commit d665b18

Browse files
committed
pypi-zipp: Autospec creation for update from version 3.17.0 to version 3.18.1
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) Jason R. Coombs (36): 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. Revert "Disable tests on Windows due to numpy doesn't install. Ref numpy/numpy#23808" Revert "Grab later build of numpy; workaround for numpy/numpy#23808." Add support for newlines and fullmatch in glob.translate to match behavior in fnmatch.translate. Add support for arbitrary separators in glob.Translator, defaulting to os.sep + os.altsep. Prevent ** from appearing as anything but a full path segment for alignment with glob. Prevent * from matching an empty segment Fix initializer so it actually honors the parameter. Add tests for invalid separators. Update changelog. 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. Enable complexity check and pycodestyle warnings. Closes jaraco/skeleton#110. Use 'extend-select' to avoid disabling the default config. Ref jaraco/skeleton#110. Moved compatibility module to compat package. Fix name generator for width=1 Add another test at another magnitude. Add special accounting for pypy when computing the stack level for text encoding warnings. Bypass ZipFile.namelist in glob. Closes #106. Add news fragment. Finalize Move changelog entry, saved to the wrong location :( Merge changelog into last release. Finalize Sviatoslav Sydorenko (1): Enable testing merge queues @ GitHub Actions CI/CD (jaraco/skeleton#93)
1 parent d3bbba2 commit d665b18

File tree

5 files changed

+54
-28
lines changed

5 files changed

+54
-28
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME := pypi-zipp
2-
URL = https://files.pythonhosted.org/packages/58/03/dd5ccf4e06dec9537ecba8fcc67bbd4ea48a2791773e469e73f94c3ba9a6/zipp-3.17.0.tar.gz
2+
URL = https://files.pythonhosted.org/packages/3e/ef/65da662da6f9991e87f058bc90b91a935ae655a16ae5514660d6460d1298/zipp-3.18.1.tar.gz
33
ARCHIVES =
44

55
include ../common/Makefile.common

options.conf

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = pypi-zipp
3-
url = https://files.pythonhosted.org/packages/58/03/dd5ccf4e06dec9537ecba8fcc67bbd4ea48a2791773e469e73f94c3ba9a6/zipp-3.17.0.tar.gz
3+
url = https://files.pythonhosted.org/packages/3e/ef/65da662da6f9991e87f058bc90b91a935ae655a16ae5514660d6460d1298/zipp-3.18.1.tar.gz
44
archives =
55
giturl = https://github.com/jaraco/zipp/
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-zipp.spec

+46-24
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: v4
6+
# autospec commit: f4bef72
57
#
68
Name : pypi-zipp
7-
Version : 3.17.0
8-
Release : 67
9-
URL : https://files.pythonhosted.org/packages/58/03/dd5ccf4e06dec9537ecba8fcc67bbd4ea48a2791773e469e73f94c3ba9a6/zipp-3.17.0.tar.gz
10-
Source0 : https://files.pythonhosted.org/packages/58/03/dd5ccf4e06dec9537ecba8fcc67bbd4ea48a2791773e469e73f94c3ba9a6/zipp-3.17.0.tar.gz
9+
Version : 3.18.1
10+
Release : 68
11+
URL : https://files.pythonhosted.org/packages/3e/ef/65da662da6f9991e87f058bc90b91a935ae655a16ae5514660d6460d1298/zipp-3.18.1.tar.gz
12+
Source0 : https://files.pythonhosted.org/packages/3e/ef/65da662da6f9991e87f058bc90b91a935ae655a16ae5514660d6460d1298/zipp-3.18.1.tar.gz
1113
Summary : Backport of pathlib-compatible object wrapper for zip files
1214
Group : Development/Tools
1315
License : MIT
@@ -58,54 +60,74 @@ python3 components for the pypi-zipp package.
5860

5961

6062
%prep
61-
%setup -q -n zipp-3.17.0
62-
cd %{_builddir}/zipp-3.17.0
63+
%setup -q -n zipp-3.18.1
64+
cd %{_builddir}/zipp-3.18.1
6365
pushd ..
64-
cp -a zipp-3.17.0 buildavx2
66+
cp -a zipp-3.18.1 buildavx2
6567
popd
6668

6769
%build
6870
export http_proxy=http://127.0.0.1:9/
6971
export https_proxy=http://127.0.0.1:9/
7072
export no_proxy=localhost,127.0.0.1,0.0.0.0
7173
export LANG=C.UTF-8
72-
export SOURCE_DATE_EPOCH=1695065918
74+
export SOURCE_DATE_EPOCH=1710610610
7375
export GCC_IGNORE_WERROR=1
7476
export AR=gcc-ar
7577
export RANLIB=gcc-ranlib
7678
export NM=gcc-nm
77-
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 "
78-
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 "
79-
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 "
80-
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 "
79+
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 "
80+
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 "
81+
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 "
82+
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 "
83+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS"
84+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS"
85+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS"
86+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS"
87+
ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS"
88+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS"
8189
export MAKEFLAGS=%{?_smp_mflags}
8290
python3 -m build --wheel --skip-dependency-check --no-isolation
8391
pushd ../buildavx2/
84-
export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
85-
export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
86-
export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
87-
export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 "
88-
export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 "
92+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
93+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
94+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
95+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 "
96+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 "
8997
python3 -m build --wheel --skip-dependency-check --no-isolation
9098

9199
popd
92100

93101
%install
102+
export GCC_IGNORE_WERROR=1
103+
export AR=gcc-ar
104+
export RANLIB=gcc-ranlib
105+
export NM=gcc-nm
106+
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 "
107+
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 "
108+
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 "
109+
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 "
110+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS"
111+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS"
112+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS"
113+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS"
114+
ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS"
115+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS"
94116
export MAKEFLAGS=%{?_smp_mflags}
95117
rm -rf %{buildroot}
96118
mkdir -p %{buildroot}/usr/share/package-licenses/pypi-zipp
97119
cp %{_builddir}/zipp-%{version}/LICENSE %{buildroot}/usr/share/package-licenses/pypi-zipp/0445ed0f69910eeaee036f09a39a13c6e1f37e12 || :
98-
pip install --root=%{buildroot} --no-deps --ignore-installed dist/*.whl
120+
python3 -m installer --destdir=%{buildroot} dist/*.whl
99121
echo ----[ mark ]----
100122
cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || :
101123
echo ----[ mark ]----
102124
pushd ../buildavx2/
103-
export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
104-
export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
105-
export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
106-
export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 "
107-
export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 "
108-
pip install --root=%{buildroot}-v3 --no-deps --ignore-installed dist/*.whl
125+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
126+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
127+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 "
128+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 "
129+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -march=x86-64-v3 "
130+
python3 -m installer --destdir=%{buildroot}-v3 dist/*.whl
109131
popd
110132
/usr/bin/elf-move.py avx2 %{buildroot}-v3 %{buildroot} %{buildroot}/usr/share/clear/filemap/filemap-%{name}
111133

release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
67
1+
68

upstream

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a9f9aebc205b7829c43b34e79c3f87c42b183176/zipp-3.17.0.tar.gz
1+
cc2133fbf9e7989aed5de4d3deb6c4901f245bfc/zipp-3.18.1.tar.gz

0 commit comments

Comments
 (0)