Merge branch 'master' into epel8

"Adding package.cfg file"
2020-03-24 20:44:19 +01:00 · 2020-03-23 11:18:04 -05:00
7 changed files with 37 additions and 132 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
 /pytest-subtests-0.3.0.tar.gz
-/pytest-subtests-0.3.1.tar.gz
-/pytest-subtests-0.4.0.tar.gz
-/pytest-subtests-0.5.0.tar.gz
-/pytest-subtests-0.10.0.tar.gz
-/pytest-subtests-0.12.1.tar.gz
-/pytest_subtests-0.13.1.tar.gz
-/pytest_subtests-0.14.2.tar.gz
-/pytest-subtests-0.15.0.tar.gz
--- a/71
+++ b/71
@@ -1,71 +0,0 @@
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.13.1-3
- Rebuilt for Python 3.14
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Sep 29 2024 Fabian Affolter <mail@fabian-affolter.ch> - 0.13.1-1
- Update to latest upstream release (closes rhbz#2296187)
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.12.1-2
- Rebuilt for Python 3.13
-
-* Mon Apr 08 2024 Fabian Affolter <mail@fabian-affolter.ch> - 0.12.1
- Update to latest upstream release (closes rhbz#2196751, closes rhbz#2203842)
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.10.0-2
- Rebuilt for Python 3.12
-
-* Mon Mar 27 2023 Christian Heimes <cheimes@redhat.com> - 0.10.0-1
- Update to 0.10.0
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.5.0-3
- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 25 2021 Fabian Affolter <mail@fabian-affolter.ch> - 0.5.0-1
- Update to latest upstream release 0.5.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 0.4.0-2
- Rebuilt for Python 3.10
-
-* Sun Feb 07 2021 Christian Heimes <cheimes@redhat.com> - 0.4.0-1
- Update to 0.4 (#1925972)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Fabian Affolter <mail@fabian-affolter.ch> - 0.3.1-1
- Update to latest upstream release 0.3.1
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-2
- Rebuilt for Python 3.9
-
-* Mon Mar 23 2020 Fabian Affolter <mail@fabian-affolter.ch> - 0.3.0-1
- Initial package for Fedora
--- a/package.cfg
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
--- a/packit.yaml
+++ b/packit.yaml
@@ -1,13 +0,0 @@
-upstream_project_url: https://github.com/pytest-dev/pytest-subtests
-copy_upstream_release_description: false
-upstream_tag_template: v{version}
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide
-  - job: koji_build
-    trigger: commit
-    dist_git_branches:
-      - fedora-all
--- a/python-pytest-subtests.rpmlintrc
+++ b/python-pytest-subtests.rpmlintrc
@@ -1,2 +0,0 @@
-# Not a real spelling error:
-addFilter(r" spelling-error \('unittests?',")
--- a/python-pytest-subtests.spec
+++ b/python-pytest-subtests.spec
@@ -1,56 +1,53 @@
-Name:           python-pytest-subtests
-Version:        0.15.0
-Release:        %autorelease
+%global pypi_name pytest-subtests
+
+Name:           python-%{pypi_name}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Support for unittest subTest() and subtests fixture

-# SPDX
 License:        MIT
 URL:            https://github.com/pytest-dev/pytest-subtests
-# We *could* package from the PyPI sdist without losing anything, if we liked.
-Source:         %{url}/archive/v%{version}/pytest-subtests-%{version}.tar.gz
-
-BuildSystem:            pyproject
-BuildOption(install):   -l pytest_subtests
-
-# Don’t depend on pytest-xdist on RHEL/ELN, since it’s unwanted there. Keep the
-# dependency in Fedora because it enables several integration tests.
-#
-# (For similar reasons, we don’t pass -t to %%pyproject_buildrequires and we
-# run tests via %%pytest directly instead of via %%tox: tox is unwanted in
-# RHEL/ELN, and the benefit of using it in this package is small.)
-%if %{undefined rhel}
-BuildRequires:  python3dist(pytest-xdist)
-%endif
-
+Source0:        %{pypi_source}
 BuildArch:      noarch

 %description
 pytest-subtests unittest subTest() support and subtests fixture.

-
-%package -n     python3-pytest-subtests
+%package -n     python3-%{pypi_name}
 Summary:        %{summary}

-%description -n python3-pytest-subtests
-%{summary}.
+BuildRequires:  python3-devel
+BuildRequires:  python3-pytest
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-setuptools_scm
+%{?python_provide:%python_provide python3-%{pypi_name}}
+ 
+%description -n python3-%{pypi_name}
+pytest-subtests unittest subTest() support and subtests fixture.

+%prep
+%autosetup -n %{pypi_name}-%{version}
+rm -rf %{pypi_name}.egg-info

-%generate_buildrequires -p
-export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
+%build
+%py3_build

+%install
+%py3_install

-%build -p
-export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
+%check
+# https://github.com/pytest-dev/pytest-subtests/issues/21
+PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=%{buildroot}%{python3_sitelib} \
+  pytest-%{python3_version} -v tests \
+  -k "not TestFixture and not TestCapture and not test_simple_terminal"

-
-%check -a
-%pytest -rs -v tests
-
-
-%files -n python3-pytest-subtests -f %{pyproject_files}
-%doc CHANGELOG.rst
+%files -n python3-%{pypi_name}
+%license LICENSE
 %doc README.rst
-
+%{python3_sitelib}/__pycache__/*
+%{python3_sitelib}/pytest_subtests.py
+%{python3_sitelib}/pytest_subtests-%{version}-py*.egg-info/

 %changelog
-%autochangelog
+* Mon Mar 23 2020 Fabian Affolter <mail@fabian-affolter.ch> - 0.3.0-1
+- Initial package for Fedora
--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (pytest-subtests-0.15.0.tar.gz) = 6d47fb78212c1c82e1bb4de6c35ae6a5a8213e5d5eaa0682da9213aa3c402ef63db57fe85136b5f372e58be176f2c901798e7d03996f61db1325ba46cddac203
+SHA512 (pytest-subtests-0.3.0.tar.gz) = 49ebf151c95e1d2c89af78d8b1abfa06d5db9bf1e297f09a49a802b1b42d064ad38a2aa619aa254d23b475c7548c62b753d999f4e38eb5e1651ae067ca9cd525
Author	SHA1	Message	Date
Fabian Affolter	6d90d1642f	Merge branch 'master' into epel8	2020-03-24 20:44:19 +01:00
Gwyn Ciesla	9c3e696874	"Adding package.cfg file"	2020-03-23 11:18:04 -05:00