Skip to content

Commit edf199a

Browse files
rikenm1CBL-Mariner-Bot
rikenm1
and
CBL-Mariner-Bot
authored
Update Conda to 24.3.0 and bring missing runtime deps (#12648)
Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com>
1 parent 666e1f1 commit edf199a

17 files changed

Lines changed: 768 additions & 11 deletions

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,6 +1645,7 @@
16451645
"python-aiodns",
16461646
"python-aiohttp",
16471647
"python-alsa",
1648+
"python-archspec",
16481649
"python-argcomplete",
16491650
"python-argparse-manpage",
16501651
"python-astroid",
@@ -1657,6 +1658,7 @@
16571658
"python-betamax",
16581659
"python-blinker",
16591660
"python-blivet",
1661+
"python-boltons",
16601662
"python-breathe",
16611663
"python-cached_property",
16621664
"python-cbor2",
@@ -1666,7 +1668,9 @@
16661668
"python-cmd2",
16671669
"python-colorama",
16681670
"python-CommonMark",
1671+
"python-conda-libmamba-solver",
16691672
"python-conda-package-handling",
1673+
"python-conda-package-streaming",
16701674
"python-configshell",
16711675
"python-cpuinfo",
16721676
"python-cups",
@@ -1749,6 +1753,7 @@
17491753
"python-mccabe",
17501754
"python-mdurl",
17511755
"python-memcached",
1756+
"python-menuinst",
17521757
"python-mimeparse",
17531758
"python-mock",
17541759
"python-monotonic",
@@ -1891,6 +1896,7 @@
18911896
"python-yubico",
18921897
"python-zipp",
18931898
"python-zmq",
1899+
"python-zstandard",
18941900
"python-zstd",
18951901
"python3-mallard-ducktype",
18961902
"python3-pytest-asyncio",

‎SPECS/conda/conda.signatures.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"Signatures": {
3-
"conda-24.1.2.tar.gz": "6bc4f1f72a0edddefa10e0667d6ab2eb2f1956919a59508bf3bf6c001bf7a6e8",
4-
"conda": "9e89219d7fc4c26931a4309be8f989a03bc708d4466fcdb812f755715b946848"
5-
}
2+
"Signatures": {
3+
"conda": "9e89219d7fc4c26931a4309be8f989a03bc708d4466fcdb812f755715b946848",
4+
"conda-24.3.0.tar.gz": "92211ae60037bceb452e3f03183be29dcecc62c7826661cff6eaeb41cb216208"
5+
}
66
}

‎SPECS/conda/conda.spec‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Cross-platform, Python-agnostic binary package manager
22
Name: conda
3-
Version: 24.1.2
4-
Release: 2%{?dist}
3+
Version: 24.3.0
4+
Release: 1%{?dist}
55
License: BSD-3-Clause AND Apache-2.0
66
# The conda code is BSD-3-Clause
77
# adapters/ftp.py is Apache-2.0
@@ -32,6 +32,13 @@ BuildRequires: python3-pip
3232
BuildRequires: python3-pluggy
3333
%if 0%{?with_check}
3434
BuildRequires: python3-pytest
35+
BuildRequires: python3-archspec
36+
BuildRequires: python3-boltons
37+
BuildRequires: python3-conda-libmamba-solver
38+
BuildRequires: python3-conda-package-streaming
39+
BuildRequires: python3-jsonpatch
40+
BuildRequires: python3-menuinst
41+
BuildRequires: python3-platformdirs
3542
%endif
3643
BuildRequires: python3-setuptools
3744
BuildRequires: python3-setuptools_scm
@@ -89,12 +96,19 @@ BuildRequires: %py3_reqs
8996
# For tests
9097
BuildRequires: python3
9198
%if 0%{?with_check}
92-
BuildRequires: python%{python3_pkgversion}-jsonpatch
9399
BuildRequires: python%{python3_pkgversion}-pytest-mock
94100
BuildRequires: python%{python3_pkgversion}-responses
95101
%endif
96102

97103
Requires: %py3_reqs
104+
Requires: python3-archspec
105+
Requires: python3-boltons
106+
Requires: python3-conda-libmamba-solver
107+
Requires: python3-conda-package-streaming
108+
Requires: python3-jsonpatch
109+
Requires: python3-menuinst
110+
Requires: python3-platformdirs
111+
98112
# Some versions in conda/_vendor/vendor.txt
99113
Provides: bundled(python%{python3_pkgversion}-appdirs) = 1.2.0
100114
Provides: bundled(python%{python3_pkgversion}-auxlib) = 0.0.43
@@ -185,7 +199,7 @@ install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1
185199

186200
%check
187201
%if 0%{?with_check}
188-
pip3 install archspec iniconfig flask pytest-xprocess zstandard conda-package-streaming flaky pytest-timeout
202+
pip3 install iniconfig flask pytest-xprocess flaky pytest-timeout
189203
export PATH=%{buildroot}%{_bindir}:$PATH
190204
PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
191205

@@ -398,6 +412,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
398412
--deselect=tests/gateways/disk/test_permissions.py::test_make_writable \
399413
--deselect=tests/gateways/disk/test_permissions.py::test_recursive_make_writable \
400414
--deselect=tests/gateways/disk/test_permissions.py::test_make_executable \
415+
--deselect=tests/test_install.py::test_install_mkdir \
416+
--deselect=tests/test_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
417+
--deselect=tests/test_install.py::test_install_freezes_env_by_default \
418+
--deselect=tests/core/test_solve.py::test_archspec_call[libmamba] \
419+
--deselect=tests/test_install.py::test_install_from_extracted_package \
420+
--deselect=tests/plugins/test_subcommands.py::test_help \
401421
conda tests
402422
%endif
403423

@@ -424,6 +444,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
424444
%{_datadir}/conda/condarc.d/
425445

426446
%changelog
447+
* Wed Feb 26 2025 Riken Maharjan <rmaharjan@microsoft.com> - 24.3.0-1
448+
- Auto-upgrade to 24.3.0 - fixes subprocess_call when stdin is bytes
449+
- Add missing runtime dependencies archspec, boltons, menuinst, and conda-package-streaming
450+
427451
* Fri Jun 14 2024 Sam Meluch <sammeluch@microsoft.com> - 24.1.2-2
428452
- Add pytest and pip install archspec to fix package tests
429453

‎SPECS/python-archspec/python-archspec.signatures.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"archspec-0.2.5.tar.gz": "5bec8dfc5366ff299071200466dc9572d56db4e43abca3c66bdd62bc2b731a2a"
4+
}
5+
}
6+

‎SPECS/python-archspec/python-archspec.spec‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
%global srcname archspec
2+
%global _description %{expand:
3+
Archspec aims at providing a standard set of human-understandable labels for
4+
various aspects of a system architecture like CPU, network fabrics, etc. and
5+
APIs to detect, query and compare them.
6+
This project grew out of Spack and is currently under active development. At
7+
present it supports APIs to detect and model compatibility relationships among
8+
different CPU microarchitectures.}
9+
Summary: A library to query system architecture
10+
Name: python-%{srcname}
11+
Version: 0.2.5
12+
Release: 3%{?dist}
13+
License: Apache-2.0 OR MIT
14+
Vendor: Microsoft Corporation
15+
Distribution: Azure Linux
16+
URL: https://github.com/archspec/archspec
17+
Source: %{pypi_source}
18+
BuildRequires: python3-devel
19+
BuildRequires: python3-jsonschema
20+
BuildRequires: python3-pip
21+
BuildRequires: python3-poetry
22+
# For tests
23+
BuildRequires: python3-pytest
24+
BuildArch: noarch
25+
26+
%description %{_description}
27+
28+
%package -n python3-%{srcname}
29+
Summary: %{summary}
30+
31+
%description -n python3-%{srcname} %{_description}
32+
33+
%prep
34+
%autosetup -p1 -n %{srcname}-%{version}
35+
rm -rf archspec/json/.git*
36+
37+
38+
%build
39+
%pyproject_wheel
40+
41+
42+
%install
43+
%pyproject_install
44+
%pyproject_save_files %{srcname}
45+
46+
47+
%check
48+
%pytest -v
49+
50+
51+
%files -n python3-%{srcname} -f %{pyproject_files}
52+
%doc README.*
53+
%{_bindir}/archspec
54+
%license LICENSE-APACHE
55+
56+
%changelog
57+
* Tue Apr 01 2025 Riken Maharjan <rmaharjan@microsoft.com> - 0.2.5-3
58+
- Initial Azure Linux import from Fedora 42 (license: MIT)
59+
- License Verified
60+
61+
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5-2
62+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
63+
64+
* Wed Oct 16 2024 Orion Poplawski <orion@nwra.com> - 0.2.5-1
65+
- Update to 0.2.5
66+
67+
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
68+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
69+
70+
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 0.2.4-2
71+
- Rebuilt for Python 3.13
72+
73+
* Tue May 07 2024 Orion Poplawski <orion@nwra.com> - 0.2.4-1
74+
- Update to 0.2.4
75+
76+
* Wed Mar 20 2024 Orion Poplawski <orion@nwra.com> - 0.2.3-2
77+
- Run tests
78+
79+
* Tue Mar 19 2024 Orion Poplawski <orion@nwra.com> - 0.2.3-1
80+
- Update to 0.2.3
81+
82+
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-3
83+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
84+
85+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-2
86+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
87+
88+
* Sat Dec 02 2023 Orion Poplawski <orion@nwra.com> - 0.2.2-1
89+
- Initial Fedora package

‎SPECS/python-boltons/python-boltons.signatures.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"boltons-25.0.0.tar.gz": "e110fbdc30b7b9868cb604e3f71d4722dd8f4dcb4a5ddd06028ba8f1ab0b5ace"
4+
}
5+
}
6+

‎SPECS/python-boltons/python-boltons.spec‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
%global pypi_name boltons
2+
Summary: Functionality that should be in the standard library
3+
Name: python-boltons
4+
Version: 25.0.0
5+
Release: 2%{?dist}
6+
License: BSD-3-Clause
7+
URL: https://github.com/mahmoud/boltons
8+
Vendor: Microsoft Corporation
9+
Distribution: Azure Linux
10+
Source0: %{pypi_source}
11+
BuildArch: noarch
12+
BuildRequires: python3-devel
13+
BuildRequires: python3-pytest
14+
BuildRequires: make
15+
BuildRequires: python3-sphinx
16+
BuildRequires: python3-pip
17+
BuildRequires: python3-flit-core
18+
%global _description %{expand:
19+
Boltons is a set of over 230 BSD-licensed, pure-Python utilities in the same
20+
spirit as — and yet conspicuously missing from — the standard library,
21+
including:
22+
23+
* Atomic file saving, bolted on with fileutils
24+
* A highly-optimized OrderedMultiDict, in dictutils
25+
* Two types of PriorityQueue, in queueutils
26+
* Chunked and windowed iteration, in iterutils
27+
* Recursive data structure iteration and merging, with iterutils.remap
28+
* Exponential backoff functionality, including jitter, through
29+
iterutils.backoff
30+
* A full-featured TracebackInfo type, for representing stack traces, in
31+
tbutils}
32+
33+
%description %_description
34+
35+
%package -n python3-boltons
36+
Summary: %{summary}
37+
38+
%description -n python3-boltons %_description
39+
40+
41+
%prep
42+
%autosetup -p1 -n boltons-%{version}
43+
44+
%build
45+
%pyproject_wheel
46+
export READTHEDOCS=True
47+
make -C docs man
48+
49+
%install
50+
%pyproject_install
51+
mkdir -p %{buildroot}%{_mandir}/man1
52+
install -m644 docs/_build/man/boltons.1 %{buildroot}%{_mandir}/man1/
53+
%pyproject_save_files boltons
54+
55+
%check
56+
%pytest -v
57+
58+
59+
%files -n python3-boltons -f %{pyproject_files}
60+
%doc CHANGELOG.md README.md TODO.rst
61+
%{_mandir}/man1/boltons.1*
62+
63+
64+
%changelog
65+
* Wed Feb 26 2025 Riken Maharjan <rmaharjan@microsoft.com> - 25.0.0-2
66+
- Initial Azure Linux import from Fedora 40 (license: MIT)
67+
- License Verified
68+
69+
* Mon Feb 03 2025 Orion Poplawski <orion@nwra.com> - 25.0.0-1
70+
- Update to 25.0.0
71+
72+
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 24.0.0-4
73+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
74+
75+
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 24.0.0-3
76+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
77+
78+
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 24.0.0-2
79+
- Rebuilt for Python 3.13
80+
81+
* Sat Apr 06 2024 Orion Poplawski <orion@nwra.com> - 24.0.0-1
82+
- Update to 24.0.0
83+
84+
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.1-4
85+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
86+
87+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.1-3
88+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
89+
90+
* Wed Nov 29 2023 Orion Poplawski <orion@nwra.com> - 23.1.1-2
91+
- Build man page
92+
93+
* Tue Nov 28 2023 Orion Poplawski <orion@nwra.com> - 23.1.1-1
94+
- Initial Fedora package

‎SPECS/python-conda-libmamba-solver/python-conda-libmamba-solver.signatures.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"conda-libmamba-solver-24.9.0.tar.gz": "77a78524719290468665c091cf073f2b97440bfea25c373105a997654063fdbe"
4+
}
5+
}
6+

0 commit comments

Comments
 (0)