[Python-modules-commits] [python-qtpy] 01/04: Imported Upstream version 1.0.1
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Apr 11 20:12:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository python-qtpy.
commit b2272b14b7ab4a53d8488dbd926dd1edf6a864c4
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Apr 11 20:28:14 2016 +0100
Imported Upstream version 1.0.1
---
CHANGELOG.md | 21 +++++++++++++++++++--
README.md | 2 +-
RELEASE.md | 4 ++++
conda.recipe/meta.yaml | 2 +-
qtpy/QtGui.py | 5 +++--
qtpy/QtWidgets.py | 4 ++--
qtpy/_version.py | 2 +-
setup.py | 9 ++++-----
8 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 139fac6..edee103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# History of changes
-## Version 1.0
+## Version 1.0.1 (10/04/16)
-First stable release
+* Import QIntValidator in QtGui and remove it from QtWidgets (PR #19)
+
+## Version 1.0 (22/03/16)
+
+* Add QtWebEngineWidgets module for Qt 5.6. This module replaces the previous
+ QtWebKit one.
+
+* Import the right objects in QtGui, QtWidgets and QtCore
+
+* Add a QtPrintSupport module
+
+## Version 0.1.3 (30/12/15)
+
+* Add tests and continuous integration
+
+## Version 0.1.2 (1/03/15)
+
+* First release
diff --git a/README.md b/README.md
index ddb6126..40c37f1 100644
--- a/README.md
+++ b/README.md
@@ -40,5 +40,5 @@ pip install qtpy
or
```bash
-conda install -c spyder-ide qtpy
+conda install qtpy
```
diff --git a/RELEASE.md b/RELEASE.md
index a9b261f..196cb21 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,5 +1,9 @@
To release a new version of qtpy on PyPI:
+* Update CHANGELOG.md
+
+* git pull
+
* Update `_version.py` (set release version, remove 'dev0')
* git add and git commit
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 4fa640a..9974698 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
package:
name: qtpy
- version: {{ environ.get('GIT_DESCRIBE_TAG') }}
+ version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('v', '') }}
source:
git_url: ../
diff --git a/qtpy/QtGui.py b/qtpy/QtGui.py
index 2b2d3d9..213901d 100644
--- a/qtpy/QtGui.py
+++ b/qtpy/QtGui.py
@@ -64,7 +64,7 @@ elif os.environ[QT_API] in PYQT4_API:
QWhatsThisClickedEvent, QWheelEvent,
QWindowStateChangeEvent, qAlpha, qBlue,
qFuzzyCompare, qGray, qGreen, qIsGray, qRed, qRgb,
- qRgba)
+ qRgba, QIntValidator)
elif os.environ[QT_API] in PYSIDE_API:
from PySide.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
QBrush, QClipboard, QCloseEvent, QColor,
@@ -103,6 +103,7 @@ elif os.environ[QT_API] in PYSIDE_API:
QValidator, QVector2D, QVector3D, QVector4D,
QWhatsThisClickedEvent, QWheelEvent,
QWindowStateChangeEvent, qAlpha, qBlue,
- qGray, qGreen, qIsGray, qRed, qRgb, qRgba)
+ qGray, qGreen, qIsGray, qRed, qRgb, qRgba,
+ QIntValidator)
else:
raise PythonQtError('No Qt bindings could be found')
diff --git a/qtpy/QtWidgets.py b/qtpy/QtWidgets.py
index 6693793..b375969 100644
--- a/qtpy/QtWidgets.py
+++ b/qtpy/QtWidgets.py
@@ -56,7 +56,7 @@ elif os.environ[QT_API] in PYQT4_API:
QTextTableCellFormat, QTextTableFormat, QTouchEvent, QTransform,
QValidator, QVector2D, QVector3D, QVector4D, QWhatsThisClickedEvent,
QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue, qFuzzyCompare,
- qGray, qGreen, qIsGray, qRed, qRgb, qRgba)
+ qGray, qGreen, qIsGray, qRed, qRgb, qRgba, QIntValidator)
# These objects belong to QtPrintSupport
del (QAbstractPrintDialog, QPageSetupDialog, QPrintDialog, QPrintEngine,
@@ -96,7 +96,7 @@ elif os.environ[QT_API] in PYSIDE_API:
QTextTableCellFormat, QTextTableFormat, QTouchEvent, QTransform,
QValidator, QVector2D, QVector3D, QVector4D, QWhatsThisClickedEvent,
QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue, qGray, qGreen,
- qIsGray, qRed, qRgb, qRgba)
+ qIsGray, qRed, qRgb, qRgba, QIntValidator)
# These objects belong to QtPrintSupport
del (QAbstractPrintDialog, QPageSetupDialog, QPrintDialog, QPrintEngine,
diff --git a/qtpy/_version.py b/qtpy/_version.py
index dcbb50e..1e53025 100644
--- a/qtpy/_version.py
+++ b/qtpy/_version.py
@@ -1,2 +1,2 @@
-version_info = (1, 0)
+version_info = (1, 0, 1)
__version__ = '.'.join(map(str, version_info))
diff --git a/setup.py b/setup.py
index 6e146a7..fd89fe0 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ LONG_DESCRIPTION = """
:target: https://pypi.python.org/pypi/QtPy/
:alt: Latest PyPI version
-.. image:: https://img.shields.io/pypi/dm/QtAwesome.svg
+.. image:: https://img.shields.io/pypi/dm/QtPy.svg
:target: https://pypi.python.org/pypi/QtPy/
:alt: Number of PyPI downloads
@@ -53,9 +53,8 @@ to a particular project, or namespace.
.. _spyder: https://github.com/spyder-ide/spyder
.. _spyderlib.qt: https://github.com/spyder-ide/spyder/tree/master/spyderlib/qt
.. _pyqode.qt: https://github.com/pyQode/pyqode.qt
-.. _Changelog: https://github.com/goanpeca/QtPy/blob/master/CHANGELOG.rst
-.. _Contributing: https://github.com/goanpeca/QtPy/blob/master/CONTRIBUTING.rst
-.. _Issue tracker: https://github.com/goanpeca/QtPy/issues
+.. _Changelog: https://github.com/spyder-ide/qtpy/blob/master/CHANGELOG.md
+.. _Issue tracker: https://github.com/spyder-ide/qtpy/issues
"""
setup(
@@ -63,7 +62,7 @@ setup(
version=version_ns['__version__'],
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
keywords=["qt PyQt4 PyQt5 PySide Widget QWidget"],
- url='https://github.com/goanpeca/QtPy',
+ url='https://github.com/spyder-ide/qtpy',
license='MIT',
author='Colin Duquesnoy, The Spyder Development Team',
author_email='goanpeca at gmail.com',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qtpy.git
More information about the Python-modules-commits
mailing list