From 7e114415c6f5c7ffb685abeb4efd4cd0dcb9e73c Mon Sep 17 00:00:00 2001 From: Daniel Pizetta Date: Thu, 1 Apr 2021 12:16:08 -0300 Subject: [PATCH 1/3] Merge with master --- qdarkstyle/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdarkstyle/__init__.py b/qdarkstyle/__init__.py index e85a7b5d..4a66a74f 100644 --- a/qdarkstyle/__init__.py +++ b/qdarkstyle/__init__.py @@ -70,7 +70,7 @@ from qdarkstyle.light.palette import LightPalette from qdarkstyle.palette import Palette -__version__ = "3.0.1" +__version__ = "3.0.dev" _logger = logging.getLogger(__name__) From dc624f4fc37eda6ab6a9c7b4978f3096e7b9608b Mon Sep 17 00:00:00 2001 From: Daniel Pizetta Date: Thu, 1 Apr 2021 12:25:37 -0300 Subject: [PATCH 2/3] Fix docs links and compatibility with pypi --- README.rst | 5 +++-- qdarkstyle/__init__.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 819f10e3..85723b10 100644 --- a/README.rst +++ b/README.rst @@ -4,8 +4,9 @@ QDarkStyleSheet |Build Status| |Docs Status| |Latest PyPI version| |License: MIT| |License: CC BY 4.0| |Conduct| -The most complete dark/light style sheet for Qt applications (Qt4[*]_, Qt5, -PySide[*]_, PySide2, PyQt4[*]_, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python 2[*]_/3 and C++. +The most complete dark/light style sheet for Qt applications (Qt4 [*]_, Qt5, +PySide [*]_, PySide2, PyQt4 [*]_, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python +2 [*]_ /3 and C++. `Check the documentation `__ diff --git a/qdarkstyle/__init__.py b/qdarkstyle/__init__.py index 4a66a74f..e6482318 100644 --- a/qdarkstyle/__init__.py +++ b/qdarkstyle/__init__.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -"""The most complete dark/light style sheet for Qt applications (Qt4[*]_, Qt5, -PySide[*]_, PySide2, PyQt4[*]_, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python 2[*]_/3 and C++. +"""The most complete dark/light style sheet for Qt applications (Qt4, Qt5, +PySide, PySide2, PyQt4, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python 2/3 and C++. -.. [*] Python 2, as well as Qt4 (PyQt4 and PySide), will not be supported anymore. +Python 2, as well as Qt4 (PyQt4 and PySide), will not be supported anymore. They still there as it is, but no back-compatibility, fixes, nor features will be implemented. From ea408544f502b4c0e97f4cf1dda171ed53cead9b Mon Sep 17 00:00:00 2001 From: Daniel Pizetta Date: Thu, 1 Apr 2021 12:30:21 -0300 Subject: [PATCH 3/3] Simplify reference to avoid problems with rendering rst --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 85723b10..d9759202 100644 --- a/README.rst +++ b/README.rst @@ -4,11 +4,11 @@ QDarkStyleSheet |Build Status| |Docs Status| |Latest PyPI version| |License: MIT| |License: CC BY 4.0| |Conduct| -The most complete dark/light style sheet for Qt applications (Qt4 [*]_, Qt5, -PySide [*]_, PySide2, PyQt4 [*]_, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python -2 [*]_ /3 and C++. +The most complete dark/light style sheet for Qt applications (Qt4*, Qt5, +PySide*, PySide2, PyQt4*, PyQt5, QtPy, PyQtGraph, Qt.Py) for Python +2*/3 and C++. -`Check the documentation `__ +`Check out the complete documentation. `__ What is new? @@ -32,7 +32,7 @@ The current stable version is using Python 3 (preferable 3.6+) and Qt5 We still preparing the portability to Qt6 since we need changes in `QtPy `__ dependency project. -.. [*] Python 2, as well as Qt4 (PyQt4 and PySide), will not be supported anymore. +[*] Python 2, as well as Qt4 (PyQt4 and PySide), will not be supported anymore. They still there as it is, but no back-compatibility, fixes, nor features will be implemented.