Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-qtconsole for
openSUSE:Factory checked in at 2023-03-21 17:40:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qtconsole (Old)
and /work/SRC/openSUSE:Factory/.python-qtconsole.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtconsole"
Tue Mar 21 17:40:20 2023 rev:27 rq:1072944 version:5.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qtconsole/python-qtconsole.changes
2022-11-06 12:43:30.201847951 +0100
+++
/work/SRC/openSUSE:Factory/.python-qtconsole.new.31432/python-qtconsole.changes
2023-03-21 17:40:21.673495418 +0100
@@ -1,0 +2,7 @@
+Sun Mar 19 15:57:44 UTC 2023 - Ben Greiner <[email protected]>
+
+- Update to 5.4.1
+ * Fix crash at startup with PySide6.
+ * Cast images width and height to int when trying to insert them.
+
+-------------------------------------------------------------------
Old:
----
qtconsole-5.4.0.tar.gz
New:
----
qtconsole-5.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qtconsole.spec ++++++
--- /var/tmp/diff_new_pack.faUyBp/_old 2023-03-21 17:40:22.261498231 +0100
+++ /var/tmp/diff_new_pack.faUyBp/_new 2023-03-21 17:40:22.265498250 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-qtconsole
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,13 @@
#
-%{?!python_module:%define python_module() python3-%{**}}
-%define skip_python2 1
%if 0%{?suse_version} > 1500
%bcond_without libalternatives
%else
%bcond_with libalternatives
%endif
Name: python-qtconsole
-Version: 5.4.0
+Version: 5.4.1
Release: 0
Summary: Jupyter Qt console
License: BSD-3-Clause
@@ -33,7 +31,9 @@
Source0:
https://files.pythonhosted.org/packages/source/q/qtconsole/qtconsole-%{version}.tar.gz
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module jupyter-core}
+BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module wheel}
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: gdb
@@ -49,6 +49,7 @@
Requires: python-ipython_genutils
Requires: python-jupyter-client >= 4.1
Requires: python-jupyter-core
+Requires: python-packaging
Requires: python-pyzmq >= 17.1
Requires: python-traitlets
Conflicts: python-traitlets = 5.2.1
@@ -74,6 +75,7 @@
BuildRequires: %{python_module ipykernel >= 4.1}
BuildRequires: %{python_module ipython_genutils}
BuildRequires: %{python_module jupyter-client >= 4.1}
+BuildRequires: %{python_module packaging}
BuildRequires: %{python_module pytest-qt}
BuildRequires: %{python_module pytest-xvfb}
BuildRequires: %{python_module pytest}
@@ -91,11 +93,11 @@
%setup -q -n qtconsole-%{version}
%build
-%python_build
+%pyproject_wheel
%install
export LANG=en_US.UTF-8
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%python_clone -a %{buildroot}%{_bindir}/jupyter-qtconsole
++++++ qtconsole-5.4.0.tar.gz -> qtconsole-5.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.coveragerc
new/qtconsole-5.4.1/.coveragerc
--- old/qtconsole-5.4.0/.coveragerc 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.coveragerc 2020-10-24 17:40:21.000000000 +0200
@@ -0,0 +1,4 @@
+[run]
+omit =
+ # Omit tests
+ */tests/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.github/workflows/linux-tests.yml
new/qtconsole-5.4.1/.github/workflows/linux-tests.yml
--- old/qtconsole-5.4.0/.github/workflows/linux-tests.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.github/workflows/linux-tests.yml 2023-03-07
01:10:49.000000000 +0100
@@ -0,0 +1,82 @@
+name: Linux tests
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+ workflow_dispatch:
+
+concurrency:
+ group: linux-tests-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ linux:
+ name: Linux Py${{ matrix.PYTHON_VERSION }} - ${{ matrix.INSTALL_TYPE }} -
${{ matrix.QT_LIB }}
+ runs-on: ubuntu-latest
+ env:
+ CI: True
+ QTCONSOLE_TESTING: True
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ RUNNER_OS: 'ubuntu'
+ COVERALLS_REPO_TOKEN: XWVhJf2AsO7iouBLuCsh0pPhwHy81Uz1v
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.7', '3.8', '3.9', '3.10']
+ INSTALL_TYPE: ['conda', 'pip']
+ QT_LIB: ['pyqt5', 'pyqt6']
+ exclude:
+ - INSTALL_TYPE: 'conda'
+ QT_LIB: 'pyqt6'
+ timeout-minutes: 15
+ steps:
+ - name: Checkout branch
+ uses: actions/checkout@v3
+ - name: Install System Packages
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y --no-install-recommends '^libxcb.*-dev'
libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev
libxkbcommon-x11-dev libegl1
+ - name: Install Conda
+ uses: conda-incubator/setup-miniconda@v2
+ with:
+ activate-environment: test
+ auto-update-conda: false
+ auto-activate-base: false
+ channels: conda-forge
+ channel-priority: strict
+ miniforge-variant: Mambaforge
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ - name: Install dependencies with conda
+ if: matrix.INSTALL_TYPE == 'conda'
+ shell: bash -l {0}
+ run: mamba env update --file requirements/environment.yml
+ - name: Install dependencies with pip
+ if: matrix.INSTALL_TYPE == 'pip'
+ shell: bash -l {0}
+ run: |
+ pip install -e .[test]
+ if [ ${{ matrix.QT_LIB }} = "pyqt6" ]; then
+ pip install pyqt6!=6.4.0 pyqt6-qt6!=6.4.0 coveralls pytest-cov
+ else
+ pip install ${{ matrix.QT_LIB }} coveralls pytest-cov
+ fi
+ - name: Show environment information
+ shell: bash -l {0}
+ run: |
+ conda info
+ conda list
+ pip list
+ - name: Run tests
+ shell: bash -l {0}
+ run: xvfb-run --auto-servernum pytest -vv -s --full-trace --color=yes
--cov=qtconsole qtconsole
+ env:
+ QT_API: ${{ matrix.QT_LIB }}
+ PYTEST_QT_API: ${{ matrix.QT_LIB }}
+ - name: Upload coverage to Codecov
+ if: matrix.PYTHON_VERSION == '3.8'
+ shell: bash -l {0}
+ run: coveralls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.github/workflows/macos-tests.yml
new/qtconsole-5.4.1/.github/workflows/macos-tests.yml
--- old/qtconsole-5.4.0/.github/workflows/macos-tests.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.github/workflows/macos-tests.yml 2023-03-07
01:10:49.000000000 +0100
@@ -0,0 +1,52 @@
+name: Macos tests
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+concurrency:
+ group: macos-tests-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ macos:
+ name: Mac Py${{ matrix.PYTHON_VERSION }}
+ runs-on: macos-latest
+ env:
+ CI: True
+ QTCONSOLE_TESTING: True
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ RUNNER_OS: 'macos'
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.7', '3.8', '3.9', '3.10']
+ timeout-minutes: 15
+ steps:
+ - name: Checkout branch
+ uses: actions/checkout@v3
+ - name: Install Conda
+ uses: conda-incubator/setup-miniconda@v2
+ with:
+ activate-environment: test
+ auto-update-conda: false
+ auto-activate-base: false
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ miniforge-variant: Mambaforge
+ channels: conda-forge
+ channel-priority: strict
+ - name: Install package dependencies
+ shell: bash -l {0}
+ run: mamba env update --file requirements/environment.yml
+ - name: Show environment information
+ shell: bash -l {0}
+ run: |
+ conda info
+ conda list
+ - name: Run tests
+ shell: bash -l {0}
+ run: pytest -vv --color=yes --cov=qtconsole qtconsole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.github/workflows/windows-tests.yml
new/qtconsole-5.4.1/.github/workflows/windows-tests.yml
--- old/qtconsole-5.4.0/.github/workflows/windows-tests.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.github/workflows/windows-tests.yml 2023-03-07
01:10:49.000000000 +0100
@@ -0,0 +1,52 @@
+name: Windows tests
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+concurrency:
+ group: windows-tests-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ windows:
+ name: Windows Py${{ matrix.PYTHON_VERSION }}
+ runs-on: windows-latest
+ env:
+ CI: True
+ QTCONSOLE_TESTING: True
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ RUNNER_OS: 'windows'
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.7', '3.8', '3.9', '3.10']
+ timeout-minutes: 15
+ steps:
+ - name: Checkout branch
+ uses: actions/checkout@v3
+ - name: Install Conda
+ uses: conda-incubator/setup-miniconda@v2
+ with:
+ activate-environment: test
+ auto-update-conda: false
+ auto-activate-base: false
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ miniforge-variant: Mambaforge
+ channels: conda-forge
+ channel-priority: strict
+ - name: Install package dependencies
+ shell: bash -l {0}
+ run: mamba env update --file requirements/environment.yml
+ - name: Show environment information
+ shell: bash -l {0}
+ run: |
+ conda info
+ conda list
+ - name: Run tests
+ shell: bash -l {0}
+ run: pytest -vv --color=yes --cov=qtconsole qtconsole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.gitignore
new/qtconsole-5.4.1/.gitignore
--- old/qtconsole-5.4.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.gitignore 2020-10-24 17:40:21.000000000 +0200
@@ -0,0 +1,23 @@
+MANIFEST
+build
+dist
+_build
+docs/man/*.gz
+docs/source/api/generated
+docs/source/config_options.rst
+docs/source/interactive/magics-generated.txt
+docs/gh-pages
+jupyter_notebook/notebook/static/mathjax
+jupyter_notebook/static/style/*.map
+*.py[co]
+__pycache__
+*.egg-info
+*~
+*.bak
+.ipynb_checkpoints
+.tox
+.DS_Store
+\#*#
+.#*
+.coverage
+.pytest_cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/.mailmap new/qtconsole-5.4.1/.mailmap
--- old/qtconsole-5.4.0/.mailmap 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/.mailmap 2015-12-20 15:40:14.000000000 +0100
@@ -0,0 +1,149 @@
+A. J. Holyoake <[email protected]> ajholyoake <[email protected]>
+Aaron Culich <[email protected]> Aaron Culich <[email protected]>
+Aron Ahmadia <[email protected]> ahmadia <[email protected]>
+Benjamin Ragan-Kelley <[email protected]> <[email protected]>
+Benjamin Ragan-Kelley <[email protected]> Min RK
+Benjamin Ragan-Kelley <[email protected]> MinRK <[email protected]>
+Barry Wark <[email protected]> Barry Wark <barrywarkatgmaildotcom>
+Ben Edwards <[email protected]> Ben Edwards <bedwards@sausage.(none)>
+Bradley M. Froehle <[email protected]> Bradley M. Froehle
<[email protected]>
+Bradley M. Froehle <[email protected]> Bradley Froehle
<[email protected]>
+Brandon Parsons <[email protected]> Brandon Parsons
<[email protected]>
+Brian E. Granger <[email protected]> Brian Granger
+Brian E. Granger <[email protected]> Brian Granger <>
+Brian E. Granger <[email protected]> bgranger <>
+Brian E. Granger <[email protected]> bgranger <bgranger@red>
+Christoph Gohlke <[email protected]> cgohlke <[email protected]>
+Cyrille Rossant <[email protected]> rossant <rossant@github>
+Damián Avila <[email protected]> damianavila
<[email protected]>
+Damián Avila <[email protected]> damianavila <[email protected]>
+Damon Allen <[email protected]> damontallen <[email protected]>
+Darren Dale <[email protected]> darren.dale <>
+Darren Dale <[email protected]> Darren Dale <>
+Dav Clark <[email protected]> Dav Clark <>
+Dav Clark <[email protected]> Dav Clark <[email protected]>
+David Hirschfeld <[email protected]> dhirschfeld
<[email protected]>
+David P. Sanders <[email protected]> David P. Sanders
<[email protected]>
+David Warde-Farley <[email protected]> David Warde-Farley <>
+Doug Blank <[email protected]> Doug Blank <[email protected]>
+Eugene Van den Bulke <[email protected]> Eugene Van den Bulke
<[email protected]>
+Evan Patterson <[email protected]>
<[email protected]>
+Evan Patterson <[email protected]> <[email protected]>
+Evan Patterson <[email protected]> <[email protected]>
+Evan Patterson <[email protected]> <[email protected]>
+Evan Patterson <[email protected]> epatters <[email protected]>
+Evan Patterson <[email protected]> epatters <[email protected]>
+Ernie French <[email protected]> Ernie French <[email protected]>
+Ernie French <[email protected]> ernie french <[email protected]>
+Ernie French <[email protected]> ernop <[email protected]>
+Fernando Perez <[email protected]> <[email protected]>
+Fernando Perez <[email protected]> Fernando Perez
<[email protected]>
+Fernando Perez <[email protected]> fperez <>
+Fernando Perez <[email protected]> fptest <>
+Fernando Perez <[email protected]> fptest1 <>
+Fernando Perez <[email protected]> Fernando Perez
<[email protected]>
+Fernando Perez <[email protected]> Fernando Perez <>
+Fernando Perez <[email protected]> Fernando Perez <fperez@maqroll>
+Frank Murphy <[email protected]> Frank Murphy <[email protected]>
+Gabriel Becker <[email protected]> gmbecker <[email protected]>
+Gael Varoquaux <[email protected]> gael.varoquaux <>
+Gael Varoquaux <[email protected]> gvaroquaux
<gvaroquaux@gvaroquaux-desktop>
+Gael Varoquaux <[email protected]> Gael Varoquaux <>
+Ingolf Becker <[email protected]> watercrossing
<[email protected]>
+Jake Vanderplas <[email protected]> Jake Vanderplas
<[email protected]>
+Jakob Gager <[email protected]> jakobgager <[email protected]>
+Jakob Gager <[email protected]> jakobgager <[email protected]>
+Jakob Gager <[email protected]> jakobgager <[email protected]>
+Jason Grout <[email protected]> <[email protected]>
+Jason Grout <[email protected]> <[email protected]>
+Jason Gors <[email protected]> jason gors <[email protected]>
+Jason Gors <[email protected]> jgors <[email protected]>
+Jens Hedegaard Nielsen <[email protected]> Jens Hedegaard Nielsen
<jhn@jhn-Znote.(none)>
+Jens Hedegaard Nielsen <[email protected]> Jens H Nielsen
<[email protected]>
+Jens Hedegaard Nielsen <[email protected]> Jens H. Nielsen
<[email protected]>
+Jez Ng <[email protected]> Jez Ng <[email protected]>
+Jonathan Frederic <[email protected]> Jonathan Frederic
<jonathan@LifebookMint.(none)>
+Jonathan Frederic <[email protected]> Jonathan Frederic
<[email protected]>
+Jonathan Frederic <[email protected]> Jonathan Frederic
<[email protected]>
+Jonathan Frederic <[email protected]> jon <[email protected]>
+Jonathan Frederic <[email protected]> U-Jon-PC\Jon <Jon@Jon-PC.(none)>
+Jonathan March <[email protected]> Jonathan March <[email protected]>
+Jonathan March <[email protected]> jdmarch <[email protected]>
+Jörgen Stenarson <[email protected]> Jörgen Stenarson
<[email protected]>
+Jörgen Stenarson <[email protected]> Jorgen Stenarson
<[email protected]>
+Jörgen Stenarson <[email protected]> Jorgen Stenarson <>
+Jörgen Stenarson <[email protected]> jstenar
<[email protected]>
+Jörgen Stenarson <[email protected]> jstenar <>
+Jörgen Stenarson <[email protected]> Jörgen Stenarson
<[email protected]>
+Juergen Hasch <[email protected]> juhasch <[email protected]>
+Juergen Hasch <[email protected]> juhasch <[email protected]>
+Julia Evans <[email protected]> Julia Evans <[email protected]>
+Kester Tong <[email protected]> KesterTong <[email protected]>
+Kyle Kelley <[email protected]> Kyle Kelley <[email protected]>
+Kyle Kelley <[email protected]> rgbkrk <[email protected]>
+Laurent Dufréchou <[email protected]> <[email protected]>
+Laurent Dufréchou <[email protected]> <laurent@Pep>
+Laurent Dufréchou <[email protected]> laurent dufrechou <>
+Laurent Dufréchou <[email protected]> laurent.dufrechou <>
+Laurent Dufréchou <[email protected]> Laurent Dufrechou <>
+Laurent Dufréchou <[email protected]> [email protected] <>
+Laurent Dufréchou <[email protected]> ldufrechou <ldufrechou@PEP>
+Lorena Pantano <[email protected]> Lorena <[email protected]>
+Luis Pedro Coelho <[email protected]> Luis Pedro Coelho <[email protected]>
+Marc Molla <[email protected]> marcmolla <[email protected]>
+MartÃn Gaitán <[email protected]> MartÃn Gaitán <[email protected]>
+Matthias Bussonnier <[email protected]> Matthias BUSSONNIER
<[email protected]>
+Matthias Bussonnier <[email protected]> Bussonnier Matthias
<[email protected]>
+Matthias Bussonnier <[email protected]> Matthias BUSSONNIER
<[email protected]>
+Matthias Bussonnier <[email protected]> Matthias Bussonnier
<carreau@Aspire.(none)>
+Michael Droettboom <[email protected]> Michael Droettboom <[email protected]>
+Nicholas Bollweg <[email protected]> Nicholas Bollweg (Nick)
<[email protected]>
+Nicolas Rougier <[email protected]> <[email protected]>
+Nikolay Koldunov <[email protected]> Nikolay Koldunov
<[email protected]>
+Omar Andrés Zapata Mesa <[email protected]> Omar Andres Zapata Mesa
<[email protected]>
+Omar Andrés Zapata Mesa <[email protected]> Omar Andres Zapata Mesa
<omazapa@tuxhome>
+Pankaj Pandey <[email protected]> Pankaj Pandey <[email protected]>
+Pascal Schetelat <[email protected]> pascal-schetelat
<[email protected]>
+Paul Ivanov <[email protected]> Paul Ivanov <[email protected]>
+Pauli Virtanen <[email protected]> Pauli Virtanen <>
+Pauli Virtanen <[email protected]> Pauli Virtanen <[email protected]>
+Pierre Gerold <[email protected]> Pierre Gerold <[email protected]>
+Pietro Berkes <[email protected]> Pietro Berkes
<[email protected]>
+Piti Ongmongkolkul <[email protected]> piti118 <[email protected]>
+Prabhu Ramachandran <[email protected]> Prabhu Ramachandran <>
+Puneeth Chaganti <[email protected]> Puneeth Chaganti
<[email protected]>
+Robert Kern <[email protected]> rkern <>
+Robert Kern <[email protected]> Robert Kern <[email protected]>
+Robert Kern <[email protected]> Robert Kern <[email protected]>
+Robert Kern <[email protected]> Robert Kern <>
+Robert Marchman <[email protected]> Robert Marchman
<[email protected]>
+Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
+Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
+Scott Sanderson <[email protected]> Scott Sanderson
<[email protected]>
+smithj1 <[email protected]> smithj1 <[email protected]>
+smithj1 <[email protected]> smithj1 <[email protected]>
+Steven Johnson <[email protected]> stevenJohnson
<[email protected]>
+Steven Silvester <[email protected]> blink1073
<[email protected]>
+S. Weber <[email protected]> s8weber <[email protected]>
+Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]>
+Silvia Vinyes <[email protected]> Silvia <silvia@silvia-U44SG.(none)>
+Silvia Vinyes <[email protected]> silviav12 <[email protected]>
+Sylvain Corlay <[email protected]> <[email protected]>
+Sylvain Corlay <[email protected]> sylvain.corlay
<[email protected]>
+Ted Drain <[email protected]> TD22057 <[email protected]>
+Théophile Studer <[email protected]> Théophile Studer
<[email protected]>
+Thomas Kluyver <[email protected]> Thomas <[email protected]>
+Thomas Spura <[email protected]> Thomas Spura <[email protected]>
+Timo Paulssen <[email protected]> timo
<[email protected]>
+vds <vds@VIVIAN> vds2212 <vds2212@VIVIAN>
+vds <vds@VIVIAN> vds <vds@vivian>
+Ville M. Vainio <[email protected]> <vivainio2@WN-W0941>
+Ville M. Vainio <[email protected]> ville <ville@VILLE-PC>
+Ville M. Vainio <[email protected]> ville <ville@ville-desktop>
+Ville M. Vainio <[email protected]> vivainio <>
+Ville M. Vainio <[email protected]> Ville M. Vainio <vivainio@villev>
+Ville M. Vainio <[email protected]> Ville M. Vainio <vivainio@ville_vmw>
+Walter Doerwald <[email protected]> walter.doerwald <>
+Walter Doerwald <[email protected]> Walter Doerwald <>
+W. Trevor King <[email protected]> W. Trevor King <[email protected]>
+Yoval P. <[email protected]> y-p <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/PKG-INFO new/qtconsole-5.4.1/PKG-INFO
--- old/qtconsole-5.4.0/PKG-INFO 2022-11-02 02:09:43.602053400 +0100
+++ new/qtconsole-5.4.1/PKG-INFO 2023-03-11 21:43:33.672649100 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: qtconsole
-Version: 5.4.0
+Version: 5.4.1
Summary: Jupyter Qt console
Home-page: http://jupyter.org
Author: Jupyter Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/RELEASE.md
new/qtconsole-5.4.1/RELEASE.md
--- old/qtconsole-5.4.0/RELEASE.md 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/RELEASE.md 2020-10-24 17:40:21.000000000 +0200
@@ -0,0 +1,31 @@
+To release a new version of qtconsole you need to follow these steps:
+
+* git pull or git fetch/merge
+
+* Close the current milestone on Github
+
+* Update docs/source/changelog.rst with a PR.
+
+* git clean -xfdi
+
+* Update version in `_version.py` (set release version, remove 'dev0')
+
+* git add and git commit with `Release X.X.X`
+
+* python setup.py sdist
+
+* activate pyenv-with-latest-setuptools && python setup.py bdist_wheel
+
+* twine check dist/*
+
+* twine upload dist/*
+
+* git tag -a X.X.X -m 'Release X.X.X'
+
+* Update version in `_version.py` (add 'dev0' and increment minor)
+
+* git add and git commit with `Back to work`
+
+* git push upstream master
+
+* git push upstream --tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/docs/source/changelog.rst
new/qtconsole-5.4.1/docs/source/changelog.rst
--- old/qtconsole-5.4.0/docs/source/changelog.rst 2022-11-02
02:05:05.000000000 +0100
+++ new/qtconsole-5.4.1/docs/source/changelog.rst 2023-03-11
21:39:59.000000000 +0100
@@ -8,6 +8,14 @@
5.4
~~~
+5.4.1
+-----
+
+`5.4.1 on GitHub <https://github.com/jupyter/qtconsole/milestones/5.4.1>`__
+
+* Fix crash at startup with PySide6.
+* Cast images width and height to int when trying to insert them.
+
5.4.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole/_version.py
new/qtconsole-5.4.1/qtconsole/_version.py
--- old/qtconsole-5.4.0/qtconsole/_version.py 2022-11-02 02:08:44.000000000
+0100
+++ new/qtconsole-5.4.1/qtconsole/_version.py 2023-03-11 21:42:36.000000000
+0100
@@ -1,2 +1,2 @@
-version_info = (5, 4, 0)
+version_info = (5, 4, 1)
__version__ = '.'.join(map(str, version_info))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole/qtconsoleapp.py
new/qtconsole-5.4.1/qtconsole/qtconsoleapp.py
--- old/qtconsole-5.4.0/qtconsole/qtconsoleapp.py 2022-10-29
17:56:10.000000000 +0200
+++ new/qtconsole-5.4.1/qtconsole/qtconsoleapp.py 2023-03-11
21:35:38.000000000 +0100
@@ -12,6 +12,8 @@
import sys
from warnings import warn
+from packaging.version import parse
+
# If run on Windows:
#
# 1. Install an exception hook which pops up a message box.
@@ -416,8 +418,8 @@
# Fixes launching issues with Big Sur
# https://bugreports.qt.io/browse/QTBUG-87014, fixed in qt 5.15.2
if sys.platform == 'darwin':
- v_5_15_2 = QtCore.QVersionNumber.fromString('5.15.2')[0]
- v_current = QtCore.QVersionNumber.fromString(QT_VERSION)[0]
+ v_5_15_2 = parse('5.15.2')
+ v_current = parse(QT_VERSION)
if v_current < v_5_15_2:
os.environ['QT_MAC_WANTS_LAYER'] = '1'
self._init_asyncio_patch()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole/rich_jupyter_widget.py
new/qtconsole-5.4.1/qtconsole/rich_jupyter_widget.py
--- old/qtconsole-5.4.0/qtconsole/rich_jupyter_widget.py 2022-03-27
20:25:58.000000000 +0200
+++ new/qtconsole-5.4.1/qtconsole/rich_jupyter_widget.py 2023-03-07
01:10:49.000000000 +0100
@@ -379,13 +379,13 @@
image = QtGui.QImage()
image.loadFromData(img, fmt.upper())
if width and height:
- image = image.scaled(width, height,
+ image = image.scaled(int(width), int(height),
QtCore.Qt.IgnoreAspectRatio,
QtCore.Qt.SmoothTransformation)
elif width and not height:
- image = image.scaledToWidth(width,
QtCore.Qt.SmoothTransformation)
+ image = image.scaledToWidth(int(width),
QtCore.Qt.SmoothTransformation)
elif height and not width:
- image = image.scaledToHeight(height,
QtCore.Qt.SmoothTransformation)
+ image = image.scaledToHeight(int(height),
QtCore.Qt.SmoothTransformation)
except ValueError:
self._insert_plain_text(cursor, 'Received invalid %s data.'%fmt)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconsole-5.4.0/qtconsole/tests/test_jupyter_widget.py
new/qtconsole-5.4.1/qtconsole/tests/test_jupyter_widget.py
--- old/qtconsole-5.4.0/qtconsole/tests/test_jupyter_widget.py 2022-05-29
18:43:26.000000000 +0200
+++ new/qtconsole-5.4.1/qtconsole/tests/test_jupyter_widget.py 2023-03-07
01:10:49.000000000 +0100
@@ -1,13 +1,10 @@
import unittest
import sys
-from packaging.version import parse
import pytest
-from qtpy import QT6, QT_VERSION
+from qtpy import QT6
from qtpy import QtWidgets, QtGui
-from qtpy.QtTest import QTest
-from qtconsole.client import QtKernelClient
from qtconsole.jupyter_widget import JupyterWidget
from . import no_display
@@ -73,35 +70,9 @@
'In [2]: '
))
- # Check proper syntax highlighting
- if QT6 and parse(QT_VERSION) >= parse('6.3'):
- html = (
- '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
"http://www.w3.org/TR/REC-html40/strict.dtd">\n'
- '<html><head><meta name="qrichtext" content="1" /><meta
charset="utf-8" /><style type="text/css">\n'
- 'p, li { white-space: pre-wrap; }\n'
- 'hr { height: 1px; border-width: 0; }\n'
- '</style></head><body style=\" font-family:\'Monospace\';
font-size:9pt; font-weight:400; font-style:normal;\">\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;">Header</p>\n'
- '<p style="-qt-paragraph-type:empty; margin-top:0px;
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;"><br /></p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">[other] In [</span><span style=" font-weight:700;
color:#000080;">1</span><span style=" color:#000080;">]:</span> a = 1 + 1</p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0...:</span>
b = range(10)</p>\n'
- '<p style="-qt-paragraph-type:empty; margin-top:0px;
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;"><br /></p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">In [</span><span style=" font-weight:700;
color:#000080;">2</span><span style=" color:#000080;">]:</span>
</p></body></html>'
- )
- elif QT6 and parse(QT_VERSION) < parse('6.3'):
- html = (
- '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
"http://www.w3.org/TR/REC-html40/strict.dtd">\n'
- '<html><head><meta name="qrichtext" content="1" /><meta
charset="utf-8" /><style type="text/css">\n'
- 'p, li { white-space: pre-wrap; }\n'
- '</style></head><body style=\" font-family:\'Monospace\';
font-size:9pt; font-weight:400; font-style:normal;\">\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;">Header</p>\n'
- '<p style="-qt-paragraph-type:empty; margin-top:0px;
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;"><br /></p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">[other] In [</span><span style=" font-weight:700;
color:#000080;">1</span><span style=" color:#000080;">]:</span> a = 1 + 1</p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0...:</span>
b = range(10)</p>\n'
- '<p style="-qt-paragraph-type:empty; margin-top:0px;
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0;
text-indent:0px;"><br /></p>\n'
- '<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">In [</span><span style=" font-weight:700;
color:#000080;">2</span><span style=" color:#000080;">]:</span>
</p></body></html>'
- )
- else:
+ # Check proper syntax highlighting.
+ # This changes with every Qt6 release, that's why we don't test it on
it.
+ if not QT6:
html = (
'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
"http://www.w3.org/TR/REC-html40/strict.dtd">\n'
'<html><head><meta name="qrichtext" content="1" /><style
type="text/css">\n'
@@ -115,7 +86,7 @@
'<p style=" margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span
style=" color:#000080;">In [</span><span style=" font-weight:600;
color:#000080;">2</span><span style=" color:#000080;">]:</span>
</p></body></html>'
)
- self.assertEqual(document.toHtml(), html)
+ self.assertEqual(document.toHtml(), html)
def test_copy_paste_prompt(self):
"""Test copy/paste removes partial and full prompts."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole.egg-info/PKG-INFO
new/qtconsole-5.4.1/qtconsole.egg-info/PKG-INFO
--- old/qtconsole-5.4.0/qtconsole.egg-info/PKG-INFO 2022-11-02
02:09:43.000000000 +0100
+++ new/qtconsole-5.4.1/qtconsole.egg-info/PKG-INFO 2023-03-11
21:43:33.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: qtconsole
-Version: 5.4.0
+Version: 5.4.1
Summary: Jupyter Qt console
Home-page: http://jupyter.org
Author: Jupyter Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole.egg-info/SOURCES.txt
new/qtconsole-5.4.1/qtconsole.egg-info/SOURCES.txt
--- old/qtconsole-5.4.0/qtconsole.egg-info/SOURCES.txt 2022-11-02
02:09:43.000000000 +0100
+++ new/qtconsole-5.4.1/qtconsole.egg-info/SOURCES.txt 2023-03-11
21:43:33.000000000 +0100
@@ -1,8 +1,16 @@
+.coveragerc
+.gitignore
+.mailmap
CONTRIBUTING.md
LICENSE
MANIFEST.in
README.md
+RELEASE.md
+readthedocs.yml
setup.py
+.github/workflows/linux-tests.yml
+.github/workflows/macos-tests.yml
+.github/workflows/windows-tests.yml
docs/Makefile
docs/autogen_config.py
docs/environment.yml
@@ -67,4 +75,5 @@
qtconsole/tests/test_frontend_widget.py
qtconsole/tests/test_jupyter_widget.py
qtconsole/tests/test_kill_ring.py
-qtconsole/tests/test_styles.py
\ No newline at end of file
+qtconsole/tests/test_styles.py
+requirements/environment.yml
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/qtconsole.egg-info/requires.txt
new/qtconsole-5.4.1/qtconsole.egg-info/requires.txt
--- old/qtconsole-5.4.0/qtconsole.egg-info/requires.txt 2022-11-02
02:09:43.000000000 +0100
+++ new/qtconsole-5.4.1/qtconsole.egg-info/requires.txt 2023-03-11
21:43:33.000000000 +0100
@@ -6,6 +6,7 @@
ipykernel>=4.1
qtpy>=2.0.1
pyzmq>=17.1
+packaging
[doc]
Sphinx>=1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/readthedocs.yml
new/qtconsole-5.4.1/readthedocs.yml
--- old/qtconsole-5.4.0/readthedocs.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/readthedocs.yml 2020-10-24 17:40:22.000000000 +0200
@@ -0,0 +1,5 @@
+conda:
+ file: docs/environment.yml
+python:
+ version: 3
+ setup_py_install: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/requirements/environment.yml
new/qtconsole-5.4.1/requirements/environment.yml
--- old/qtconsole-5.4.0/requirements/environment.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-5.4.1/requirements/environment.yml 2022-03-27
20:25:58.000000000 +0200
@@ -0,0 +1,20 @@
+channels:
+ - conda-forge
+dependencies:
+# Main dependencies
+- pyqt
+- qtpy >=2.0.1
+- traitlets
+- ipython_genutils
+- jupyter_core
+- jupyter_client
+- pygments
+- ipykernel
+- pyzmq >=17.1
+
+# For testing
+- coveralls
+- flaky
+- pytest
+- pytest-cov
+- pytest-qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-5.4.0/setup.py new/qtconsole-5.4.1/setup.py
--- old/qtconsole-5.4.0/setup.py 2022-06-01 18:21:57.000000000 +0200
+++ new/qtconsole-5.4.1/setup.py 2023-03-11 21:35:38.000000000 +0100
@@ -73,7 +73,8 @@
'pygments',
'ipykernel>=4.1', # not a real dependency, but require the reference
kernel
'qtpy>=2.0.1',
- 'pyzmq>=17.1'
+ 'pyzmq>=17.1',
+ 'packaging'
],
extras_require = {
'test': ['flaky', 'pytest', 'pytest-qt'],