forked from pool/python-subst
- Correct URL.
- Switch to autosetup and pyproject macros. - No more greedy globs in %files. - Add patch fix-assertions.patch, fix regex assertion methods. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-subst?expand=0&rev=7
This commit is contained in:
37
fix-assertions.patch
Normal file
37
fix-assertions.patch
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
Index: subst-0.4.0/test/test_parse_args_eval_replacement.py
|
||||||
|
===================================================================
|
||||||
|
--- subst-0.4.0.orig/test/test_parse_args_eval_replacement.py
|
||||||
|
+++ subst-0.4.0/test/test_parse_args_eval_replacement.py
|
||||||
|
@@ -28,8 +28,8 @@ class TestParseArgsEvalReplacement(unitt
|
||||||
|
if IS_PY2:
|
||||||
|
self.assertRaisesRegexp(TypeError, r'takes exactly 1 argument', result)
|
||||||
|
else:
|
||||||
|
- self.assertRaisesRegexp(TypeError, r'missing 1 required positional argument', result)
|
||||||
|
- self.assertRaisesRegexp(NameError, r"'asd' is not defined", lambda: result('a'))
|
||||||
|
+ self.assertRaisesRegex(TypeError, r'missing 1 required positional argument', result)
|
||||||
|
+ self.assertRaisesRegex(NameError, r"'asd' is not defined", lambda: result('a'))
|
||||||
|
|
||||||
|
def test_invalid_code_syntax_error(self):
|
||||||
|
code = 'in = 3'
|
||||||
|
@@ -40,7 +40,7 @@ class TestParseArgsEvalReplacement(unitt
|
||||||
|
if IS_PY2:
|
||||||
|
self.assertRaisesRegexp(TypeError, r'takes exactly 1 argument', result)
|
||||||
|
else:
|
||||||
|
- self.assertRaisesRegexp(TypeError, r'missing 1 required positional argument', result)
|
||||||
|
+ self.assertRaisesRegex(TypeError, r'missing 1 required positional argument', result)
|
||||||
|
self.assertRaises(SyntaxError, lambda: result('a'))
|
||||||
|
|
||||||
|
def test_function_simple_match(self):
|
||||||
|
Index: subst-0.4.0/test/test_show_version.py
|
||||||
|
===================================================================
|
||||||
|
--- subst-0.4.0.orig/test/test_show_version.py
|
||||||
|
+++ subst-0.4.0/test/test_show_version.py
|
||||||
|
@@ -25,7 +25,7 @@ class TestShowVersion(unittest.TestCase)
|
||||||
|
data = sys.stdout.getvalue()
|
||||||
|
sys.stdout = old_stdout
|
||||||
|
|
||||||
|
- self.assertRegexpMatches(data, ': version %s' % re.escape(subst.__version__))
|
||||||
|
+ self.assertRegex(data, ': version %s' % re.escape(subst.__version__))
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
@@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 27 01:35:04 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||||
|
|
||||||
|
- Correct URL.
|
||||||
|
- Switch to autosetup and pyproject macros.
|
||||||
|
- No more greedy globs in %files.
|
||||||
|
- Add patch fix-assertions.patch, fix regex assertion methods.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 13 12:44:17 UTC 2021 - pgajdos@suse.com
|
Wed Jan 13 12:44:17 UTC 2021 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-subst
|
# spec file for package python-subst
|
||||||
#
|
#
|
||||||
# Copyright (c) 2021 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -16,18 +16,19 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
|
||||||
Name: python-subst
|
Name: python-subst
|
||||||
Version: 0.4.0
|
Version: 0.4.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utility to replace one string into another in given list of files
|
Summary: Utility to replace one string into another in given list of files
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Languages/Python
|
URL: https://github.com/msztolcman/subst
|
||||||
URL: http://mysz.github.io/subst/
|
|
||||||
Source: https://files.pythonhosted.org/packages/source/s/subst/subst-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/s/subst/subst-%{version}.tar.gz
|
||||||
Source1: https://raw.githubusercontent.com/msztolcman/subst/master/LICENSE
|
Source1: https://raw.githubusercontent.com/msztolcman/subst/master/LICENSE
|
||||||
|
Patch0: fix-assertions.patch
|
||||||
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: %{python_module pytest}
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
@@ -39,20 +40,17 @@ BuildArch: noarch
|
|||||||
`subst` is simple utility to replace one string into another in given list of files.
|
`subst` is simple utility to replace one string into another in given list of files.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n subst-%{version}
|
%autosetup -p1 -n subst-%{version}
|
||||||
cp %{SOURCE1} .
|
cp %{SOURCE1} .
|
||||||
|
|
||||||
sed -i '/argparse/d' setup.py
|
sed -i '/argparse/d' setup.py
|
||||||
|
|
||||||
sed -i '1{/^#!/d}' subst.py
|
sed -i '1{/^#!/d}' subst.py
|
||||||
|
|
||||||
touch test/__init__.py
|
touch test/__init__.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%pyproject_wheel
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%python_install
|
%pyproject_install
|
||||||
%python_clone -a %{buildroot}%{_bindir}/subst
|
%python_clone -a %{buildroot}%{_bindir}/subst
|
||||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||||
|
|
||||||
@@ -70,6 +68,8 @@ export PYTHONPATH=${PWD}/test
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%python_alternative %{_bindir}/subst
|
%python_alternative %{_bindir}/subst
|
||||||
%{python_sitelib}/*
|
%{python_sitelib}/subst.py
|
||||||
|
%pycache_only %{python_sitelib}/__pycache__/subst.*.py*
|
||||||
|
%{python_sitelib}/subst-%{version}.dist-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Reference in New Issue
Block a user