From 561fd4b39ffe19096c584460436749739f6988ec Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 8 Apr 2019 10:08:03 -0400 Subject: [PATCH 01/12] initial spec --- .gitignore | 1 + python-jaraco-classes.spec | 89 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 91 insertions(+) create mode 100644 .gitignore create mode 100644 python-jaraco-classes.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2a686d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/jaraco.classes-2.0.tar.gz diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec new file mode 100644 index 0000000..168f16a --- /dev/null +++ b/python-jaraco-classes.spec @@ -0,0 +1,89 @@ +# Created by pyp2rpm-3.3.2 +%global pypi_name jaraco-classes +# waiting on jaraco-packaging and rst-linker to build docs +%bcond_with doc + +Name: python-%{pypi_name} +Version: 2.0 +Release: 1%{?dist} +Summary: Utility functions for Python class constructs + +License: MIT +URL: https://github.com/jaraco/jaraco.classes +Source0: %{pypi_source jaraco.classes} +BuildArch: noarch + +%description +Utility functions for Python class constructs. + +%package -n python3-%{pypi_name} +Summary: %{summary} +Requires: python3-jaraco +Requires: python3dist(six) + +BuildConflicts: python3dist(pytest) = 3.7.3 +BuildRequires: python3-devel +BuildRequires: python3dist(pytest) >= 3.5 +BuildRequires: python3dist(pytest-flake8) +BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(setuptools-scm) >= 1.15.0 + +%{?python_provide:%python_provide python3-%{pypi_name}} + +%description -n python3-%{pypi_name} +Utility functions for Python class constructs. + +%if %{with docs} +%package -n python-%{pypi_name}-doc +Summary: jaraco-classes documentation + +BuildRequires: python3dist(pytest-checkdocs) +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(jaraco-packaging) >= 3.2 +BuildRequires: python3dist(rst-linker) >= 1.9 + +%description -n python-%{pypi_name}-doc +Documentation for jaraco-classes +%endif + +%prep +%autosetup -n jaraco.classes-%{version} +# Remove bundled egg-info +rm -rf %{pypi_name}.egg-info + +%build +%py3_build +%if %{with docs} +# generate html docs +PYTHONPATH=${PWD} sphinx-build-3 docs html +# remove the sphinx-build leftovers +rm -rf html/.{doctrees,buildinfo} +%endif + +%install +%py3_install + +%check +# disabled for right now, need a newer version of pytest-flake8 +# https://src.fedoraproject.org/rpms/python-pytest-flake8/pull-request/2 +# AttributeError: 'Application' object has no attribute 'make_notifier' +# LANG=C.utf-8 %%{__python3} -m pytest --ignore=build + +%files -n python3-%{pypi_name} +%license LICENSE +%doc README.rst +# These excludes are provided by python3-jaraco +%exclude %{python3_sitelib}/jaraco/__init__* +%exclude %{python3_sitelib}/jaraco/__pycache__/__init__* +%{python3_sitelib}/jaraco +%{python3_sitelib}/jaraco.classes-%{version}-py?.?.egg-info + +%if %{with docs} +%files -n python-%{pypi_name}-doc +%doc html +%license LICENSE +%endif + +%changelog +* Tue Apr 02 2019 Dan Radez - 2.0-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..27a3640 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jaraco.classes-2.0.tar.gz) = 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694 From 1beba3e88a483a2beba404812494b6df749748f1 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 8 Apr 2019 22:45:33 -0400 Subject: [PATCH 02/12] fixing egg info --- python-jaraco-classes.spec | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 168f16a..768894e 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -1,22 +1,23 @@ # Created by pyp2rpm-3.3.2 -%global pypi_name jaraco-classes +%global pkg_name jaraco-classes +%global pypi_name jaraco.classes # waiting on jaraco-packaging and rst-linker to build docs %bcond_with doc -Name: python-%{pypi_name} +Name: python-%{pkg_name} Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility functions for Python class constructs License: MIT URL: https://github.com/jaraco/jaraco.classes -Source0: %{pypi_source jaraco.classes} +Source0: %{pypi_source %{pypi_name}} BuildArch: noarch %description Utility functions for Python class constructs. -%package -n python3-%{pypi_name} +%package -n python3-%{pkg_name} Summary: %{summary} Requires: python3-jaraco Requires: python3dist(six) @@ -28,13 +29,13 @@ BuildRequires: python3dist(pytest-flake8) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools-scm) >= 1.15.0 -%{?python_provide:%python_provide python3-%{pypi_name}} +%{?python_provide:%python_provide python3-%{pkg_name}} -%description -n python3-%{pypi_name} +%description -n python3-%{pkg_name} Utility functions for Python class constructs. %if %{with docs} -%package -n python-%{pypi_name}-doc +%package -n python-%{pkg_name}-doc Summary: jaraco-classes documentation BuildRequires: python3dist(pytest-checkdocs) @@ -42,14 +43,16 @@ BuildRequires: python3dist(sphinx) BuildRequires: python3dist(jaraco-packaging) >= 3.2 BuildRequires: python3dist(rst-linker) >= 1.9 -%description -n python-%{pypi_name}-doc +%description -n python-%{pkg_name}-doc Documentation for jaraco-classes %endif %prep %autosetup -n jaraco.classes-%{version} # Remove bundled egg-info -rm -rf %{pypi_name}.egg-info +rm -rf %{pkg_name}.egg-info +# rename package to use a - +sed -i 's/%{pypi_name}/%{pkg_name}/' setup.cfg %build %py3_build @@ -69,21 +72,24 @@ rm -rf html/.{doctrees,buildinfo} # AttributeError: 'Application' object has no attribute 'make_notifier' # LANG=C.utf-8 %%{__python3} -m pytest --ignore=build -%files -n python3-%{pypi_name} +%files -n python3-%{pkg_name} %license LICENSE %doc README.rst # These excludes are provided by python3-jaraco %exclude %{python3_sitelib}/jaraco/__init__* %exclude %{python3_sitelib}/jaraco/__pycache__/__init__* %{python3_sitelib}/jaraco -%{python3_sitelib}/jaraco.classes-%{version}-py?.?.egg-info +%{python3_sitelib}/jaraco_classes-%{version}-py?.?.egg-info %if %{with docs} -%files -n python-%{pypi_name}-doc +%files -n python-%{pkg_name}-doc %doc html %license LICENSE %endif %changelog +* Mon Apr 08 2019 Dan Radez - 2.0-2 +- fixed egg info + * Tue Apr 02 2019 Dan Radez - 2.0-1 - Initial package. From c741848ef41cff55c46d7686821df790de591edf Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 8 Apr 2019 23:42:47 -0400 Subject: [PATCH 03/12] enabled tests --- python-jaraco-classes.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 768894e..2d7b912 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -53,6 +53,10 @@ Documentation for jaraco-classes rm -rf %{pkg_name}.egg-info # rename package to use a - sed -i 's/%{pypi_name}/%{pkg_name}/' setup.cfg +# disable flake8 in the tests, need a newer version of pytest-flake8 +# https://src.fedoraproject.org/rpms/python-pytest-flake8/pull-request/2 +# AttributeError: 'Application' object has no attribute 'make_notifier' +sed -i 's/ --flake8//' pytest.ini %build %py3_build @@ -67,10 +71,7 @@ rm -rf html/.{doctrees,buildinfo} %py3_install %check -# disabled for right now, need a newer version of pytest-flake8 -# https://src.fedoraproject.org/rpms/python-pytest-flake8/pull-request/2 -# AttributeError: 'Application' object has no attribute 'make_notifier' -# LANG=C.utf-8 %%{__python3} -m pytest --ignore=build +LANG=C.utf-8 %{__python3} -m pytest --ignore=build %files -n python3-%{pkg_name} %license LICENSE From b0318c6b0d11155709782d22dfcc45594238cfec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 4 Jul 2019 16:21:50 +0200 Subject: [PATCH 04/12] Remove .0 from (Build)Requires See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/NLMEX6MY7DQLWTD2PMX4WGC3L3ER4HFS/ --- python-jaraco-classes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 2d7b912..1c1fe18 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -27,7 +27,7 @@ BuildRequires: python3-devel BuildRequires: python3dist(pytest) >= 3.5 BuildRequires: python3dist(pytest-flake8) BuildRequires: python3dist(setuptools) -BuildRequires: python3dist(setuptools-scm) >= 1.15.0 +BuildRequires: python3dist(setuptools-scm) >= 1.15 %{?python_provide:%python_provide python3-%{pkg_name}} From 516da2088b86a179477e7d4654484c544e9feb74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 14:06:16 +0000 Subject: [PATCH 05/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-jaraco-classes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 1c1fe18..340c309 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -6,7 +6,7 @@ Name: python-%{pkg_name} Version: 2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility functions for Python class constructs License: MIT @@ -89,6 +89,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Apr 08 2019 Dan Radez - 2.0-2 - fixed egg info From 61977991d205a6e34e30a89a32647905a66ebb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:42:07 +0200 Subject: [PATCH 06/12] Rebuilt for Python 3.8 --- python-jaraco-classes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 340c309..a125c88 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -6,7 +6,7 @@ Name: python-%{pkg_name} Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utility functions for Python class constructs License: MIT @@ -89,6 +89,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %endif %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.0-4 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 01d937fbd7f2b0d2e90845ce8ee05cc8e9c7a009 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 20 Aug 2019 10:47:39 -0400 Subject: [PATCH 07/12] remove sed . to _ --- python-jaraco-classes.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index a125c88..9d7c96b 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -6,7 +6,7 @@ Name: python-%{pkg_name} Version: 2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility functions for Python class constructs License: MIT @@ -51,8 +51,6 @@ Documentation for jaraco-classes %autosetup -n jaraco.classes-%{version} # Remove bundled egg-info rm -rf %{pkg_name}.egg-info -# rename package to use a - -sed -i 's/%{pypi_name}/%{pkg_name}/' setup.cfg # disable flake8 in the tests, need a newer version of pytest-flake8 # https://src.fedoraproject.org/rpms/python-pytest-flake8/pull-request/2 # AttributeError: 'Application' object has no attribute 'make_notifier' @@ -80,7 +78,7 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %exclude %{python3_sitelib}/jaraco/__init__* %exclude %{python3_sitelib}/jaraco/__pycache__/__init__* %{python3_sitelib}/jaraco -%{python3_sitelib}/jaraco_classes-%{version}-py?.?.egg-info +%{python3_sitelib}/jaraco.classes-%{version}-py?.?.egg-info %if %{with docs} %files -n python-%{pkg_name}-doc @@ -89,6 +87,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %endif %changelog +* Tue Aug 22 2019 Dan Radez - 2.0-5 +- Removing the sed . to _ it's confusing and not needed + * Mon Aug 19 2019 Miro Hrončok - 2.0-4 - Rebuilt for Python 3.8 From 290344dc28eb055ec42470ffaa6ae2c922bf58f5 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 20 Aug 2019 11:10:36 -0400 Subject: [PATCH 08/12] Fix dependencies --- python-jaraco-classes.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 9d7c96b..d4096fc 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -40,8 +40,8 @@ Summary: jaraco-classes documentation BuildRequires: python3dist(pytest-checkdocs) BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(jaraco-packaging) >= 3.2 -BuildRequires: python3dist(rst-linker) >= 1.9 +BuildRequires: python3dist(jaraco.packaging) >= 3.2 +BuildRequires: python3dist(rst.linker) >= 1.9 %description -n python-%{pkg_name}-doc Documentation for jaraco-classes From abbdb71603ffabf0714b157db9e84b86086ef259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:15:48 +0200 Subject: [PATCH 09/12] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-jaraco-classes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index d4096fc..14a0491 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -6,7 +6,7 @@ Name: python-%{pkg_name} Version: 2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utility functions for Python class constructs License: MIT @@ -87,6 +87,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.0-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Tue Aug 22 2019 Dan Radez - 2.0-5 - Removing the sed . to _ it's confusing and not needed From 14700a5b5556e6e67b3a05bc9c25fe6e5eb9f1ab Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 11 Nov 2019 15:27:58 -0700 Subject: [PATCH 10/12] Set minimum pytest version to 3.4 for compatibility with el8 --- python-jaraco-classes.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index 14a0491..b5bca1a 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -6,7 +6,7 @@ Name: python-%{pkg_name} Version: 2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utility functions for Python class constructs License: MIT @@ -24,7 +24,7 @@ Requires: python3dist(six) BuildConflicts: python3dist(pytest) = 3.7.3 BuildRequires: python3-devel -BuildRequires: python3dist(pytest) >= 3.5 +BuildRequires: python3dist(pytest) >= 3.4 BuildRequires: python3dist(pytest-flake8) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools-scm) >= 1.15 @@ -87,6 +87,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %endif %changelog +* Mon Nov 11 2019 Ken Dreyer - 2.0-7 +- Set minimum pytest version to 3.4 for compatibility with el8 + * Thu Oct 03 2019 Miro Hrončok - 2.0-6 - Rebuilt for Python 3.8.0rc1 (#1748018) From 8c9df2402f30088529877b42aa901cff2156bbb7 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 12 Nov 2019 19:27:07 +0000 Subject: [PATCH 11/12] use pytest 3.4, drop flake8 as it isn't needed --- python-jaraco-classes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index b5bca1a..fb467d7 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -25,7 +25,7 @@ Requires: python3dist(six) BuildConflicts: python3dist(pytest) = 3.7.3 BuildRequires: python3-devel BuildRequires: python3dist(pytest) >= 3.4 -BuildRequires: python3dist(pytest-flake8) + BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools-scm) >= 1.15 From 404deca86219d59e911e357fda211c930fc28908 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 13 Nov 2019 15:52:55 +0000 Subject: [PATCH 12/12] fix bogus date in changelog --- python-jaraco-classes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec index fb467d7..dce5b68 100644 --- a/python-jaraco-classes.spec +++ b/python-jaraco-classes.spec @@ -93,7 +93,7 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build * Thu Oct 03 2019 Miro Hrončok - 2.0-6 - Rebuilt for Python 3.8.0rc1 (#1748018) -* Tue Aug 22 2019 Dan Radez - 2.0-5 +* Thu Aug 22 2019 Dan Radez - 2.0-5 - Removing the sed . to _ it's confusing and not needed * Mon Aug 19 2019 Miro Hrončok - 2.0-4