diff --git a/.gitignore b/.gitignore index 0fb5936..09ff3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/lesscpy-0.13.0.tar.gz -/lesscpy-0.13.0.tar.gz +lesscpy-0.14.0.tar.gz diff --git a/lesscpy-fix-test.patch b/lesscpy-fix-test.patch deleted file mode 100644 index c21e33b..0000000 --- a/lesscpy-fix-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 964905dc09406a55097d9c644b45bbec6944170a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 12 Jun 2018 13:43:47 +0200 -Subject: [PATCH] Allow to run tests from versioned folder - -If I download and unpack lesscpy-0.13.0 the tests from within -were failing, because the 0.13.0 got split. this fixes it. ---- - test/core.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/core.py b/test/core.py -index 438ec54..63e3689 100644 ---- a/test/core.py -+++ b/test/core.py -@@ -24,7 +24,7 @@ def find_and_load_cases(cls, less_dir, css_dir, less_files=None, css_minimized=T - else: - LESS = glob.glob(os.path.join(_less_path, '*.less')) - for less in LESS: -- lessf = less.split('.')[0].split('/')[-1] -+ lessf = less.rpartition('.')[0].split('/')[-1] - css = os.path.join(_css_path, lessf + '.css') - if css_minimized: - mincss = os.path.join(_css_path, lessf + '.min.css') diff --git a/python-lesscpy.spec b/python-lesscpy.spec index a70b45e..3f3f17e 100644 --- a/python-lesscpy.spec +++ b/python-lesscpy.spec @@ -2,22 +2,17 @@ %if 0%{?rhel} > 7 # Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 %endif Name: python-%{pypi_name} -Version: 0.13.0 -Release: 4%{?dist} +Version: 0.14.0 +Release: 17%{?dist} Summary: Lesscss compiler License: MIT URL: https://github.com/robotis/lesscpy Source0: https://pypi.python.org/packages/source/l/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Patch0: https://github.com/lesscpy/lesscpy/pull/99.patch#/%{pypi_name}-fix-test.patch - BuildArch: noarch %global _description\ @@ -28,21 +23,6 @@ supported (JavaScript evaluation). %description %_description -%if %{with python2} -%package -n python2-lesscpy -Summary: %summary -Requires: python2-ply -Requires: python2-six -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-ply -BuildRequires: python2-nose -BuildRequires: python2-coverage -BuildRequires: python2-six -%{?python_provide:%python_provide python2-lesscpy} - -%description -n python2-lesscpy %_description -%endif # with python2 %package -n python3-lesscpy Summary: %summary @@ -51,8 +31,7 @@ Requires: python3-six BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-ply -BuildRequires: python3-nose -BuildRequires: python3-coverage +BuildRequires: python3-pytest BuildRequires: python3-six %{?python_provide:%python_provide python3-lesscpy} @@ -66,18 +45,11 @@ supported (JavaScript evaluation). %autosetup -p1 -n %{pypi_name}-%{version} %build -%if %{with python2} -%py2_build -%endif # with python2 %py3_build %install -%if %{with python2} -%py2_install -rm %{buildroot}/%{_bindir}/lesscpy -%endif # with python2 %py3_install # link for backwards compatibility. consider removal in Fedora 30+ @@ -85,17 +57,8 @@ ln -s ./lesscpy %{buildroot}/%{_bindir}/py3-lesscpy %check -%if %{with python2} -%{__python2} -m nose -v -%endif # with python2 -%{__python3} -m nose -v +%pytest -%if %{with python2} -%files -n python2-lesscpy -%doc LICENSE -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with python2 %files -n python3-lesscpy %doc LICENSE @@ -106,9 +69,90 @@ ln -s ./lesscpy %{buildroot}/%{_bindir}/py3-lesscpy %changelog -* Fri Jun 22 2018 Petr Viktorin - 0.13.0-4 +* Tue Oct 29 2024 Troy Dawson - 0.14.0-17 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.14.0-16 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 0.14.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.14.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.14.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.14.0-12 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.14.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.14.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.14.0-9 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.14.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.14.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.14.0-6 +- Rebuilt for Python 3.10 + +* Wed Feb 03 2021 Christian Heimes - 0.14.0-5 +- Check with pytest instead of nose +- Remove build dependency on coverage + +* Wed Jan 27 2021 Fedora Release Engineering - 0.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.14.0-2 +- Rebuilt for Python 3.9 + +* Mon Feb 24 2020 Thomas Andrejak - 0.14.0-1 +- Bump version 0.14.0 (Fix #1792982) + +* Thu Jan 30 2020 Fedora Release Engineering - 0.13.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 0.13.0-12 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 0.13.0-11 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.13.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.13.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Oct 17 2018 Zbigniew Jędrzejewski-Szmek - 0.13.0-8 +- Subpackage python2-lesscpy has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Mon Jul 16 2018 Marcel Plch - 0.13.0-7 - Remove the unused flake8 build dependency +* Sat Jul 14 2018 Fedora Release Engineering - 0.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.13.0-5 +- Rebuilt for Python 3.7 + +* Wed Jun 13 2018 Miro Hrončok - 0.13.0-4 +- Add explicit conflicts + * Tue Jun 12 2018 Miro Hrončok - 0.13.0-3 - General spec cleanup - Add missing dependency on six diff --git a/sources b/sources index 31042f8..d177f35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lesscpy-0.13.0.tar.gz) = 227db8212a386b06f288140d09b7505ae43bc6221396fa2d154a6d7f0831cf1ff005d9818fd85fb3804103b725b60827cf56a29930c2de928546ab0dcf3d5877 +SHA512 (lesscpy-0.14.0.tar.gz) = 333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3