From ac54b526bb7381bdf8ad40b88ec5bca6fae200d66e20ab3e46212735f6786dc7 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 8 Jul 2021 00:24:40 +0000 Subject: [PATCH] - Update to 0.11.2: - correct false positives in lexical_illusions.misc - fix package metadata and pypi upload (hotfix release) - add warning for missing corpus - reduce false positives for uncomparables.misc - correct "attorney and not a republic" mondegreen - correct unbound line and column in error printing - fix false positive in misc.but - add --config CLI argument - add exceptions for proselint.tools.existence_check - use regex for lexical_illusions.misc - implement project-wide proselintrc OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-proselint?expand=0&rev=22 --- disable-empty-test.patch | 31 ------------------------------- proselint-0.10.2.tar.gz | 3 --- proselint-0.11.2.tar.gz | 3 +++ python-proselint.changes | 16 ++++++++++++++++ python-proselint.spec | 26 +++++++++++--------------- remove_nose.patch | 22 ---------------------- test-use-sys-executable.patch | 29 ----------------------------- 7 files changed, 30 insertions(+), 100 deletions(-) delete mode 100644 disable-empty-test.patch delete mode 100644 proselint-0.10.2.tar.gz create mode 100644 proselint-0.11.2.tar.gz delete mode 100644 remove_nose.patch delete mode 100644 test-use-sys-executable.patch diff --git a/disable-empty-test.patch b/disable-empty-test.patch deleted file mode 100644 index ea26848..0000000 --- a/disable-empty-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_weasel_words_misc.py b/tests/test_weasel_words_misc.py -deleted file mode 100644 -index 3f93e8f..0000000 ---- a/tests/test_weasel_words_misc.py -+++ /dev/null -@@ -1,25 +0,0 @@ --"""Tests for weasel_words.misc check.""" --from __future__ import absolute_import -- --from .check import Check -- --from proselint.checks.weasel_words import misc as chk --from nose import SkipTest -- -- --class TestCheck(Check): -- """The test class for weasel_words.misc.""" -- -- raise SkipTest -- -- __test__ = True -- -- @property -- def this_check(self): -- """Boilerplate.""" -- return chk -- -- def test_smoke(self): -- """Basic smoke test for weasel_words.misc.""" -- assert self.passes("""Smoke phrase with nothing flagged.""") -- # FIXME add test when check is implemented diff --git a/proselint-0.10.2.tar.gz b/proselint-0.10.2.tar.gz deleted file mode 100644 index 53725a6..0000000 --- a/proselint-0.10.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904 -size 100979 diff --git a/proselint-0.11.2.tar.gz b/proselint-0.11.2.tar.gz new file mode 100644 index 0000000..ac79109 --- /dev/null +++ b/proselint-0.11.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ea19c96ac7069ba04800fcb42d8aa9ec3e8afd4825c15fdf2eecb29db92cafe +size 872921 diff --git a/python-proselint.changes b/python-proselint.changes index 8e7dab7..bb874ac 100644 --- a/python-proselint.changes +++ b/python-proselint.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jul 8 00:03:06 UTC 2021 - Matej Cepl + +- Update to 0.11.2: + - correct false positives in lexical_illusions.misc + - fix package metadata and pypi upload (hotfix release) + - add warning for missing corpus + - reduce false positives for uncomparables.misc + - correct "attorney and not a republic" mondegreen + - correct unbound line and column in error printing + - fix false positive in misc.but + - add --config CLI argument + - add exceptions for proselint.tools.existence_check + - use regex for lexical_illusions.misc + - implement project-wide proselintrc + ------------------------------------------------------------------- Sun Aug 16 17:49:59 UTC 2020 - Matej Cepl diff --git a/python-proselint.spec b/python-proselint.spec index 079c782..6888ffe 100644 --- a/python-proselint.spec +++ b/python-proselint.spec @@ -1,7 +1,7 @@ # # spec file for package python-proselint # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 +%define modname proselint Name: python-proselint -Version: 0.10.2 +Version: 0.11.2 Release: 0 Summary: A linter for prose License: BSD-3-Clause URL: https://github.com/amperser/proselint -Source: https://files.pythonhosted.org/packages/source/p/proselint/proselint-%{version}.tar.gz -# test_weasel_words_misc is empty in release v0.10.2, and contains nose.SkipTest -Patch0: disable-empty-test.patch -Patch1: test-use-sys-executable.patch -# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#amperser/proselint#1097 mcepl@suse.com -# this patch makes things totally awesome -Patch2: remove_nose.patch +Source: https://github.com/amperser/%{modname}/archive/refs/tags/%{version}.tar.gz#/%{modname}-%{version}.tar.gz +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry-core} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-click @@ -39,7 +37,7 @@ Requires: python-dbm Requires: python-future Requires: python-six Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module click} @@ -68,10 +66,10 @@ existing tools. sed -i -e '/^#!\//, 1d' proselint/*.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/proselint %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -82,8 +80,6 @@ sed -i -e '/^#!\//, 1d' proselint/*.py %python_uninstall_alternative proselint %check -mkdir ~/bin -export PATH=~/bin:$PATH %{python_expand cp %{buildroot}%{_bindir}/proselint-%{$python_bin_suffix} ~/bin/proselint PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest } @@ -93,6 +89,6 @@ PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest %license LICENSE.md %python_alternative %{_bindir}/proselint %{python_sitelib}/proselint/ -%{python_sitelib}/proselint-%{version}-py*.egg-info +%{python_sitelib}/proselint-%{version}.dist-info %changelog diff --git a/remove_nose.patch b/remove_nose.patch deleted file mode 100644 index b52f32f..0000000 --- a/remove_nose.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/tests/test_gmeu/test_a_A.py -+++ b/tests/test_gmeu/test_a_A.py -@@ -4,7 +4,7 @@ - """Test GMEU entry 'a', part A.""" - - from proselint.tools import assert_error --from nose import SkipTest -+from unittest import SkipTest - - - def test_a_vs_an(): ---- a/tests/test_gmeu/test_a_B.py -+++ b/tests/test_gmeu/test_a_B.py -@@ -4,7 +4,7 @@ - """Test GMEU entry 'a', part B.""" - - from proselint.tools import assert_error --from nose import SkipTest -+from unittest import SkipTest - - - def test_a_distributive(): diff --git a/test-use-sys-executable.patch b/test-use-sys-executable.patch deleted file mode 100644 index 1b2eab0..0000000 --- a/test-use-sys-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f6950839960354cf7986f2dcd73195cdb9588dc8 Mon Sep 17 00:00:00 2001 -From: John Vandenberg -Date: Fri, 8 Mar 2019 14:18:47 +0700 -Subject: [PATCH] test_version: Use sys.executable - ---- - tests/_test_version.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/_test_version.py b/tests/_test_version.py -index 7eb0d96f..2324b2ae 100644 ---- a/tests/_test_version.py -+++ b/tests/_test_version.py -@@ -5,6 +5,7 @@ - from .check import Check - from proselint.version import __version__ - import subprocess -+import sys - - - class TestCheck(Check): -@@ -14,5 +15,6 @@ class TestCheck(Check): - - def test_version(self): - """Make sure the version number is correct.""" -- out = subprocess.check_output(["proselint", "--version"]) -+ out = subprocess.check_output( -+ [sys.executable, "-m", "proselint", "--version"]) - assert out.decode('utf-8') == __version__ + "\n"