From 1bc8c8ce262d80bbea0141f48055342adca9e3f9 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Tue, 27 Oct 2020 20:41:12 +0100 Subject: pyside/doc: remove python 2 references Change-Id: Ife968831c695f1982f9d0ed1157f9128331a700e Reviewed-by: Christian Tismer Reviewed-by: Friedemann Kleint --- sources/pyside2/doc/deployment-pyinstaller.rst | 13 ------------- sources/pyside2/doc/gettingstarted-linux.rst | 2 +- sources/pyside2/doc/gettingstarted-macOS.rst | 2 +- sources/pyside2/doc/gettingstarted-windows.rst | 9 +-------- sources/pyside2/doc/gettingstarted.rst | 2 +- sources/pyside2/doc/quickstart.rst | 2 +- sources/pyside2/doc/tutorials/portingguide/index.rst | 8 +++----- 7 files changed, 8 insertions(+), 30 deletions(-) (limited to 'sources/pyside2/doc') diff --git a/sources/pyside2/doc/deployment-pyinstaller.rst b/sources/pyside2/doc/deployment-pyinstaller.rst index d58ec2d7d..3bc8c6996 100644 --- a/sources/pyside2/doc/deployment-pyinstaller.rst +++ b/sources/pyside2/doc/deployment-pyinstaller.rst @@ -126,19 +126,6 @@ If you're working with different versions, this can result in frustrating debugg when you think you are testing the latest version, but `PyInstaller` is working with an older version. -Issue with numpy in Python 2.7.16 ---------------------------------- - -A recent issue with PyInstaller is the appearance of Python 2.7.16. This Python version creates -an issue that is known from Python 3 as a `Tcl/Tk` problem. This rarely shows up in Python 3 -because `Tcl/Tk` is seldom used with `PyInstaller`. - -On Python 2.7.16, this problem is common, as many developers use numpy. For some reason, -installing `numpy` creates a dependency to `Tcl/Tk`, which can be circumvented only by explicitly -excluding `Tcl/Tk` by adding this line to spec-file's analysis section:: - - excludes=['FixTk', 'tcl', 'tk', '_tkinter', 'tkinter', 'Tkinter'], - Safety Instructions ------------------- diff --git a/sources/pyside2/doc/gettingstarted-linux.rst b/sources/pyside2/doc/gettingstarted-linux.rst index 0474d457f..b2f5dc77b 100644 --- a/sources/pyside2/doc/gettingstarted-linux.rst +++ b/sources/pyside2/doc/gettingstarted-linux.rst @@ -5,7 +5,7 @@ Requirements ------------ * Qt package from `here`_ or a custom build of Qt 5.12+ (preferably 5.15) - * A Python interpreter (version Python 3.5+ or Python 2.7). + * A Python interpreter (version Python 3.6+). You can either use the one provided by your OS, or get it from the `official website`_. * GCC diff --git a/sources/pyside2/doc/gettingstarted-macOS.rst b/sources/pyside2/doc/gettingstarted-macOS.rst index fd1bf89f8..1d421a7a6 100644 --- a/sources/pyside2/doc/gettingstarted-macOS.rst +++ b/sources/pyside2/doc/gettingstarted-macOS.rst @@ -5,7 +5,7 @@ Requirements ------------ * Qt package from `here`_ or a custom build of Qt 5.12+ (preferably 5.15) - * A Python interpreter (version Python 3.5+ or Python 2.7). + * A Python interpreter (version Python 3.6+). You can use the one provided by HomeBrew, or you can get python from the `official website`_. * `XCode`_ 8.2 (macOS 10.11), 8.3.3 (macOS 10.12), 9 (macOS 10.13), 10.1 (macOS 10.14) diff --git a/sources/pyside2/doc/gettingstarted-windows.rst b/sources/pyside2/doc/gettingstarted-windows.rst index 069358e0f..df24a3f90 100644 --- a/sources/pyside2/doc/gettingstarted-windows.rst +++ b/sources/pyside2/doc/gettingstarted-windows.rst @@ -8,7 +8,7 @@ Requirements ------------ * Qt package from `here`_ or a custom build of Qt 5.12+ (preferably Qt 5.15) - * A Python interpreter (version Python 3.5+). Preferably get it from the `official website`_. + * A Python interpreter (version Python 3.6+). Preferably get it from the `official website`_. * `MSVC2017`_ (or MSVC2019) for Python 3 on Windows, * `CMake`_ version 3.1 or greater * `Git`_ version 2 or greater @@ -18,13 +18,6 @@ Requirements * ``venv`` or ``virtualenv`` is strongly recommended, but optional. * ``sphinx`` package for the documentation (optional). -.. note:: Python 2.7 interpreter is not supported. - The official Python 2.7 binary package offerred on the - `official website`_ is built using MSVC 2007, while - the Qt libraries are built using MSVC 2015/2017. - If you intend to use Python 2.7, build the interpreter yourself - with MSVC 2015 or later, and build Qt for Python with it. - .. note:: Python 3.8.0 was missing some API required for PySide/Shiboken so it's not possible to use it for a Windows build. diff --git a/sources/pyside2/doc/gettingstarted.rst b/sources/pyside2/doc/gettingstarted.rst index 44320b25f..cbf0056e9 100644 --- a/sources/pyside2/doc/gettingstarted.rst +++ b/sources/pyside2/doc/gettingstarted.rst @@ -14,7 +14,7 @@ check the :ref:`FAQ ` related to the project. General Requirements -------------------- - * **Python**: 3.5+ and 2.7 + * **Python**: 3.6+ * **Qt:** 5.12+ is recommended * **libclang:** The libclang library, recommended: version 10 for PySide2 5.15. Prebuilt versions of it can be `downloaded here`_. diff --git a/sources/pyside2/doc/quickstart.rst b/sources/pyside2/doc/quickstart.rst index 87471a8a8..fc6b9810a 100644 --- a/sources/pyside2/doc/quickstart.rst +++ b/sources/pyside2/doc/quickstart.rst @@ -6,7 +6,7 @@ Requirements Before you can install |project|, first you must install the following software: - * Python 2.7 or 3.5+ (we recommend 3.5+), + * Python 3.6+, * We recommend using a virtual environment, such as `venv `_ or `virtualenv `_ diff --git a/sources/pyside2/doc/tutorials/portingguide/index.rst b/sources/pyside2/doc/tutorials/portingguide/index.rst index aabf4b19f..3f2a36f32 100644 --- a/sources/pyside2/doc/tutorials/portingguide/index.rst +++ b/sources/pyside2/doc/tutorials/portingguide/index.rst @@ -144,11 +144,9 @@ Here are a few important ones that you must be aware of: functions. * **QByteArray**: A QByteArray is treated as a list of - bytes without encoding. The equivalent type in Python - varies; Python 2 uses "str" type, whereas Python 3 uses - "bytes". To avoid confusion, a QString is represented as - an encoded human readable string, which means it is - a "unicode" object in Python 2, and a "str" in Python 3. + bytes without encoding. Python 3 uses + "bytes". QString is represented as an encoded human readable string, + which means it is a "str". Here is the improved version of the Hello World example, demonstrating some of these differences: -- cgit v1.2.3