Skip to content

Commit e8f8ab6

Browse files
authored
Add libmambapy to Azure Linux (#13381)
1 parent fc3a5a8 commit e8f8ab6

26 files changed

+1097
-69
lines changed

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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@
217217
"execstack",
218218
"exempi",
219219
"exiv2",
220+
"expected",
220221
"extra-cmake-modules",
221222
"fabtests",
222223
"facter",
@@ -697,6 +698,7 @@
697698
"liblqr-1",
698699
"liblzf",
699700
"libmad",
701+
"libmamba",
700702
"libmd",
701703
"libmediaart",
702704
"libmicrohttpd",
@@ -1933,6 +1935,7 @@
19331935
"realmd",
19341936
"rear",
19351937
"recode",
1938+
"reproc",
19361939
"resource-agents",
19371940
"rest",
19381941
"rhash",
@@ -2013,6 +2016,7 @@
20132016
"sharutils",
20142017
"shim-unsigned-aarch64",
20152018
"shim-unsigned-x64",
2019+
"simdjson",
20162020
"sip",
20172021
"sisu",
20182022
"skkdic",
@@ -2031,6 +2035,7 @@
20312035
"soxr",
20322036
"sparsehash",
20332037
"spausedd",
2038+
"spdlog",
20342039
"speex",
20352040
"speexdsp",
20362041
"spice-protocol",

SPECS/conda/conda.spec

Lines changed: 5 additions & 54 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
33
Version: 24.3.0
4-
Release: 1%{?dist}
4+
Release: 2%{?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
@@ -108,6 +108,7 @@ Requires: python3-conda-package-streaming
108108
Requires: python3-jsonpatch
109109
Requires: python3-menuinst
110110
Requires: python3-platformdirs
111+
Requires: python3-pluggy
111112

112113
# Some versions in conda/_vendor/vendor.txt
113114
Provides: bundled(python%{python3_pkgversion}-appdirs) = 1.2.0
@@ -302,7 +303,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
302303
--deselect=tests/cli/test_main_remove.py::test_remove_all_keep_env \
303304
--deselect=tests/cli/test_main_rename.py \
304305
--deselect=tests/cli/test_main_run.py \
305-
--deselect=tests/cli/test_subcommands.py::test_create[libmamba] \
306306
--deselect=tests/cli/test_subcommands.py::test_env_create \
307307
--deselect=tests/cli/test_subcommands.py::test_env_update \
308308
--deselect=tests/cli/test_subcommands.py::test_init \
@@ -323,20 +323,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
323323
--deselect=tests/core/test_subdir_data.py::test_use_only_tar_bz2 \
324324
--deselect=tests/core/test_initialize.py \
325325
--deselect=tests/core/test_solve.py::test_cuda_fail_1 \
326-
--deselect=tests/core/test_solve.py::test_conda_downgrade[libmamba] \
327-
--deselect=tests/core/test_solve.py::test_python2_update[libmamba] \
328-
--deselect=tests/core/test_solve.py::test_update_deps_2[libmamba] \
329-
--deselect=tests/core/test_solve.py::test_fast_update_with_update_modifier_not_set[libmamba] \
330-
--deselect=tests/core/test_solve.py::test_timestamps_1[libmamba] \
331-
--deselect=tests/core/test_solve.py::test_remove_with_constrained_dependencies[libmamba] \
332326
--deselect=tests/gateways/test_jlap.py::test_download_and_hash \
333327
--deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[True] \
334328
--deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[False] \
335329
--deselect=tests/test_plan.py::test_pinned_specs_conda_meta_pinned \
336330
--deselect=tests/test_plan.py::test_pinned_specs_condarc \
337331
--deselect=tests/test_plan.py::test_pinned_specs_all \
338-
--deselect=tests/cli/test_subcommands.py::test_compare[libmamba] \
339-
--deselect=tests/cli/test_subcommands.py::test_package[libmamba] \
340332
--deselect=tests/cli/test_subcommands.py::test_remove[libmamba-remove] \
341333
--deselect=tests/cli/test_subcommands.py::test_remove[libmamba-uninstall] \
342334
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-remove] \
@@ -345,13 +337,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
345337
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-uninstall] \
346338
--deselect=tests/cli/test_subcommands.py::test_update[classic-update] \
347339
--deselect=tests/cli/test_subcommands.py::test_update[classic-upgrade] \
348-
--deselect=tests/cli/test_subcommands.py::test_env_remove[libmamba] \
349-
--deselect=tests/cli/test_subcommands.py::test_env_config_vars[libmamba] \
350340
--deselect=tests/core/test_subdir_data.py::test_subdir_data_coverage \
351-
--deselect=tests/models/test_prefix_graph.py::test_prefix_graph_1[libmamba] \
352-
--deselect=tests/models/test_prefix_graph.py::test_prefix_graph_2[libmamba] \
353-
--deselect=tests/models/test_prefix_graph.py::test_remove_youngest_descendant_nodes_with_specs[libmamba] \
354-
--deselect=tests/models/test_prefix_graph.py::test_deep_cyclical_dependency[libmamba] \
355341
--deselect=tests/plugins/test_pre_solves.py::test_pre_solve_invoked \
356342
--deselect=tests/plugins/test_post_solves.py::test_post_solve_action_raises_exception \
357343
--deselect=tests/plugins/test_post_solves.py::test_post_solve_invoked \
@@ -366,45 +352,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
366352
--deselect=tests/cli/test_compare.py::test_compare_fail \
367353
--deselect=tests/cli/test_main_notices.py::test_target_prefix \
368354
--deselect=tests/core/test_package_cache_data.py::test_instantiating_package_cache_when_both_tar_bz2_and_conda_exist_read_only \
369-
--deselect=tests/core/test_solve.py::test_solve_1[libmamba] \
370-
--deselect=tests/core/test_solve.py::test_solve_msgs_exclude_vp[libmamba] \
371-
--deselect=tests/core/test_solve.py::test_cuda_1[libmamba] \
372-
--deselect=tests/core/test_solve.py::test_cuda_2[libmamba] \
373-
--deselect=tests/core/test_solve.py::test_cuda_fail_2[libmamba] \
374-
--deselect=tests/core/test_solve.py::test_cuda_constrain_absent[libmamba] \
375-
--deselect=tests/core/test_solve.py::test_cuda_glibc_sat[libmamba] \
376-
--deselect=tests/core/test_solve.py::test_update_prune_1[libmamba] \
377-
--deselect=tests/core/test_solve.py::test_update_prune_4[libmamba] \
378355
--deselect=tests/core/test_solve.py::test_update_prune_5[libmamba-True] \
379-
--deselect=tests/core/test_solve.py::test_no_deps_1[libmamba] \
380-
--deselect=tests/core/test_solve.py::test_only_deps_1[libmamba] \
381-
--deselect=tests/core/test_solve.py::test_only_deps_2[libmamba] \
382-
--deselect=tests/core/test_solve.py::test_update_all_1[libmamba] \
383-
--deselect=tests/core/test_solve.py::test_unfreeze_when_required[libmamba] \
384-
--deselect=tests/core/test_solve.py::test_auto_update_conda[libmamba] \
385-
--deselect=tests/core/test_solve.py::test_explicit_conda_downgrade[libmamba] \
386-
--deselect=tests/core/test_solve.py::test_aggressive_update_packages[libmamba] \
387-
--deselect=tests/core/test_solve.py::test_update_deps_1[libmamba] \
388-
--deselect=tests/core/test_solve.py::test_no_update_deps_1[libmamba] \
389-
--deselect=tests/core/test_solve.py::test_force_reinstall_1[libmamba] \
390-
--deselect=tests/core/test_solve.py::test_force_reinstall_2[libmamba] \
391-
--deselect=tests/core/test_solve.py::test_channel_priority_churn_minimized[libmamba] \
392-
--deselect=tests/core/test_solve.py::test_current_repodata_usage[libmamba] \
393-
--deselect=tests/core/test_solve.py::test_current_repodata_fallback[libmamba] \
394-
--deselect=tests/core/test_solve.py::test_downgrade_python_prevented_with_sane_message[libmamba] \
395-
--deselect=tests/core/test_solve.py::test_packages_in_solution_change_already_newest[libmamba] \
396-
--deselect=tests/core/test_solve.py::test_packages_in_solution_change_needs_update[libmamba] \
397-
--deselect=tests/core/test_solve.py::test_packages_in_solution_change_constrained[libmamba] \
398-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_conflicts[libmamba] \
399-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_conflicts_upperbound[libmamba] \
400-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_multi_conflicts[libmamba] \
401-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_no_conflicts_upperbound_compound_depends[libmamba] \
402-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_no_conflicts_version_star[libmamba] \
403-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_no_conflicts_free[libmamba] \
404-
--deselect=tests/core/test_solve.py::test_determine_constricting_specs_no_conflicts_no_upperbound[libmamba] \
405-
--deselect=tests/cli/test_main_notices.py::test_notices_does_not_interrupt_command_on_failure \
406-
--deselect=tests/models/test_prefix_graph.py::test_windows_sort_orders_1[libmamba] \
407-
--deselect=tests/models/test_prefix_graph.py::test_sort_without_prep[libmamba] \
408356
--deselect=tests/gateways/test_subprocess.py::test_subprocess_call_with_capture_output \
409357
--deselect=tests/gateways/test_subprocess.py::test_subprocess_call_without_capture_output \
410358
--deselect=tests/gateways/disk/test_delete.py::test_remove_file \
@@ -444,6 +392,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
444392
%{_datadir}/conda/condarc.d/
445393

446394
%changelog
395+
* Fri April 11 2025 Riken Maharjan <[email protected]> - 24.3.0-2
396+
- Add missing python3-pluggy package
397+
447398
* Wed Feb 26 2025 Riken Maharjan <[email protected]> - 24.3.0-1
448399
- Auto-upgrade to 24.3.0 - fixes subprocess_call when stdin is bytes
449400
- Add missing runtime dependencies archspec, boltons, menuinst, and conda-package-streaming
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 0a9ee3b58517a961a9b2d313fab4513b3e4909a1 Mon Sep 17 00:00:00 2001
2+
From: Vitaly Zaitsev <[email protected]>
3+
Date: Thu, 16 Mar 2023 08:57:09 +0100
4+
Subject: [PATCH] Fixed version number in exported CMake configs.
5+
6+
---
7+
CMakeLists.txt | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/CMakeLists.txt b/CMakeLists.txt
11+
index ddab64e..7152b41 100644
12+
--- a/CMakeLists.txt
13+
+++ b/CMakeLists.txt
14+
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
15+
project(tl-expected
16+
HOMEPAGE_URL https://tl.tartanllama.xyz
17+
DESCRIPTION "C++11/14/17 std::expected with functional-style extensions"
18+
- VERSION 1.0.0
19+
+ VERSION 1.1.0
20+
LANGUAGES CXX)
21+
22+
include(CMakePackageConfigHelpers)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"expected-1.1.0.tar.gz": "1db357f46dd2b24447156aaf970c4c40a793ef12a8a9c2ad9e096d9801368df6"
4+
}
5+
}
6+

SPECS/expected/expected.spec

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
Summary: C++11/14/17 std::expected with functional-style extensions
2+
Name: expected
3+
Version: 1.1.0
4+
Release: 7%{?dist}
5+
License: CC0-1.0
6+
URL: https://github.com/TartanLlama/%{name}
7+
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
8+
Vendor: Microsoft Corporation
9+
Distribution: Azure Linux
10+
BuildArch: noarch
11+
# https://github.com/TartanLlama/expected/pull/142
12+
Patch100: expected-1.1.0-version-fix.patch
13+
BuildRequires: ninja-build
14+
BuildRequires: gcc-c++
15+
BuildRequires: cmake
16+
BuildRequires: gcc
17+
18+
%description
19+
Header-only %{summary}.
20+
21+
%package devel
22+
Summary: Development files for %{name}
23+
Provides: %{name}-static = %{?epoch:%{epoch}:}%{version}-%{release}
24+
Provides: cmake(tl-expected)
25+
26+
%description devel
27+
Header-only %{summary}.
28+
29+
std::expected is proposed as the preferred way to represent objec
30+
which will either have an expected value, or an unexpected value
31+
giving information about why something failed. Unfortunately,
32+
chaining together many computations which may fail can be verbose,
33+
as error-checking code will be mixed in with the actual programming
34+
logic. This implementation provides a number of utilities to make
35+
coding with expected cleaner.
36+
37+
%prep
38+
%autosetup -p1
39+
40+
%build
41+
%cmake -G Ninja \
42+
-DCMAKE_BUILD_TYPE=Release \
43+
-DEXPECTED_BUILD_TESTS=OFF \
44+
-DEXPECTED_BUILD_PACKAGE=OFF
45+
%cmake_build
46+
47+
%install
48+
%cmake_install
49+
50+
%files devel
51+
%doc README.md
52+
%license COPYING
53+
%{_includedir}/tl
54+
%{_datadir}/cmake/tl-%{name}
55+
56+
%changelog
57+
* Fri April 11 2025 Riken Maharjan <[email protected]> - 1.1.0-7
58+
- Initial Azure Linux import from Fedora 42 (license: MIT)
59+
- License Verified
60+
61+
* Thu Jan 16 2025 Fedora Release Engineering <[email protected]> - 1.1.0-6
62+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
63+
64+
* Wed Jul 17 2024 Fedora Release Engineering <[email protected]> - 1.1.0-5
65+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
66+
67+
* Wed Jan 24 2024 Fedora Release Engineering <[email protected]> - 1.1.0-4
68+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
69+
70+
* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 1.1.0-3
71+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
72+
73+
* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 1.1.0-2
74+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
75+
76+
* Thu Mar 16 2023 Vitaly Zaitsev <[email protected]> - 1.1.0-1
77+
- Updated to version 1.1.0.
78+
79+
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.0.0-8
80+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
81+
82+
* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 1.0.0-7
83+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
84+
85+
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.0.0-6
86+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
87+
88+
* Wed Jul 21 2021 Fedora Release Engineering <[email protected]> - 1.0.0-5
89+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
90+
91+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1.0.0-4
92+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
93+
94+
* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 1.0.0-3
95+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
96+
97+
* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 1.0.0-2
98+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
99+
100+
* Mon Jan 06 2020 Vitaly Zaitsev <[email protected]> - 1.0.0-1
101+
- Initial SPEC release.

SPECS/libmamba/libmamba-csh.patch

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
commit 9e3e1c4cdddceceb6430167a574fa537bdcfad88
2+
Author: bruchim-cisco <[email protected]>
3+
Date: Tue Oct 24 10:41:22 2023 +0300
4+
5+
Fix broken tcsh aliases (#2929)
6+
7+
Fix broken csh and tcsh multiline aliases
8+
9+
diff --git a/libmamba/data/micromamba.csh b/libmamba/data/micromamba.csh
10+
index 5b519431..26c928ad 100644
11+
--- a/libmamba/data/micromamba.csh
12+
+++ b/libmamba/data/micromamba.csh
13+
@@ -5,40 +5,40 @@ alias __mamba_exe '"$MAMBA_EXE" "\!*"'
14+
15+
alias __mamba_hashr 'rehash'
16+
17+
-alias __mamba_xctivate '
18+
- set ask_conda="`(setenv prompt "${prompt}"; __mamba_exe shell "\!*" --shell csh)`"
19+
- if ("${status}" != 0) then
20+
- return
21+
- endif
22+
- eval "${ask_conda}"
23+
- __mamba_hashr
24+
+alias __mamba_xctivate '\\
25+
+ set ask_conda="`(setenv prompt "${prompt}"; __mamba_exe shell "\!*" --shell csh)`"\\
26+
+ if ("${status}" != 0) then\\
27+
+ return\\
28+
+ endif\\
29+
+ eval "${ask_conda}"\\
30+
+ __mamba_hashr\\
31+
'
32+
33+
-alias micromamba '
34+
- switch ("${1}")
35+
- case activate | reactivate | deactivate:
36+
- __mamba_xctivate "\!*"
37+
- breaksw
38+
- case install | update | upgrade | remove | uninstall:
39+
- __mamba_exe "\!*"
40+
- if ("${status}" != 0) then
41+
- return
42+
- endif
43+
- __mamba_xctivate reactivate
44+
- breaksw
45+
- case self-update:
46+
- __mamba_exe "\!*"
47+
- if ("${status}" != 0) then
48+
- return
49+
- endif
50+
- if (-f "$MAMBA_EXE.bkup") then
51+
- rm -f "$MAMBA_EXE.bkup"
52+
- endif
53+
- breaksw
54+
- default:
55+
- __mamba_exe "\!*"
56+
- breaksw
57+
- endsw
58+
+alias micromamba '\\
59+
+ switch ("${1}")\\
60+
+ case activate | reactivate | deactivate:\\
61+
+ __mamba_xctivate "\!*"\\
62+
+ breaksw\\
63+
+ case install | update | upgrade | remove | uninstall:\\
64+
+ __mamba_exe "\!*"\\
65+
+ if ("${status}" != 0) then\\
66+
+ return\\
67+
+ endif\\
68+
+ __mamba_xctivate reactivate\\
69+
+ breaksw\\
70+
+ case self-update:\\
71+
+ __mamba_exe "\!*"\\
72+
+ if ("${status}" != 0) then\\
73+
+ return\\
74+
+ endif\\
75+
+ if (-f "$MAMBA_EXE.bkup") then\\
76+
+ rm -f "$MAMBA_EXE.bkup"\\
77+
+ endif\\
78+
+ breaksw\\
79+
+ default:\\
80+
+ __mamba_exe "\!*"\\
81+
+ breaksw\\
82+
+ endsw\\
83+
'
84+
85+
if (! $?CONDA_SHLVL) then

0 commit comments

Comments
 (0)