diff --git a/bpython-0.22.1.tar.gz b/bpython-0.22.1.tar.gz deleted file mode 100644 index 4f761c5..0000000 --- a/bpython-0.22.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200 -size 217294 diff --git a/bpython-0.23.tar.gz b/bpython-0.23.tar.gz new file mode 100644 index 0000000..216afcd --- /dev/null +++ b/bpython-0.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f0078abc887c48af088691e2f64797d6ca994ac0f4bc03c38d06f657d7c052a +size 222241 diff --git a/python-bpython.changes b/python-bpython.changes index 39a1007..b685184 100644 --- a/python-bpython.changes +++ b/python-bpython.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sat Sep 10 15:32:53 UTC 2022 - Arun Persaud + +- specfile: + * skip python 3.6 + * update requirement for curtsies + * removed patch syntaxerror_failing_test.patch and typing_extensions.patch: included upstream + +- update to version 0.23: + * General information: + + More and more type annotations have been added to the bpython + code base. + + Some work has been performed to stop relying on blessings. + * New features: + + #905: Auto-closing brackets option added. To enable, add + brackets_completion = True in the bpython config Thanks to + samuelgregorovic + * Fixes: + + Improve handling of SyntaxErrors + + #948: Fix crash on Ctrl-Z + + #952: Fix tests for Python 3.10.1 and newer + + #955: Handle optional readline parameters in stdin emulation + Thanks to thevibingcat + + #959: Fix handling of __name__ + + #966: Fix function signature completion for classmethod + * Changes to dependencies: + + curtsies 0.4 or newer is now required + * Support for Python 3.6 has been dropped. + ------------------------------------------------------------------- Sat Feb 5 21:57:02 UTC 2022 - Matej Cepl diff --git a/python-bpython.spec b/python-bpython.spec index 375f3b9..f3be984 100644 --- a/python-bpython.spec +++ b/python-bpython.spec @@ -18,21 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%define skip_python36 1 %bcond_without test Name: python-bpython -Version: 0.22.1 +Version: 0.23 Release: 0 Summary: Fancy Interface to the Python Interpreter License: MIT URL: https://www.bpython-interpreter.org/ Source: https://files.pythonhosted.org/packages/source/b/bpython/bpython-%{version}.tar.gz -# PATCH-FIX-UPSTREAM typing_extensions.patch gh#bpython/bpython#940 mcepl@suse.com -# We actually don't need typing_extensions (all objects are in 3.8+) -Patch0: typing_extensions.patch -# PATCH-FIX-UPSTREAM syntaxerror_failing_test.patch gh#bpython/bpython#952 mcepl@suse.com -# This is actually fixed in the post-0.22.1 development, but waiting on it. -# https://github.com/bpython/bpython/compare/fdd4ad9..4d33cc6.patch -Patch1: syntaxerror_failing_test.patch BuildRequires: %{python_module Babel} BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module pip} @@ -43,7 +37,7 @@ BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros BuildRequires: update-desktop-files Requires: %{name}-common = %{version} -Requires: python-curtsies >= 0.3.5 +Requires: python-curtsies >= 0.4 Requires: python-greenlet Requires: python-pygments Requires: python-pyxdg @@ -60,7 +54,7 @@ Recommends: python-urwid Recommends: python-watchdog BuildArch: noarch %if %{with test} -BuildRequires: %{python_module curtsies >= 0.3.5} +BuildRequires: %{python_module curtsies >= 0.4} BuildRequires: %{python_module greenlet} BuildRequires: %{python_module pygments} BuildRequires: %{python_module pyxdg} diff --git a/syntaxerror_failing_test.patch b/syntaxerror_failing_test.patch deleted file mode 100644 index 00585d6..0000000 --- a/syntaxerror_failing_test.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b46afa3bb1ab783c96dc80c5184090a171ab70d4 Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher -Date: Fri, 31 Dec 2021 14:00:46 +0100 -Subject: [PATCH 1/3] Apply black - ---- - bpython/autocomplete.py | 1 - - bpython/curtsiesfrontend/filewatch.py | 1 - - bpython/test/test_interpreter.py | 14 +++++++++++++- - bpython/urwid.py | 1 - - 4 files changed, 13 insertions(+), 4 deletions(-) - ---- a/bpython/autocomplete.py -+++ b/bpython/autocomplete.py -@@ -626,7 +626,6 @@ except ImportError: - def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]: - return None - -- - else: - - class JediCompletion(BaseCompletionType): ---- a/bpython/curtsiesfrontend/filewatch.py -+++ b/bpython/curtsiesfrontend/filewatch.py -@@ -11,7 +11,6 @@ except ImportError: - def ModuleChangedEventHandler(*args): - return None - -- - else: - - class ModuleChangedEventHandler(FileSystemEventHandler): # type: ignore [no-redef] ---- a/bpython/test/test_interpreter.py -+++ b/bpython/test/test_interpreter.py -@@ -35,7 +35,19 @@ class TestInterpreter(unittest.TestCase) - - i.runsource("1.1.1.1") - -- if sys.version_info[:2] >= (3, 10): -+ if (3, 10, 1) <= sys.version_info[:3]: -+ expected = ( -+ " File " -+ + green('""') -+ + ", line " -+ + bold(magenta("1")) -+ + "\n 1.1.1.1\n ^^\n" -+ + bold(red("SyntaxError")) -+ + ": " -+ + cyan("invalid syntax") -+ + "\n" -+ ) -+ elif (3, 10) <= sys.version_info[:2]: - expected = ( - " File " - + green('""') ---- a/bpython/urwid.py -+++ b/bpython/urwid.py -@@ -128,7 +128,6 @@ if urwid.VERSION < (1, 0, 0) and hasattr - - return wrapper - -- - else: - TwistedEventLoop = getattr(urwid, "TwistedEventLoop", None) - diff --git a/typing_extensions.patch b/typing_extensions.patch deleted file mode 100644 index 647aae3..0000000 --- a/typing_extensions.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 51ebc86070c7a49abe78ba87a0e8268a09f141a6 Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher -Date: Wed, 8 Dec 2021 18:18:17 +0100 -Subject: [PATCH] Add a typing compat module to avoid a dependency on - typing-extensions for Py >= 3.8 - ---- - bpython/_typing_compat.py | 33 +++++++++++++++++++++++++++++++++ - bpython/curtsies.py | 2 +- - bpython/curtsiesfrontend/_internal.py | 2 +- - bpython/curtsiesfrontend/repl.py | 2 +- - bpython/filelock.py | 2 +- - bpython/inspection.py | 2 +- - bpython/repl.py | 2 +- - setup.cfg | 2 +- - 8 files changed, 40 insertions(+), 7 deletions(-) - create mode 100644 bpython/_typing_compat.py - ---- /dev/null -+++ b/bpython/_typing_compat.py -@@ -0,0 +1,33 @@ -+# The MIT License -+# -+# Copyright (c) 2021 Sebastian Ramacher -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to deal -+# in the Software without restriction, including without limitation the rights -+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+# copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+# THE SOFTWARE. -+ -+try: -+ # introduced in Python 3.8 -+ from typing import Literal -+except ImportError: -+ from typing_extensions import Literal # type: ignore -+ -+try: -+ # introduced in Python 3.8 -+ from typing import Protocol -+except ImportError: -+ from typing_extensions import Protocol # type: ignore ---- a/bpython/curtsies.py -+++ b/bpython/curtsies.py -@@ -33,7 +33,7 @@ from typing import ( - Optional, - Generator, - ) --from typing_extensions import Literal, Protocol -+from ._typing_compat import Protocol - - logger = logging.getLogger(__name__) - ---- a/bpython/curtsiesfrontend/_internal.py -+++ b/bpython/curtsiesfrontend/_internal.py -@@ -23,7 +23,7 @@ - import pydoc - from types import TracebackType - from typing import Optional, Type --from typing_extensions import Literal -+from .._typing_compat import Literal - - from .. import _internal - ---- a/bpython/curtsiesfrontend/repl.py -+++ b/bpython/curtsiesfrontend/repl.py -@@ -14,7 +14,7 @@ import unicodedata - from enum import Enum - from types import TracebackType - from typing import Dict, Any, List, Optional, Tuple, Union, cast, Type --from typing_extensions import Literal -+from .._typing_compat import Literal - - import blessings - import greenlet ---- a/bpython/filelock.py -+++ b/bpython/filelock.py -@@ -21,7 +21,7 @@ - # THE SOFTWARE. - - from typing import Optional, Type, IO --from typing_extensions import Literal -+from ._typing_compat import Literal - from types import TracebackType - - has_fcntl = True ---- a/bpython/inspection.py -+++ b/bpython/inspection.py -@@ -28,7 +28,7 @@ import re - from collections import namedtuple - from typing import Any, Optional, Type - from types import MemberDescriptorType, TracebackType --from typing_extensions import Literal -+from ._typing_compat import Literal - - from pygments.token import Token - from pygments.lexers import Python3Lexer ---- a/bpython/repl.py -+++ b/bpython/repl.py -@@ -38,7 +38,7 @@ from itertools import takewhile - from pathlib import Path - from types import ModuleType, TracebackType - from typing import cast, Tuple, Any, Optional, Type --from typing_extensions import Literal -+from ._typing_compat import Literal - - from pygments.lexers import Python3Lexer - from pygments.token import Token ---- a/setup.cfg -+++ b/setup.cfg -@@ -28,7 +28,7 @@ install_requires = - pygments - pyxdg - requests -- typing-extensions -+ typing-extensions; python_version < "3.8" - - [options.extras_require] - clipboard = pyperclip