Remove support for Python 3.7 (fixes bpython#940)

sebastinas · sebastinas · commit 46dc081faa21 · 2023-01-15T18:03:25.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,17 +10,16 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.python-version == 'pypy-3.7' }}
+    continue-on-error: ${{ matrix.python-version == 'pypy-3.8' }}
     strategy:
       fail-fast: false
       matrix:
         python-version:
-        - "3.7"
         - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
-        - "pypy-3.7"
+        - "pypy-3.8"
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/bpython/_typing_compat.py b/bpython/_typing_compat.py
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -69,12 +69,12 @@
     Collection,
     Dict,
     TYPE_CHECKING,
+    Literal,
 )
 
 if TYPE_CHECKING:
     from _curses import _CursesWindow
 
-from ._typing_compat import Literal
 import unicodedata
 from dataclasses import dataclass
 
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -28,11 +28,11 @@
     Generator,
     List,
     Optional,
+    Protocol,
     Sequence,
     Tuple,
     Union,
 )
-from ._typing_compat import Protocol
 
 logger = logging.getLogger(__name__)
 
diff --git a/bpython/curtsiesfrontend/_internal.py b/bpython/curtsiesfrontend/_internal.py
@@ -22,8 +22,7 @@
 
 import pydoc
 from types import TracebackType
-from typing import Optional, Type
-from .._typing_compat import Literal
+from typing import Optional, Type, Literal
 
 from .. import _internal
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -17,13 +17,13 @@
     Iterable,
     Dict,
     List,
+    Literal,
     Optional,
     Sequence,
     Tuple,
     Type,
     Union,
 )
-from .._typing_compat import Literal
 
 import greenlet
 from curtsies import (
diff --git a/bpython/filelock.py b/bpython/filelock.py
@@ -20,8 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from typing import Optional, Type, IO
-from ._typing_compat import Literal
+from typing import Optional, Type, IO, Literal
 from types import TracebackType
 
 has_fcntl = True
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -26,9 +26,17 @@
 import pydoc
 import re
 from dataclasses import dataclass
-from typing import Any, Callable, Optional, Type, Dict, List, ContextManager
+from typing import (
+    Any,
+    Callable,
+    Optional,
+    Type,
+    Dict,
+    List,
+    ContextManager,
+    Literal,
+)
 from types import MemberDescriptorType, TracebackType
-from ._typing_compat import Literal
 
 from pygments.token import Token
 from pygments.lexers import Python3Lexer
diff --git a/bpython/paste.py b/bpython/paste.py
@@ -22,15 +22,14 @@
 
 import errno
 import subprocess
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Protocol
 from urllib.parse import urljoin, urlparse
 
 import requests
 import unicodedata
 
 from .config import getpreferredencoding
 from .translations import _
-from ._typing_compat import Protocol
 
 
 class PasteFailed(Exception):
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -40,19 +40,19 @@
 from pathlib import Path
 from types import ModuleType, TracebackType
 from typing import (
+    Any,
+    Callable,
+    Dict,
     Iterable,
-    cast,
     List,
-    Tuple,
-    Any,
+    Literal,
     Optional,
+    TYPE_CHECKING,
+    Tuple,
     Type,
     Union,
-    Callable,
-    Dict,
-    TYPE_CHECKING,
+    cast,
 )
-from ._typing_compat import Literal
 
 from pygments.lexers import Python3Lexer
 from pygments.token import Token, _TokenType
diff --git a/doc/sphinx/source/contributing.rst b/doc/sphinx/source/contributing.rst
@@ -17,7 +17,7 @@ the time of day.
 Getting your development environment set up
 -------------------------------------------
 
-bpython supports Python 3.7 and newer. The code is compatible with all
+bpython supports Python 3.8 and newer. The code is compatible with all
 supported versions.
 
 Using a virtual environment is probably a good idea. Create a virtual
diff --git a/doc/sphinx/source/releases.rst b/doc/sphinx/source/releases.rst
@@ -45,7 +45,7 @@ A checklist to perform some manual tests before a release:
 
 Check that all of the following work before a release:
 
-* Runs under Python 3.7 - 3.9
+* Runs under Python 3.8 - 3.11
 * Save
 * Rewind
 * Pastebin
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 80
-target_version = ["py37"]
+target_version = ["py38"]
 include = '\.pyi?$'
 exclude = '''
 /(
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,4 @@
 Pygments
-backports.cached-property; python_version < "3.8"
 curtsies >=0.4.0
 cwcwidth
 greenlet
diff --git a/setup.cfg b/setup.cfg
@@ -13,7 +13,7 @@ classifiers =
     Programming Language :: Python :: 3
 
 [options]
-python_requires = >=3.7
+python_requires = >=3.8
 packages =
     bpython
     bpython.curtsiesfrontend
@@ -22,14 +22,12 @@ packages =
     bpython.translations
     bpdb
 install_requires =
-    backports.cached-property; python_version < "3.8"
     curtsies >=0.4.0
     cwcwidth
     greenlet
     pygments
     pyxdg
     requests
-    typing-extensions; python_version < "3.8"
 
 [options.extras_require]
 clipboard = pyperclip

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`Pygments`
`2`		`-backports.cached-property; python_version < "3.8"`
`3`	`2`	`curtsies >=0.4.0`
`4`	`3`	`cwcwidth`
`5`	`4`	`greenlet`