diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcceac91da..26a55e2d08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,6 @@ jobs: sudo apt-get -y install libx11-dev libxtst-dev libxcomposite-dev libxdamage-dev libxres-dev \ libxkbfile-dev python-all-dev pandoc libsystemd-dev \ libgtk-3-dev python3-dev python3-cairo-dev python-gi-dev cython3 \ - python3-typing-extensions \ xauth x11-xkb-utils \ xvfb python3-cairo python3-gi-cairo \ libturbojpeg-dev libwebp-dev python3-pil \ diff --git a/packaging/debian/xpra/control b/packaging/debian/xpra/control index ec1f33e6ee..7a0a83dfb0 100644 --- a/packaging/debian/xpra/control +++ b/packaging/debian/xpra/control @@ -96,7 +96,6 @@ Architecture: any Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} ,python3-gi ,gir1.2-glib-2.0 - ,python3-typing-extensions Recommends: ,${x11:Depends} # generate QR codes for authentication and connection URLs: diff --git a/packaging/rpm/xpra.spec b/packaging/rpm/xpra.spec index 8c618b6656..817a1adb27 100644 --- a/packaging/rpm/xpra.spec +++ b/packaging/rpm/xpra.spec @@ -102,7 +102,6 @@ BuildRequires: pandoc BuildRequires: which Requires: python3 Requires: python3-gobject -Requires: python3-typing-extensions Recommends: python3-pillow Recommends: python3-cryptography Recommends: python3-inotify diff --git a/xpra/client/gl/gl_drivers.py b/xpra/client/gl/gl_drivers.py index 30dbb0025f..8b072e9f3c 100755 --- a/xpra/client/gl/gl_drivers.py +++ b/xpra/client/gl/gl_drivers.py @@ -5,8 +5,7 @@ # Xpra is released under the terms of the GNU GPL v2, or, at your option, any # later version. See the file COPYING for details. -from typing import Dict, Tuple -from typing_extensions import TypeAlias +from typing import Dict, Tuple, TypeAlias #These chipsets will use OpenGL, #there will not be any warnings, even if the vendor is greylisted: diff --git a/xpra/net/common.py b/xpra/net/common.py index b83419cbcd..bef6be18fa 100644 --- a/xpra/net/common.py +++ b/xpra/net/common.py @@ -5,8 +5,7 @@ import os import threading -from typing import Tuple, Callable, List, Dict, Any, ByteString, Union -from typing_extensions import TypeAlias +from typing import Tuple, Callable, List, Dict, Any, ByteString, Union, TypeAlias from xpra.net.compression import Compressed, Compressible, LargeStructure from xpra.util import repr_ellipsized, envint, envbool diff --git a/xpra/notifications/common.py b/xpra/notifications/common.py index 4cd956e2b3..f63aa53bcd 100755 --- a/xpra/notifications/common.py +++ b/xpra/notifications/common.py @@ -5,8 +5,7 @@ import os.path from io import BytesIO -from typing import Tuple, Optional -from typing_extensions import TypeAlias +from typing import Tuple, Optional, TypeAlias from xpra.util import first_time from xpra.os_util import load_binary_file diff --git a/xpra/server/source/client_connection.py b/xpra/server/source/client_connection.py index b8a6f730eb..60132a1c56 100644 --- a/xpra/server/source/client_connection.py +++ b/xpra/server/source/client_connection.py @@ -7,8 +7,7 @@ # later version. See the file COPYING for details. import sys -from typing import Dict, Any, Optional, Tuple, Callable, Union, List -from typing_extensions import TypeAlias +from typing import Dict, Any, Optional, Tuple, Callable, Union, List, TypeAlias from time import sleep, monotonic from threading import Event from collections import deque