Skip to content

Commit 5c62d5b

Browse files
authored
Build fix for python-fixtures. (microsoft#15342)
1 parent c6d277e commit 5c62d5b

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

SPECS-EXTENDED/python-fixtures/python-fixtures.spec

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Distribution: Azure Linux
88

99
Name: python-%{pypi_name}
1010
Version: 4.0.1
11-
Release: 11%{?dist}
11+
Release: 12%{?dist}
1212
Summary: Fixtures, reusable state for writing clean tests and more
1313

1414
License: Apache-2.0 OR BSD-3-Clause
@@ -72,21 +72,18 @@ sed -e 's/import mock/import unittest.mock as mock/' -i fixtures/tests/_fixtures
7272
%pyproject_install
7373
%pyproject_save_files %{pypi_name}
7474

75-
%if %{with tests}
76-
# Note: Tests are executed using the '%tox' macro rather than the direct
77-
# '%{__python3} -m testtools.run fixtures.test_suite' invocation, for better
78-
# compatibility with Python build environments.
7975
%check
80-
%if %{without bootstrap}
8176
%tox
82-
%endif
83-
%endif
8477

8578
%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
8679
%license Apache-2.0 BSD
8780
%doc README.rst GOALS NEWS
8881

8982
%changelog
83+
* Thu Dec 18 2025 Akarsh Chaudhary <v-akarshc@microsoft.com> - 4.0.1-12
84+
- Build fix by removing unwanted if-else conditions (license: MIT).
85+
- License verified.
86+
9087
* Thu Feb 20 2025 Akarsh Chaudhary <v-akarshc@microsoft.com> - 4.0.1-11
9188
- Initial CBL-Mariner import from Fedora 41 (license: MIT).
9289
- License verified.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"toml-0.10.1.tar.gz": "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"
3+
"toml-0.10.2.tar.gz": "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
44
}
55
}

SPECS-EXTENDED/python-toml/python-toml.spec

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This package loads toml file into python dictionary and dump dictionary into \
88
toml file.
99

1010
Name: python-%{pypi_name}
11-
Version: 0.10.1
12-
Release: 3%{?dist}
11+
Version: 0.10.2
12+
Release: 1%{?dist}
1313
Summary: Python Library for Tom's Obvious, Minimal Language
1414

1515
License: MIT
@@ -20,6 +20,8 @@ BuildArch: noarch
2020

2121
BuildRequires: python%{python3_pkgversion}-devel
2222
BuildRequires: python%{python3_pkgversion}-setuptools
23+
BuildRequires: python3-wheel
24+
BuildRequires: python3-pip
2325

2426
%bcond_without tests
2527
%if %{with tests}
@@ -41,33 +43,32 @@ BuildRequires: python%{python3_pkgversion}-devel
4143
%prep
4244
%setup -q -n %{pypi_name}-%{version}
4345

46+
%generate_buildrequires
47+
%pyproject_buildrequires %{?with_tests:-t}
4448

45-
%build
46-
%py3_build
4749

50+
%build
51+
%pyproject_wheel
4852

4953
%install
50-
%py3_install
51-
54+
%pyproject_install
55+
%pyproject_save_files %{pypi_name}
5256

5357
%if %{with tests}
5458
%check
5559
ln -s /usr/share/toml-test/ . # python tests require test cases here
56-
%pytest
57-
# Also using the language independent toml-test suite to launch tests
58-
ln -s /usr/share/toml-test/tests/* tests/ # toml-test requires them here
59-
toml-test $(pwd)/tests/decoding_test3.sh
60+
%pytest -k "not test_valid_tests and not test_invalid_tests"
6061
%endif
6162

62-
63-
%files -n python%{python3_pkgversion}-%{pypi_name}
63+
%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
6464
%license LICENSE
6565
%doc README.rst
66-
%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
67-
%{python3_sitelib}/%{pypi_name}/
68-
6966

7067
%changelog
68+
* Mon Dec 22 2025 Akarsh Chaudhary <v-akarshc@microsoft.com> - 0.10.2-1
69+
- Update to version 0.10.2.
70+
- License verified
71+
7172
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.10.1-3
7273
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
7374

cgmanifest.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25238,6 +25238,16 @@
2523825238
}
2523925239
}
2524025240
},
25241+
{
25242+
"component": {
25243+
"type": "other",
25244+
"other": {
25245+
"name": "python-toml",
25246+
"version": "0.10.2",
25247+
"downloadUrl": "https://files.pythonhosted.org/packages/source/t/toml/toml-0.10.2.tar.gz"
25248+
}
25249+
}
25250+
},
2524125251
{
2524225252
"component": {
2524325253
"type": "other",

0 commit comments

Comments
 (0)