Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit b2fa9d4

Browse files
committed
pypi-jaraco.collections: Autospec creation for update from version 4.3.0 to version 5.0.0
Christian Clauss (2): Upgrade GitHub Actions checkout (jaraco/skeleton#94) GitHub Actions: Combine tox jobs diffcov and docs (jaraco/skeleton#95) Jason R. Coombs (24): Leverage pytest-enabler 2.2 for the default config. Prefer 3.x for Python version (latest stable). Collapse skeleton history. Workaround for jaraco/skeleton#87. 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. 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. Simplify docstring and tests for dict_map Removed DictFilter. Use proper reference for Projection. Moved collections into a package and declared as typed. Finalize
1 parent e06d5cf commit b2fa9d4

File tree

5 files changed

+50
-28
lines changed

5 files changed

+50
-28
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME := pypi-jaraco.collections
2-
URL = https://files.pythonhosted.org/packages/de/b5/8ea883dc5161d844c97f6472ed66cd8f7644ef70659977819f76425106f4/jaraco.collections-4.3.0.tar.gz
2+
URL = https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8/jaraco.collections-5.0.0.tar.gz
33
ARCHIVES =
44

55
include ../common/Makefile.common

options.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = pypi-jaraco.collections
3-
url = https://files.pythonhosted.org/packages/de/b5/8ea883dc5161d844c97f6472ed66cd8f7644ef70659977819f76425106f4/jaraco.collections-4.3.0.tar.gz
3+
url = https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8/jaraco.collections-5.0.0.tar.gz
44
archives =
55
giturl = https://github.com/jaraco/jaraco.collections/
66
domain =

pypi-jaraco.collections.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: v3
6+
# autospec commit: c1050fe
57
#
68
Name : pypi-jaraco.collections
7-
Version : 4.3.0
8-
Release : 44
9-
URL : https://files.pythonhosted.org/packages/de/b5/8ea883dc5161d844c97f6472ed66cd8f7644ef70659977819f76425106f4/jaraco.collections-4.3.0.tar.gz
10-
Source0 : https://files.pythonhosted.org/packages/de/b5/8ea883dc5161d844c97f6472ed66cd8f7644ef70659977819f76425106f4/jaraco.collections-4.3.0.tar.gz
9+
Version : 5.0.0
10+
Release : 45
11+
URL : https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8/jaraco.collections-5.0.0.tar.gz
12+
Source0 : https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8/jaraco.collections-5.0.0.tar.gz
1113
Summary : Collection objects similar to those in stdlib by jaraco
1214
Group : Development/Tools
1315
License : MIT
@@ -59,54 +61,74 @@ python3 components for the pypi-jaraco.collections package.
5961

6062

6163
%prep
62-
%setup -q -n jaraco.collections-4.3.0
63-
cd %{_builddir}/jaraco.collections-4.3.0
64+
%setup -q -n jaraco.collections-5.0.0
65+
cd %{_builddir}/jaraco.collections-5.0.0
6466
pushd ..
65-
cp -a jaraco.collections-4.3.0 buildavx2
67+
cp -a jaraco.collections-5.0.0 buildavx2
6668
popd
6769

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

92100
popd
93101

94102
%install
103+
export GCC_IGNORE_WERROR=1
104+
export AR=gcc-ar
105+
export RANLIB=gcc-ranlib
106+
export NM=gcc-nm
107+
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 "
108+
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 "
109+
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 "
110+
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 "
111+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS"
112+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS"
113+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS"
114+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS"
115+
ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS"
116+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS"
95117
export MAKEFLAGS=%{?_smp_mflags}
96118
rm -rf %{buildroot}
97119
mkdir -p %{buildroot}/usr/share/package-licenses/pypi-jaraco.collections
98120
cp %{_builddir}/jaraco.collections-%{version}/LICENSE %{buildroot}/usr/share/package-licenses/pypi-jaraco.collections/0445ed0f69910eeaee036f09a39a13c6e1f37e12 || :
99-
pip install --root=%{buildroot} --no-deps --ignore-installed dist/*.whl
121+
python3 -m installer --destdir=%{buildroot} dist/*.whl
100122
echo ----[ mark ]----
101123
cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || :
102124
echo ----[ mark ]----
103125
pushd ../buildavx2/
104-
export CFLAGS="$CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
105-
export CXXFLAGS="$CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
106-
export FFLAGS="$FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
107-
export FCFLAGS="$FCFLAGS -m64 -march=x86-64-v3 "
108-
export LDFLAGS="$LDFLAGS -m64 -march=x86-64-v3 "
109-
pip install --root=%{buildroot}-v3 --no-deps --ignore-installed dist/*.whl
126+
CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
127+
CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
128+
FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -m64 -march=x86-64-v3 -Wl,-z,x86-64-v3 "
129+
FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -m64 -march=x86-64-v3 "
130+
LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -m64 -march=x86-64-v3 "
131+
python3 -m installer --destdir=%{buildroot}-v3 dist/*.whl
110132
popd
111133
## Remove excluded files
112134
rm -f %{buildroot}*/usr/lib/python3.*/site-packages/jaraco/__init__.py

release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
44
1+
45

upstream

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ddb7d180fdba2c0f255f22ae055f6f96b67f7cb5/jaraco.collections-4.3.0.tar.gz
1+
dc15fb49fba0f704390f8385fcbf32b3bb38b870/jaraco.collections-5.0.0.tar.gz

0 commit comments

Comments
 (0)