diff --git a/jsonformatter-0.3.2.tar.gz b/jsonformatter-0.3.2.tar.gz deleted file mode 100644 index f5553d8..0000000 --- a/jsonformatter-0.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d69c4b294cd9030b6803659924908f979ae827f5bdccde6a3815c0afb062948f -size 15058 diff --git a/jsonformatter-0.3.4.tar.gz b/jsonformatter-0.3.4.tar.gz new file mode 100644 index 0000000..5b62ec6 --- /dev/null +++ b/jsonformatter-0.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af71ae1534a80d6f60f8d5ee7bfa70c2e45389ed803ed94239f4305b7c68105d +size 21289 diff --git a/python-jsonformatter.changes b/python-jsonformatter.changes index 4b112f5..fe6c90a 100644 --- a/python-jsonformatter.changes +++ b/python-jsonformatter.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 28 04:53:42 UTC 2024 - Steve Kowalik + +- Update to 0.3.4: + * Support python 3.13 + * fix: python < 3.7 using pip install failed +- Use pytest and license macros. +- Remove patch remove-failing-test.py, no longer required. + ------------------------------------------------------------------- Mon Apr 8 08:43:00 UTC 2024 - Antonio Larrosa diff --git a/python-jsonformatter.spec b/python-jsonformatter.spec index 59ae8cc..b71c2ef 100644 --- a/python-jsonformatter.spec +++ b/python-jsonformatter.spec @@ -18,19 +18,19 @@ %{?sle15_python_module_pythons} Name: python-jsonformatter -Version: 0.3.2 +Version: 0.3.4 Release: 0 Summary: Python log in json format License: BSD-2-Clause URL: https://github.com/MyColorfulDays/jsonformatter.git Source: https://files.pythonhosted.org/packages/source/j/jsonformatter/jsonformatter-%{version}.tar.gz -Patch0: remove-failing-test.py -BuildRequires: dos2unix -BuildRequires: python-rpm-macros BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} +BuildRequires: dos2unix BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildArch: noarch %python_subpackages @@ -40,8 +40,8 @@ A formatter for python logging that outputs json log %prep %autosetup -p1 -n jsonformatter-%{version} find . -type f -exec chmod -x {} \; -dos2unix jsonformatter/__init__.py -sed -i '1{\,^#!%{_bindir}/env python,d}' jsonformatter/*.py +dos2unix README.md +sed -i '1{\,^#!%{_bindir}/env python,d}' src/jsonformatter/*.py %build %pyproject_wheel @@ -51,13 +51,11 @@ sed -i '1{\,^#!%{_bindir}/env python,d}' jsonformatter/*.py %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%{python_expand # -export PYTHONPATH=%{buildroot}%{$python_sitelib} -$python test/test.py -} +%pytest -k 'not test_file_config' tests %files %{python_files} %doc README.md +%license LICENSE %{python_sitelib}/jsonformatter %{python_sitelib}/jsonformatter-%{version}.dist-info diff --git a/remove-failing-test.py b/remove-failing-test.py deleted file mode 100644 index 94674c9..0000000 --- a/remove-failing-test.py +++ /dev/null @@ -1,12 +0,0 @@ -Index: jsonformatter-0.3.2/test/test.py -=================================================================== ---- jsonformatter-0.3.2.orig/test/test.py -+++ jsonformatter-0.3.2/test/test.py -@@ -350,6 +350,7 @@ class JsonFormatterTest(unittest.TestCas - - root.info('test json dumps parameter `ensure_ascii` False: 中文') - -+ @unittest.skip('fails to run') - def test_file_config(self): - fileConfig(os.path.join(os.path.dirname( - __file__), 'logger_config.ini'))