openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2017
- 1 participants
- 2097 discussions
Hello community,
here is the log from the commit of package qtractor for openSUSE:Factory checked in at 2017-08-29 11:47:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtractor (Old)
and /work/SRC/openSUSE:Factory/.qtractor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtractor"
Tue Aug 29 11:47:20 2017 rev:45 rq:519267 version:0.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtractor/qtractor.changes 2017-07-02 13:38:46.438020952 +0200
+++ /work/SRC/openSUSE:Factory/.qtractor.new/qtractor.changes 2017-08-29 11:48:14.753095957 +0200
@@ -1,0 +2,5 @@
+Fri Aug 25 06:10:58 UTC 2017 - olaf(a)aepfle.de
+
+- Enable mad and Qt5 unconditionally
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtractor.spec ++++++
--- /var/tmp/diff_new_pack.NA87z0/_old 2017-08-29 11:48:15.704961793 +0200
+++ /var/tmp/diff_new_pack.NA87z0/_new 2017-08-29 11:48:15.720959539 +0200
@@ -16,8 +16,6 @@
#
-%bcond_with mad
-
Name: qtractor
Version: 0.8.3
Release: 0
@@ -42,23 +40,16 @@
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel >= 1.0.11
BuildRequires: libvorbis-devel
-%if 0%{?suse_version} > 1310
BuildRequires: libqt5-linguist
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
-%else
-BuildRequires: libqt4-devel
-BuildRequires: libqt4-linguist
-%endif
BuildRequires: zlib-devel
BuildRequires: pkgconfig(lilv-0)
BuildRequires: pkgconfig(shared-mime-info)
-%if %{with mad}
BuildRequires: pkgconfig(mad)
-%endif
Requires: jack
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,11 +69,7 @@
%patch2
%build
-%if 0%{?suse_version} > 1310
%configure
-%else
-%configure --enable-qt4
-%endif
make %{?_smp_mflags}
%install
1
0
Hello community,
here is the log from the commit of package love-0_7_2 for openSUSE:Factory checked in at 2017-08-29 11:47:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/love-0_7_2 (Old)
and /work/SRC/openSUSE:Factory/.love-0_7_2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "love-0_7_2"
Tue Aug 29 11:47:13 2017 rev:2 rq:519246 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/love-0_7_2/love-0_7_2.changes 2015-08-24 01:30:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.love-0_7_2.new/love-0_7_2.changes 2017-08-29 11:48:13.377289874 +0200
@@ -1,0 +2,9 @@
+Mon Aug 28 23:17:52 UTC 2017 - jengelh(a)inai.de
+
+- Make build with new /usr/include/lua5.1 directory work again.
+- Rename freetype.diff to system-packages.diff.
+- Remove love-remove-mpg123.patch: mpg123 is available in
+ openSUSE:Factory and can be used now.
+- system-packages.diff: search for lua and mpg123 with pkg-config.
+
+-------------------------------------------------------------------
Old:
----
freetype.diff
love-remove-mpg123.patch
New:
----
system-packages.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ love-0_7_2.spec ++++++
--- /var/tmp/diff_new_pack.DdBWdr/_old 2017-08-29 11:48:14.521128652 +0200
+++ /var/tmp/diff_new_pack.DdBWdr/_new 2017-08-29 11:48:14.525128089 +0200
@@ -1,7 +1,7 @@
#
# spec file for package love-0_7_2
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,15 +26,13 @@
Source: https://bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
Patch1: love-modplug.patch
-Patch2: love-remove-mpg123.patch
-Patch3: freetype.diff
+Patch2: system-packages.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libmng-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
-BuildRequires: lua51-devel
BuildRequires: physfs-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(IL)
@@ -42,23 +40,21 @@
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(libmodplug)
+BuildRequires: pkgconfig(libmpg123)
+BuildRequires: pkgconfig(lua5.1)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(vorbisfile)
-%if %{with mpg123}
-BuildRequires: pkgconfig(libmpg123)
-%endif
%description
LÖVE is a framework for making 2D games in Lua.
%prep
%setup -qn love-HEAD
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
%build
sed -i 's/\r$//' *.txt
-rm -f src/modules/sound/lullaby/Mpg123Decoder.{cpp,h}
mv configure.{in,ac}
autoreconf -fi
%configure
++++++ system-packages.diff ++++++
From: Jan Engelhardt <jengelh(a)inai.de>
Date: 2015-01-20 20:46:39.043255730 +0100
build: löve uses an undocumented way of including freetype headers
Replace the (unsupported) #include <freetype/XX> paths by just <XX> as required
by upstream, and use pkg-config — not just for freetype, but also lua, and, by
extension, opportunistically for SDL/GL.
---
configure.in | 38 ++++++-------------------
src/Makefile.am | 7 +---
src/modules/font/freetype/Font.h | 8 ++---
src/modules/font/freetype/TrueTypeRasterizer.h | 8 ++---
4 files changed, 20 insertions(+), 41 deletions(-)
Index: love-HEAD/configure.in
===================================================================
--- love-HEAD.orig/configure.in
+++ love-HEAD/configure.in
@@ -3,42 +3,24 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix])
AC_CONFIG_MACRO_DIR([platform/unix/m4])
AC_CONFIG_SRCDIR([src/love.cpp])
-AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar])
+AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar subdir-objects])
AC_PREFIX_DEFAULT([/usr])
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_CXX
AC_SEARCH_LIBS([sqrt], [m], [], AC_MSG_ERROR([Can't LÖVE without C math library]))
-AC_SEARCH_LIBS([SDL_Init], [SDL], [], AC_MSG_ERROR([Can't LÖVE without SDL]))
-AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
-#AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
-AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
-AC_ARG_ENABLE([luajit],
- [ --enable-luajit Use LuaJIT instead of lua],
- AC_SEARCH_LIBS(
- [lua_pcall],
- [luajit luajit-5.1],
- AC_SUBST([INCLUDE_LUA], [-I/usr/include/luajit-2.0]),
- AC_MSG_ERROR([Can't LÖVE without LuaJIT])
- ),
- AC_SEARCH_LIBS(
- [lua_pcall],
- [lua lua5.1],
- if test "$ac_cv_search_lua_pcall" = "-llua5.1"; then
- AC_SUBST([INCLUDE_LUA], [-I/usr/include/lua5.1])
- fi,
- AC_MSG_ERROR([Can't LÖVE without Lua])
- )
-)
-AC_SEARCH_LIBS([ilInit], [IL], [], AC_MSG_ERROR([Can't LÖVE without DevIL]))
+PKG_CHECK_MODULES([sdl], [sdl])
+PKG_CHECK_MODULES([gl], [gl])
+PKG_CHECK_MODULES([al], [openal])
+PKG_CHECK_MODULES([lua], [lua5.1])
+PKG_CHECK_MODULES([il], [IL])
AC_SEARCH_LIBS([mng_initialize], [mng], [], AC_MSG_ERROR([DevIL needs MNG]))
AC_SEARCH_LIBS([TIFFOpen], [tiff], [], AC_MSG_ERROR([DevIL needs TIFF]))
-AC_SEARCH_LIBS([FT_Load_Glyph], [freetype], [], AC_MSG_ERROR([Can't LÖVE without FreeType]))
+PKG_CHECK_MODULES([ft], [freetype2])
AC_SEARCH_LIBS([PHYSFS_init], [physfs], [], AC_MSG_ERROR([Can't LÖVE without PhysicsFS]))
-AC_SEARCH_LIBS([ModPlug_Load], [modplug], [], AC_MSG_ERROR([Can't LÖVE without ModPlug]))
-AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123]))
-AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[]))
-AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without VorbisFile]))
+PKG_CHECK_MODULES([modplug], [libmodplug])
+PKG_CHECK_MODULES([mpg123], [libmpg123])
+PKG_CHECK_MODULES([vorbisfile], [vorbisfile])
AC_CONFIG_FILES([
Makefile
src/Makefile
Index: love-HEAD/src/Makefile.am
===================================================================
--- love-HEAD.orig/src/Makefile.am
+++ love-HEAD/src/Makefile.am
@@ -1,12 +1,9 @@
-AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/usr/include/SDL $(FILE_OFFSET)
-AUTOMAKE_OPTIONS = subdir-objects
-DEFAULT_INCLUDES =
+AM_CPPFLAGS = -I. -I./modules ${al_CFLAGS} ${ft_CFLAGS} ${gl_CFLAGS} ${glu_CFLAGS} ${il_CFLAGS} ${lua_CFLAGS} ${modplug_CFLAGS} ${mpg123_CFLAGS} ${sdl_CFLAGS} ${vorbisfile_CFLAGS} $(FILE_OFFSET)
SUBDIRS =
# LÖVE executable
bin_PROGRAMS = love
-#love_LDFLAGS =
-#love_LDADD =
+love_LDADD = ${al_LIBS} ${ft_LIBS} ${gl_LIBS} ${glu_LIBS} ${il_LIBS} ${lua_LIBS} ${modplug_LIBS} ${mpg123_LIBS} ${sdl_LIBS} ${vorbisfile_LIBS}
love_SOURCES = \
./scripts/graphics.lua.h \
Index: love-HEAD/src/modules/font/freetype/Font.h
===================================================================
--- love-HEAD.orig/src/modules/font/freetype/Font.h
+++ love-HEAD/src/modules/font/freetype/Font.h
@@ -30,10 +30,10 @@
#else
#include <ft2build.h>
#endif
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
namespace love
{
Index: love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h
===================================================================
--- love-HEAD.orig/src/modules/font/freetype/TrueTypeRasterizer.h
+++ love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h
@@ -27,10 +27,10 @@
// TrueType2
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
namespace love
{
1
0
Hello community,
here is the log from the commit of package python-EasyProcess for openSUSE:Factory checked in at 2017-08-29 11:47:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-EasyProcess (Old)
and /work/SRC/openSUSE:Factory/.python-EasyProcess.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-EasyProcess"
Tue Aug 29 11:47:05 2017 rev:12 rq:519240 version:0.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-EasyProcess/python-EasyProcess.changes 2015-05-07 09:22:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-EasyProcess.new/python-EasyProcess.changes 2017-08-29 11:48:11.925494502 +0200
@@ -1,0 +2,8 @@
+Mon Aug 28 19:32:50 UTC 2017 - toddrme2178(a)gmail.com
+
+- update to version 0.2.3:
+ * no changelog available
+- Implement single-spec version
+- Fix source URL
+
+-------------------------------------------------------------------
Old:
----
EasyProcess-0.1.9.tar.gz
New:
----
EasyProcess-0.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-EasyProcess.spec ++++++
--- /var/tmp/diff_new_pack.TFJXq3/_old 2017-08-29 11:48:12.957349064 +0200
+++ /var/tmp/diff_new_pack.TFJXq3/_new 2017-08-29 11:48:12.957349064 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-EasyProcess
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,27 +16,32 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without test
Name: python-EasyProcess
-Version: 0.1.9
+Version: 0.2.3
Release: 0
Url: https://github.com/ponty/easyprocess
Summary: Easy to use python subprocess interface
License: BSD-2-Clause
Group: Development/Languages/Python
-Source: http://pypi.python.org/packages/source/E/EasyProcess/EasyProcess-%{version}…
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch: noarch
+Source: https://files.pythonhosted.org/packages/source/E/EasyProcess/EasyProcess-%{…
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+BuildRequires: python3-2to3
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+%if %{with test}
+BuildRequires: %{python_module nose}
%endif
+BuildArch: noarch
+
+%python_subpackages
%description
EasyProcess is an easy to use python subprocess interface.
-Features:
+Features include:
- layer on top of subprocess module
- easy to start, stop programs
- easy to get standard output/error, return code of programs
@@ -57,12 +62,23 @@
%setup -q -n EasyProcess-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+
+%if %{with test}
+%check
+mkdir tester
+pushd tester
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+$python -B -m nose easyprocess
+}
+popd
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root,-)
%doc LICENSE.txt README.rst
%{python_sitelib}/*
++++++ EasyProcess-0.1.9.tar.gz -> EasyProcess-0.2.3.tar.gz ++++++
++++ 1669 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-PyAudio for openSUSE:Factory checked in at 2017-08-29 11:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyAudio (Old)
and /work/SRC/openSUSE:Factory/.python-PyAudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyAudio"
Tue Aug 29 11:46:58 2017 rev:2 rq:519239 version:0.2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyAudio/python-PyAudio.changes 2015-10-20 00:04:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyAudio.new/python-PyAudio.changes 2017-08-29 11:48:10.249730698 +0200
@@ -1,0 +2,18 @@
+Mon Aug 28 20:43:35 UTC 2017 - toddrme2178(a)gmail.com
+
+- Update to 0.2.11
+ * Fix use-after-free memory issue in callback handler.
+ * Fix docstring for get_output_latency().
+- Update to 0.2.10
+ * Release the GIL during PortAudio I/O calls to avoid potential deadlock.
+ * Add a few automated unit tests.
+- Update to PyAudio 0.2.9
+ * Fix overflow error handling logic for pa_read_stream.
+ * Fix IOError arguments.
+ * Python library surfaces issues with importing low-level C module.
+ * Code formatting update.
+ * Updates to examples for Python 3 compatibility.
+- Implement single-spec version
+- Fix source URL
+
+-------------------------------------------------------------------
Old:
----
pyaudio-0.2.8.tar.gz
New:
----
PyAudio-0.2.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyAudio.spec ++++++
--- /var/tmp/diff_new_pack.UB51uE/_old 2017-08-29 11:48:11.757518178 +0200
+++ /var/tmp/diff_new_pack.UB51uE/_new 2017-08-29 11:48:11.773515924 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-PyAudio
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,54 +16,61 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with test
Name: python-PyAudio
-Version: 0.2.8
+Version: 0.2.11
Release: 0
Summary: Python Bindings for PortAudio v19
License: MIT
Group: Development/Libraries/Python
Url: http://people.csail.mit.edu/hubert/pyaudio/
-Source0: http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-%{version}.tar.…
+Source: https://files.pythonhosted.org/packages/source/P/PyAudio/PyAudio-%{version}…
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: portaudio-devel
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: python-rpm-macros
+%if %{with test}
+BuildRequires: alsa
+BuildRequires: %{python_module nose}
+BuildRequires: %{python_module numpy}
+%endif
+
+%python_subpackages
%description
PyAudio provides Python bindings for PortAudio v19, the cross-platform audio I/O library.
With PyAudio, you can easily use Python to play and record audio streams on a variety
of platforms (e.g., GNU/Linux, Microsoft Windows, and Mac OS X).
-%package docs
-Summary: Documentation for %{name}
-Group: Development/Libraries/Python
-
-%description docs
-Documentation and help files for %{name}
-
%prep
%setup -q -n PyAudio-%{version}
%build
-python setup.py build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
-%fdupes -s %{buildroot}/%{_prefix}
-rm -r docs/.doctrees
-rm -r docs/.buildinfo
+%if %{with test}
+%check
+pushd tests
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
+$python -B -m nose ./*.py
+}
+popd
+%endif
-%files
+%files %{python_files}
%defattr(-,root,root)
%doc CHANGELOG README
-%{python_sitearch}/_portaudio.so
+%doc examples/
+%{python_sitearch}/_portaudio*.so
%{python_sitearch}/pyaudio.py*
+%pycache_only %{python_sitearch}/__pycache__/pyaudio*.py*
%{python_sitearch}/PyAudio-%{version}-py*.egg-info
-%files docs
-%defattr(-,root,root)
-%doc docs
-
%changelog
1
0
Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2017-08-29 11:46:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Tue Aug 29 11:46:46 2017 rev:17 rq:519223 version:3.20.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2017-08-16 16:18:45.422907840 +0200
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2017-08-29 11:48:06.394274119 +0200
@@ -1,0 +2,12 @@
+Mon Aug 28 20:20:01 UTC 2017 - jimmy(a)boombatower.com
+
+- Update to version 3.20.1:
+ * Easy install on Platform.sh environments
+ * No need to "source .environment"
+ * Write to tmp if config directory is not available
+ * Show ID of users (#618) (#619)
+ * Docs can no longer be searched by URL
+ * Use the local Drush if possible (#621)
+ * Release v3.20.1
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.20.0.tar.xz
New:
----
platformsh-cli-3.20.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.526114587 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.538112897 +0200
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.20.0
+Version: 3.20.1
Release: 0
Summary: Tool for managing Platform.sh services from the command line
# See licenses.txt for dependency licenses.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.682092602 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.686092039 +0200
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">refs/tags/v3.20.0</param>
+ <param name="revision">refs/tags/v3.20.1</param>
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.21QWg4/_old 2017-08-29 11:48:07.754082456 +0200
+++ /var/tmp/diff_new_pack.21QWg4/_new 2017-08-29 11:48:07.758081892 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param name="changesrevision">48241718f7d61b41206871f8f0a13bea2e341181</param>
+ <param name="changesrevision">c113051c280d815807ee8125943571a33ced2158</param>
</service>
</servicedata>
++++++ platformsh-cli-3.20.0.tar.xz -> platformsh-cli-3.20.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/config.yaml new/platformsh-cli-3.20.1/config.yaml
--- old/platformsh-cli-3.20.0/config.yaml 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/config.yaml 2017-08-23 20:20:41.000000000 +0200
@@ -1,7 +1,7 @@
# Metadata about the CLI application itself.
application:
name: 'Platform.sh CLI'
- version: '3.20.0'
+ version: '3.20.1'
executable: 'platform'
package_name: 'platformsh/cli'
installer_url: 'https://platform.sh/cli/installer'
@@ -9,6 +9,7 @@
user_config_dir: '.platformsh'
user_state_file: '.platformsh/state.json'
env_prefix: 'PLATFORMSH_CLI_'
+ tmp_sub_dir: 'platformsh-cli-tmp'
# Configuration for working with projects locally.
local:
@@ -32,7 +33,7 @@
app_config_file: '.platform.app.yaml'
project_config_dir: '.platform'
docs_url: 'https://docs.platform.sh'
- docs_search_url: 'https://docs.platform.sh/?q={{ terms }}'
+ docs_search_url: 'https://www.google.com/search?q=site%3Adocs.platform.sh%20{{ terms }}'
accounts_url: 'https://accounts.platform.sh'
pricing_url: 'https://platform.sh/pricing'
available_regions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/dist/installer.php new/platformsh-cli-3.20.1/dist/installer.php
--- old/platformsh-cli-3.20.0/dist/installer.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/dist/installer.php 2017-08-23 20:20:41.000000000 +0200
@@ -9,6 +9,7 @@
define('CLI_EXECUTABLE', 'platform');
define('CLI_NAME', 'Platform.sh CLI');
define('CLI_PHAR', CLI_EXECUTABLE . '.phar');
+define('CLI_SERVICE_ENV_PREFIX', 'PLATFORM_');
set_error_handler(
function ($code, $message) {
@@ -236,7 +237,7 @@
if ($shellConfigFile = findShellConfigFile($home)) {
output(" Configuring the shell...");
$configured = true;
- $currentShellConfig = file_get_contents($shellConfigFile);
+ $currentShellConfig = file_exists($shellConfigFile) ? file_get_contents($shellConfigFile) : false;
if ($currentShellConfig === false) {
$currentShellConfig = '';
}
@@ -264,7 +265,9 @@
if ($configured) {
output(PHP_EOL . "To get started, run:", 'info');
$toSource = getcwd() === $home ? str_replace(getcwd() . '/', '', $shellConfigFile) : $shellConfigFile;
- output(' source ' . $toSource);
+ if ($toSource !== '.environment') {
+ output(' source ' . $toSource);
+ }
output(' ' . CLI_EXECUTABLE);
} else {
output(PHP_EOL . "Add this to your shell configuration file:", 'info');
@@ -374,6 +377,13 @@
*/
function findShellConfigFile($home)
{
+ // Special handling for the .environment file on Platform.sh environments.
+ if (getenv(CLI_SERVICE_ENV_PREFIX . 'PROJECT') !== false
+ && getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') !== false
+ && getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') === $home) {
+ return getenv(CLI_SERVICE_ENV_PREFIX . 'APP_DIR') . '/.environment';
+ }
+
$candidates = array(
'.bash_profile',
'.bashrc',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Auth/LogoutCommand.php new/platformsh-cli-3.20.1/src/Command/Auth/LogoutCommand.php
--- old/platformsh-cli-3.20.0/src/Command/Auth/LogoutCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Auth/LogoutCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -53,7 +53,7 @@
$this->stdErr->writeln('You are now logged out.');
$config = $this->config();
- $sessionsDir = $config->getUserConfigDir() . '/.session';
+ $sessionsDir = $config->getWritableUserDir() . '/.session';
if ($input->getOption('all')) {
if (is_dir($sessionsDir)) {
/** @var \Platformsh\Cli\Service\Filesystem $fs */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/MultiCommand.php new/platformsh-cli-3.20.1/src/Command/MultiCommand.php
--- old/platformsh-cli-3.20.0/src/Command/MultiCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/MultiCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -120,7 +120,7 @@
}
$dialogRc = file_get_contents(CLI_ROOT . '/resources/console/dialogrc');
- $dialogRcFile = $this->config()->getUserConfigDir() . '/dialogrc';
+ $dialogRcFile = $this->config()->getWritableUserDir() . '/dialogrc';
if ($dialogRc !== false && (file_exists($dialogRcFile) || file_put_contents($dialogRcFile, $dialogRc))) {
putenv('DIALOGRC=' . $dialogRcFile);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Server/ServerCommandBase.php new/platformsh-cli-3.20.1/src/Command/Server/ServerCommandBase.php
--- old/platformsh-cli-3.20.0/src/Command/Server/ServerCommandBase.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Server/ServerCommandBase.php 2017-08-23 20:20:41.000000000 +0200
@@ -98,7 +98,7 @@
if (!isset($this->serverInfo)) {
$this->serverInfo = [];
// @todo move this to State service (in a new major version)
- $filename = $this->config()->getUserConfigDir() . '/local-servers.json';
+ $filename = $this->config()->getWritableUserDir() . '/local-servers.json';
if (file_exists($filename)) {
$this->serverInfo = (array) json_decode(file_get_contents($filename), true);
}
@@ -120,7 +120,7 @@
protected function saveServerInfo()
{
- $filename = $this->config()->getUserConfigDir() . '/local-servers.json';
+ $filename = $this->config()->getWritableUserDir() . '/local-servers.json';
if (!empty($this->serverInfo)) {
if (!file_put_contents($filename, json_encode($this->serverInfo))) {
throw new \RuntimeException('Failed to write server info to: ' . $filename);
@@ -206,7 +206,7 @@
*/
protected function getPidFile($address)
{
- return $this->config()->getUserConfigDir() . '/server-' . preg_replace('/\W+/', '-', $address) . '.pid';
+ return $this->config()->getWritableUserDir() . '/server-' . preg_replace('/\W+/', '-', $address) . '.pid';
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelCommandBase.php new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelCommandBase.php
--- old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelCommandBase.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelCommandBase.php 2017-08-23 20:20:41.000000000 +0200
@@ -68,7 +68,7 @@
if (!isset($this->tunnelInfo)) {
$this->tunnelInfo = [];
// @todo move this to State service (in a new major version)
- $filename = $this->config()->getUserConfigDir() . '/tunnel-info.json';
+ $filename = $this->config()->getWritableUserDir() . '/tunnel-info.json';
if (file_exists($filename)) {
$this->debug(sprintf('Loading tunnel info from %s', $filename));
$this->tunnelInfo = (array) json_decode(file_get_contents($filename), true);
@@ -97,7 +97,7 @@
protected function saveTunnelInfo()
{
- $filename = $this->config()->getUserConfigDir() . '/tunnel-info.json';
+ $filename = $this->config()->getWritableUserDir() . '/tunnel-info.json';
if (!empty($this->tunnelInfo)) {
$this->debug('Saving tunnel info to: ' . $filename);
if (!file_put_contents($filename, json_encode($this->tunnelInfo))) {
@@ -208,7 +208,7 @@
protected function getPidFile(array $tunnel)
{
$key = $this->getTunnelKey($tunnel);
- $dir = $this->config()->getUserConfigDir() . '/.tunnels';
+ $dir = $this->config()->getWritableUserDir() . '/.tunnels';
if (!is_dir($dir) && !mkdir($dir, 0700, true)) {
throw new \RuntimeException('Failed to create directory: ' . $dir);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelOpenCommand.php new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelOpenCommand.php
--- old/platformsh-cli-3.20.0/src/Command/Tunnel/TunnelOpenCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/Tunnel/TunnelOpenCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -53,7 +53,7 @@
return 1;
}
- $logFile = $this->config()->getUserConfigDir() . '/tunnels.log';
+ $logFile = $this->config()->getWritableUserDir() . '/tunnels.log';
if (!$log = $this->openLog($logFile)) {
$this->stdErr->writeln(sprintf('Failed to open log file for writing: %s', $logFile));
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Command/User/UserListCommand.php new/platformsh-cli-3.20.1/src/Command/User/UserListCommand.php
--- old/platformsh-cli-3.20.0/src/Command/User/UserListCommand.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Command/User/UserListCommand.php 2017-08-23 20:20:41.000000000 +0200
@@ -39,12 +39,12 @@
$role .= ' (owner)';
}
}
- $rows[$weight] = [$account['email'], $account['display_name'], $role];
+ $rows[$weight] = [$account['email'], $account['display_name'], $role, $projectAccess->id];
}
ksort($rows);
- $table->render(array_values($rows), ['Email address', 'Name', 'Project role']);
+ $table->render(array_values($rows), ['Email address', 'Name', 'Project role', 'ID']);
return 0;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Api.php new/platformsh-cli-3.20.1/src/Service/Api.php
--- old/platformsh-cli-3.20.0/src/Service/Api.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Api.php 2017-08-23 20:20:41.000000000 +0200
@@ -186,7 +186,7 @@
// $HOME/.platformsh/.session/sess-cli-default/sess-cli-default.json
$session = $connector->getSession();
$session->setId('cli-' . $this->sessionId);
- $session->setStorage(new File($this->config->getUserConfigDir() . '/.session'));
+ $session->setStorage(new File($this->config->getWritableUserDir() . '/.session'));
self::$client = new PlatformClient($connector);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/CacheFactory.php new/platformsh-cli-3.20.1/src/Service/CacheFactory.php
--- old/platformsh-cli-3.20.0/src/Service/CacheFactory.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/CacheFactory.php 2017-08-23 20:20:41.000000000 +0200
@@ -20,7 +20,7 @@
}
return new FilesystemCache(
- $cliConfig->getUserConfigDir() . '/cache',
+ $cliConfig->getWritableUserDir() . '/cache',
FilesystemCache::EXTENSION,
0077 // Remove all permissions from the group and others.
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Config.php new/platformsh-cli-3.20.1/src/Service/Config.php
--- old/platformsh-cli-3.20.0/src/Service/Config.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Config.php 2017-08-23 20:20:41.000000000 +0200
@@ -70,6 +70,22 @@
}
/**
+ * @return string
+ */
+ public function getWritableUserDir()
+ {
+ $configDir = $this->getUserConfigDir();
+
+ // If the config directory is not writable (e.g. if we are on a
+ // Platform.sh environment), use a temporary directory instead.
+ if (!is_writable($configDir)) {
+ return sys_get_temp_dir() . '/' . $this->get('application.tmp_sub_dir');
+ }
+
+ return $configDir;
+ }
+
+ /**
* @param string $filename
*
* @return array
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.0/src/Service/Drush.php new/platformsh-cli-3.20.1/src/Service/Drush.php
--- old/platformsh-cli-3.20.0/src/Service/Drush.php 2017-08-14 17:36:21.000000000 +0200
+++ new/platformsh-cli-3.20.1/src/Service/Drush.php 2017-08-23 20:20:41.000000000 +0200
@@ -146,6 +146,20 @@
return $this->config->get('local.drush_executable');
}
+ // Find a locally installed Drush instance, either directly via Composer
+ // or indirectly via the local build dependencies.
+ if ($projectRoot = $this->localProject->getProjectRoot()) {
+ $drushLocal = $projectRoot . '/vendor/bin/drush';
+ if (is_executable($drushLocal)) {
+ return $drushLocal;
+ }
+
+ $drushDep = $projectRoot . '/' . $this->config->get('local.dependencies_dir') . '/php/vendor/bin/drush';
+ if (is_executable($drushDep)) {
+ return $drushDep;
+ }
+ }
+
return $this->shellHelper->resolveCommand('drush');
}
++++++ platformsh-cli-vendor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php
--- old/vendor/autoload.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/autoload.php 2017-08-28 22:20:04.546440044 +0200
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc::getLoader();
+return ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d::getLoader();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php
--- old/vendor/composer/autoload_real.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/composer/autoload_real.php 2017-08-28 22:20:04.546440044 +0200
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc
+class ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d
{
private static $loader;
@@ -19,15 +19,15 @@
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitb6506811e4b3232d0fae5c2d61c458bc', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit43da8b7e837c7fede5b52ed96b8e8c7d', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequireb6506811e4b3232d0fae5c2d61c458bc($fileIdentifier, $file);
+ composerRequire43da8b7e837c7fede5b52ed96b8e8c7d($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequireb6506811e4b3232d0fae5c2d61c458bc($fileIdentifier, $file)
+function composerRequire43da8b7e837c7fede5b52ed96b8e8c7d($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php
--- old/vendor/composer/autoload_static.php 2017-08-14 23:33:07.732611180 +0200
+++ new/vendor/composer/autoload_static.php 2017-08-28 22:20:04.546440044 +0200
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc
+class ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -183,9 +183,9 @@
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInitb6506811e4b3232d0fae5c2d61c458bc::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit43da8b7e837c7fede5b52ed96b8e8c7d::$classMap;
}, null, ClassLoader::class);
}
1
0
Hello community,
here is the log from the commit of package gnuhealth for openSUSE:Factory checked in at 2017-08-29 11:46:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuhealth (Old)
and /work/SRC/openSUSE:Factory/.gnuhealth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuhealth"
Tue Aug 29 11:46:41 2017 rev:14 rq:519204 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuhealth/gnuhealth.changes 2017-08-18 15:04:00.289527804 +0200
+++ /work/SRC/openSUSE:Factory/.gnuhealth.new/gnuhealth.changes 2017-08-29 11:48:04.250576270 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 19:29:06 UTC 2017 - axel.braun(a)gmx.de
+
+- version 3.2.2
+ health_imaging : Update health professional retrieval to the current standard method
+
+-------------------------------------------------------------------
Old:
----
gnuhealth-3.2.1.tar.gz
New:
----
gnuhealth-3.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuhealth.spec ++++++
--- /var/tmp/diff_new_pack.6LH6Lv/_old 2017-08-29 11:48:05.446407719 +0200
+++ /var/tmp/diff_new_pack.6LH6Lv/_new 2017-08-29 11:48:05.462405465 +0200
@@ -24,7 +24,7 @@
BuildRequires: fdupes
BuildRequires: python3-setuptools
-Version: %{majorver}.1
+Version: %{majorver}.2
Release: 0
Url: http://health.gnu.org
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6LH6Lv/_old 2017-08-29 11:48:05.570390244 +0200
+++ /var/tmp/diff_new_pack.6LH6Lv/_new 2017-08-29 11:48:05.570390244 +0200
@@ -1,4 +1,4 @@
<services>
-<service name="download_files" mode="disabled" />
+<service name="download_files" mode="localonly" />
</services>
++++++ gnuhealth-3.2.1.tar.gz -> gnuhealth-3.2.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/gnuhealth/gnuhealth-3.2.1.tar.gz /work/SRC/openSUSE:Factory/.gnuhealth.new/gnuhealth-3.2.2.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package cacti for openSUSE:Factory checked in at 2017-08-29 11:46:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti (Old)
and /work/SRC/openSUSE:Factory/.cacti.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti"
Tue Aug 29 11:46:35 2017 rev:2 rq:519189 version:1.1.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti/cacti.changes 2017-08-22 11:08:42.236187493 +0200
+++ /work/SRC/openSUSE:Factory/.cacti.new/cacti.changes 2017-08-29 11:47:52.664209361 +0200
@@ -1,0 +2,27 @@
+Mon Aug 21 17:46:28 UTC 2017 - liedke(a)rz.uni-mannheim.de
+
+- Build version 1.1.19
+ issue#810: Scripts in packages don't match distribution
+ issue#919: Unable to upgrade to 1.1.18
+ issue: Update documentation for minimum PHP 5.4
+
+- Build version 1.1.18
+ issue#902: Correcting some issues with Console and External Links
+ issue#903: Upgrade pace.js to v0.7.8
+ issue#904: Allow user to hide Graphs from disabled Devices
+ issue#906: Create a separate Realm for Realtime Graphs
+ issue#907: XSS issue in spikekill.php
+ CVE-2017-12927 bsc#1054390
+ issue#910: Boost last run duration generates an error on new install
+ issue#914: Unable to purge Cacti logfile from System Utilities
+ issue#915: Non-numeric data in ss_host_disk.php
+ issue#916: Resolve display of errors when encountering ldap issues
+ issue#918: Minor XSS and create generalized escape function
+ CVE-2017-12978 bsc#1054742
+ issue: Resolve JavaScript errors on Login page
+ issue: Resolve JavaScript errors on Permission Denied pages
+ issue: Graphs tab would appear in non-classic even if you did not
+ have permissions
+ feature: Updated dutch translations
+
+-------------------------------------------------------------------
Old:
----
cacti-1.1.17.tar.gz
New:
----
cacti-1.1.19.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti.spec ++++++
--- /var/tmp/diff_new_pack.4o7Bhf/_old 2017-08-29 11:47:56.667645078 +0200
+++ /var/tmp/diff_new_pack.4o7Bhf/_new 2017-08-29 11:47:56.671644515 +0200
@@ -17,7 +17,7 @@
Name: cacti
-Version: 1.1.17
+Version: 1.1.19
Release: 0
Summary: Web Front-End to Monitor System Data via RRDtool
License: GPL-2.0+
++++++ cacti-1.1.17.tar.gz -> cacti-1.1.19.tar.gz ++++++
/work/SRC/openSUSE:Factory/cacti/cacti-1.1.17.tar.gz /work/SRC/openSUSE:Factory/.cacti.new/cacti-1.1.19.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package python-QtPy for openSUSE:Factory checked in at 2017-08-29 11:46:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-QtPy (Old)
and /work/SRC/openSUSE:Factory/.python-QtPy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-QtPy"
Tue Aug 29 11:46:28 2017 rev:2 rq:519187 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-QtPy/python-QtPy.changes 2017-05-27 13:14:38.791047599 +0200
+++ /work/SRC/openSUSE:Factory/.python-QtPy.new/python-QtPy.changes 2017-08-29 11:47:45.269251682 +0200
@@ -1,0 +2,34 @@
+Mon Aug 28 16:05:01 UTC 2017 - toddrme2178(a)gmail.com
+
+- Update to Version 1.3.1
+ + Bugs fixed
+ * Spurious cache files in PyPI tarball
+ * Importing qtpy should not raise exceptions
+ * No cache files included in the release tarball
+ * Remove Quantified Code badge because the service doesn't exist anymore
+ * Warn if QHeaderView deprecated methods are used
+- Update to Version 1.3
+ + New features
+ * Add support for PySide2
+ * Add support for QtMultimedia
+ * Add support for PyQt 4.6
+ + Bugs fixed
+ * Typo in readme title
+ * Update Readme for 1.3 release
+ * Add tests for untested modules
+ * Missing: QtOpenGL Module
+ * QDesktopServices split into QDesktopServices and QStandardPaths
+ * qInstallMessageHandler <-> qInstallMsgHandler
+ * Feature Request: PySide2 support
+ * Fix typo in Readme.
+ * Add compatibility for the rename of qInstallMsgHandler to qInstallMessageHandler
+ * Update Readme to reflect that we actually use the PySide2 layout
+ * Update Readme to mention that we now support PySide2.
+ * Add tests for Qtdesigner, QtNetwork, QtPrintSupport, QtSvg and QtTest.
+ * Follow QStandardPaths location in Qt5 for PyQt4/PySide
+ * Add a coveragerc file
+ * Add support for PyQt 4.6
+ * Add a new QtOpenGL module
+ * Add PySide2 support
+
+-------------------------------------------------------------------
Old:
----
QtPy-1.2.1.tar.gz
New:
----
QtPy-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-QtPy.spec ++++++
--- /var/tmp/diff_new_pack.UFTpnw/_old 2017-08-29 11:47:46.677053252 +0200
+++ /var/tmp/diff_new_pack.UFTpnw/_new 2017-08-29 11:47:46.697050433 +0200
@@ -15,11 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-%bcond_without tests
+%bcond_without test
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-QtPy
-Version: 1.2.1
+Version: 1.3.1
Release: 0
License: MIT
Summary: Abstraction layer on top of Qt bindings
@@ -32,10 +32,13 @@
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module qt5}
BuildRequires: %{python_module sip}
+%if %{with test}
+BuildRequires: %{python_module pytest}
+%endif
Requires: python-qt5
Requires: python-sip
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+
%python_subpackages
%description
@@ -50,15 +53,21 @@
%prep
%setup -q -n QtPy-%{version}
+sed -i 's/\r$//' LICENSE.txt
%build
%python_build
%install
%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%{python_expand chmod a+x %{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
+sed -i "s|^#!/usr/bin/env python$|#!%__$python|" %{buildroot}%{$python_sitelib}/qtpy/tests/runtests.py
+$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/qtpy/tests/
+$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/qtpy/tests/
+%fdupes %{buildroot}%{$python_sitelib}
+}
-%if %{with tests}
+%if %{with test}
%check
%python_exec setup.py test
%endif
++++++ QtPy-1.2.1.tar.gz -> QtPy-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/CHANGELOG.md new/QtPy-1.3.1/CHANGELOG.md
--- old/QtPy-1.2.1/CHANGELOG.md 2017-01-22 03:08:58.000000000 +0100
+++ new/QtPy-1.3.1/CHANGELOG.md 2017-08-21 18:45:03.000000000 +0200
@@ -1,5 +1,69 @@
# History of changes
+## Version 1.3.1 (2017-08-21)
+
+### Bugs fixed
+
+**Issues**
+
+* [Issue 129](https://github.com/spyder-ide/qtpy/issues/129) - Spurious cache files in PyPI tarball
+* [Issue 119](https://github.com/spyder-ide/qtpy/issues/119) - Importing qtpy should not raise exceptions
+
+In this release 2 issues were closed
+
+**Pull requests**
+
+* [PR 130](https://github.com/spyder-ide/qtpy/pull/130) - PR: No cache files included in the release tarball
+* [PR 126](https://github.com/spyder-ide/qtpy/pull/126) - PR: Remove Quantified Code badge because the service doesn't exist anymore
+* [PR 121](https://github.com/spyder-ide/qtpy/pull/121) - PR: Warn if QHeaderView deprecated methods are used
+
+In this release 3 pull requests were merged
+
+
+----
+
+
+## Version 1.3 (2017-08-12)
+
+### New features
+
+* Add support for PySide2
+* Add support for QtMultimedia
+* Add support for PyQt 4.6
+
+### Bugs fixed
+
+**Issues**
+
+* [Issue 124](https://github.com/spyder-ide/qtpy/issues/124) - Typo in readme title
+* [Issue 111](https://github.com/spyder-ide/qtpy/issues/111) - Update Readme for 1.3 release
+* [Issue 110](https://github.com/spyder-ide/qtpy/issues/110) - Add tests for untested modules
+* [Issue 101](https://github.com/spyder-ide/qtpy/issues/101) - Missing: QtOpenGL Module
+* [Issue 89](https://github.com/spyder-ide/qtpy/issues/89) - QDesktopServices split into QDesktopServices and QStandardPaths
+* [Issue 57](https://github.com/spyder-ide/qtpy/issues/57) - qInstallMessageHandler <-> qInstallMsgHandler
+* [Issue 15](https://github.com/spyder-ide/qtpy/issues/15) - Feature Request: PySide2 support
+
+In this release 7 issues were closed
+
+**Pull requests**
+
+* [PR 125](https://github.com/spyder-ide/qtpy/pull/125) - PR: Fix typo in Readme.
+* [PR 117](https://github.com/spyder-ide/qtpy/pull/117) - PR: Add compatibility for the rename of qInstallMsgHandler to qInstallMessageHandler
+* [PR 115](https://github.com/spyder-ide/qtpy/pull/115) - PR: Update Readme to reflect that we actually use the PySide2 layout
+* [PR 114](https://github.com/spyder-ide/qtpy/pull/114) - PR: Update Readme to mention that we now support PySide2.
+* [PR 113](https://github.com/spyder-ide/qtpy/pull/113) - PR: Add tests for Qtdesigner, QtNetwork, QtPrintSupport, QtSvg and QtTest.
+* [PR 112](https://github.com/spyder-ide/qtpy/pull/112) - PR: Follow QStandardPaths location in Qt5 for PyQt4/PySide
+* [PR 109](https://github.com/spyder-ide/qtpy/pull/109) - PR: Add a coveragerc file
+* [PR 106](https://github.com/spyder-ide/qtpy/pull/106) - PR: Add support for PyQt 4.6
+* [PR 102](https://github.com/spyder-ide/qtpy/pull/102) - PR: Add a new QtOpenGL module
+* [PR 84](https://github.com/spyder-ide/qtpy/pull/84) - PR: Add PySide2 support
+
+In this release 10 pull requests were merged
+
+
+----
+
+
## Version 1.2.1 (2017/01/21)
### Bugs fixed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/MANIFEST.in new/QtPy-1.3.1/MANIFEST.in
--- old/QtPy-1.2.1/MANIFEST.in 2017-01-22 03:05:55.000000000 +0100
+++ new/QtPy-1.3.1/MANIFEST.in 2017-08-21 18:38:49.000000000 +0200
@@ -2,4 +2,4 @@
include CHANGELOG.md
include LICENSE.txt
include README.md
-recursive-include qtpy/tests *
+recursive-include qtpy/tests *.py *.ui
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/PKG-INFO new/QtPy-1.3.1/PKG-INFO
--- old/QtPy-1.2.1/PKG-INFO 2017-01-22 03:10:28.000000000 +0100
+++ new/QtPy-1.3.1/PKG-INFO 2017-08-21 18:47:29.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: QtPy
-Version: 1.2.1
+Version: 1.3.1
Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Gonzalo Peña-Castellanos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/QtPy.egg-info/PKG-INFO new/QtPy-1.3.1/QtPy.egg-info/PKG-INFO
--- old/QtPy-1.2.1/QtPy.egg-info/PKG-INFO 2017-01-22 03:10:27.000000000 +0100
+++ new/QtPy-1.3.1/QtPy.egg-info/PKG-INFO 2017-08-21 18:47:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: QtPy
-Version: 1.2.1
+Version: 1.3.1
Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.
Home-page: https://github.com/spyder-ide/qtpy
Author: Gonzalo Peña-Castellanos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/QtPy.egg-info/SOURCES.txt new/QtPy-1.3.1/QtPy.egg-info/SOURCES.txt
--- old/QtPy-1.2.1/QtPy.egg-info/SOURCES.txt 2017-01-22 03:10:28.000000000 +0100
+++ new/QtPy-1.3.1/QtPy.egg-info/SOURCES.txt 2017-08-21 18:47:29.000000000 +0200
@@ -14,6 +14,7 @@
qtpy/QtGui.py
qtpy/QtMultimedia.py
qtpy/QtNetwork.py
+qtpy/QtOpenGL.py
qtpy/QtPrintSupport.py
qtpy/QtSvg.py
qtpy/QtTest.py
@@ -27,6 +28,7 @@
qtpy/_patch/__init__.py
qtpy/_patch/qcombobox.py
qtpy/_patch/qheaderview.py
+qtpy/tests/__init__.py
qtpy/tests/conftest.py
qtpy/tests/runtests.py
qtpy/tests/test.ui
@@ -34,10 +36,12 @@
qtpy/tests/test_main.py
qtpy/tests/test_patch_qcombobox.py
qtpy/tests/test_patch_qheaderview.py
+qtpy/tests/test_qdesktopservice_split.py
+qtpy/tests/test_qtcore.py
+qtpy/tests/test_qtdesigner.py
qtpy/tests/test_qtmultimedia.py
-qtpy/tests/test_uic.py
-qtpy/tests/__pycache__/conftest.cpython-35.pyc
-qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc
-qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc
\ No newline at end of file
+qtpy/tests/test_qtnetwork.py
+qtpy/tests/test_qtprintsupport.py
+qtpy/tests/test_qtsvg.py
+qtpy/tests/test_qttest.py
+qtpy/tests/test_uic.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/README.md new/QtPy-1.3.1/README.md
--- old/QtPy-1.2.1/README.md 2017-01-22 03:07:05.000000000 +0100
+++ new/QtPy-1.3.1/README.md 2017-08-12 17:45:55.000000000 +0200
@@ -1,4 +1,4 @@
-# QtPy: Abtraction layer for PyQt5/PyQt4/PySide
+# QtPy: Abstraction layer for PyQt5/PyQt4/PySide2/PySide
Copyright © 2009- The Spyder Development Team.
@@ -11,7 +11,6 @@
[![Build status](https://ci.appveyor.com/api/projects/status/62y6i02vhn4hefg0/branch…
[![CircleCI](https://circleci.com/gh/spyder-ide/qtpy.svg?style=shield)](https://circleci.com/gh/spyder-ide/qtpy)
[![Coverage Status](https://coveralls.io/repos/github/spyder-ide/qtpy/badge.svg?branch=master)](https://coveralls.io/github/spyder-ide/qtpy?branch=master)
-[![Code Issues](https://www.quantifiedcode.com/api/v1/project/c769241c7d7f4463b1e6f…
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spyder-ide/qtpy/badges/quality-score.…
## Description
@@ -19,11 +18,11 @@
**QtPy** is a small abstraction layer that lets you
write applications using a single API call to either PyQt or PySide.
-It provides support for PyQt5, PyQt4 and PySide using the PyQt5 layout (where
-the QtGui module has been split into QtGui and QtWidgets).
+It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout
+(where the QtGui module has been split into QtGui and QtWidgets).
-Basically, you write your code as if you were using PyQt5 but import Qt modules
-from `qtpy` instead of `PyQt5`.
+Basically, you write your code as if you were using PySide2 but import Qt modules
+from `qtpy` instead of `PySide2` (or `PyQt5`)
### Attribution and acknowledgements
@@ -46,7 +45,7 @@
### Requirements
-You need PyQt5, PyQt4 or PySide installed in your system to make use
+You need PyQt5, PyQt4, PySide2 or PySide installed in your system to make use
of QtPy. If several of these packages are found, PyQt5 is used by
default unless you set the `QT_API` environment variable.
@@ -54,6 +53,7 @@
* `pyqt5` (to use PyQt5).
* `pyqt` or `pyqt4` (to use PyQt4).
+* `pyside2` (to use PySide2)
* `pyside` (to use PySide).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtCore.py new/QtPy-1.3.1/qtpy/QtCore.py
--- old/QtPy-1.2.1/qtpy/QtCore.py 2017-01-02 23:05:09.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtCore.py 2017-08-12 17:19:03.000000000 +0200
@@ -10,7 +10,7 @@
Provides QtCore classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
@@ -22,6 +22,8 @@
# Those are imported from `import *`
del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
+elif PYSIDE2:
+ from PySide2.QtCore import *
elif PYQT4:
from PyQt4.QtCore import *
# Those are things we inherited from Spyder that fix crazy crashes under
@@ -35,14 +37,58 @@
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
from PyQt4.QtCore import QT_VERSION_STR as __version__
+ from PyQt4.QtCore import qInstallMsgHandler as qInstallMessageHandler
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # This creates a dummy class that emulates QStandardPaths
+ from PyQt4.QtGui import QDesktopServices as _QDesktopServices
+
+ class QStandardPaths():
+ StandardLocation = _QDesktopServices.StandardLocation
+ displayName = _QDesktopServices.displayName
+ DesktopLocation = _QDesktopServices.DesktopLocation
+ DocumentsLocation = _QDesktopServices.DocumentsLocation
+ FontsLocation = _QDesktopServices.FontsLocation
+ ApplicationsLocation = _QDesktopServices.ApplicationsLocation
+ MusicLocation = _QDesktopServices.MusicLocation
+ MoviesLocation = _QDesktopServices.MoviesLocation
+ PicturesLocation = _QDesktopServices.PicturesLocation
+ TempLocation = _QDesktopServices.TempLocation
+ HomeLocation = _QDesktopServices.HomeLocation
+ DataLocation = _QDesktopServices.DataLocation
+ CacheLocation = _QDesktopServices.CacheLocation
# Those are imported from `import *`
- del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
+ del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR, qInstallMsgHandler
elif PYSIDE:
from PySide.QtCore import *
from PySide.QtGui import (QItemSelection, QItemSelectionModel,
QItemSelectionRange, QSortFilterProxyModel,
QStringListModel)
+ from PySide.QtCore import qInstallMsgHandler as qInstallMessageHandler
+ del qInstallMsgHandler
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # This creates a dummy class that emulates QStandardPaths
+ from PySide.QtGui import QDesktopServices as _QDesktopServices
+
+ class QStandardPaths():
+ StandardLocation = _QDesktopServices.StandardLocation
+ displayName = _QDesktopServices.displayName
+ DesktopLocation = _QDesktopServices.DesktopLocation
+ DocumentsLocation = _QDesktopServices.DocumentsLocation
+ FontsLocation = _QDesktopServices.FontsLocation
+ ApplicationsLocation = _QDesktopServices.ApplicationsLocation
+ MusicLocation = _QDesktopServices.MusicLocation
+ MoviesLocation = _QDesktopServices.MoviesLocation
+ PicturesLocation = _QDesktopServices.PicturesLocation
+ TempLocation = _QDesktopServices.TempLocation
+ HomeLocation = _QDesktopServices.HomeLocation
+ DataLocation = _QDesktopServices.DataLocation
+ CacheLocation = _QDesktopServices.CacheLocation
+
import PySide.QtCore
__version__ = PySide.QtCore.__version__
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtGui.py new/QtPy-1.3.1/qtpy/QtGui.py
--- old/QtPy-1.2.1/qtpy/QtGui.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtGui.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,36 +13,46 @@
the ``PyQt5.QtGui`` module.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4, PYSIDE, PYSIDE2, PythonQtError
if PYQT5:
from PyQt5.QtGui import *
+elif PYSIDE2:
+ from PySide2.QtGui import *
elif PYQT4:
+ try:
+ # Older versions of PyQt4 do not provide these
+ from PyQt4.QtGui import (QGlyphRun, QMatrix2x2, QMatrix2x3,
+ QMatrix2x4, QMatrix3x2, QMatrix3x3,
+ QMatrix3x4, QMatrix4x2, QMatrix4x3,
+ QMatrix4x4, QTouchEvent, QQuaternion,
+ QRadialGradient, QRawFont, QStaticText,
+ QVector2D, QVector3D, QVector4D,
+ qFuzzyCompare)
+ except ImportError:
+ pass
from PyQt4.Qt import QKeySequence, QTextCursor
from PyQt4.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
QBrush, QClipboard, QCloseEvent, QColor,
QConicalGradient, QContextMenuEvent, QCursor,
- QDesktopServices, QDoubleValidator, QDrag,
+ QDoubleValidator, QDrag,
QDragEnterEvent, QDragLeaveEvent, QDragMoveEvent,
QDropEvent, QFileOpenEvent, QFocusEvent, QFont,
QFontDatabase, QFontInfo, QFontMetrics,
- QFontMetricsF, QGlyphRun, QGradient, QHelpEvent,
+ QFontMetricsF, QGradient, QHelpEvent,
QHideEvent, QHoverEvent, QIcon, QIconDragEvent,
QIconEngine, QImage, QImageIOHandler, QImageReader,
QImageWriter, QInputEvent, QInputMethodEvent,
QKeyEvent, QLinearGradient,
- QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2,
- QMatrix3x3, QMatrix3x4, QMatrix4x2, QMatrix4x3,
- QMatrix4x4, QMouseEvent, QMoveEvent, QMovie,
+ QMouseEvent, QMoveEvent, QMovie,
QPaintDevice, QPaintEngine, QPaintEngineState,
QPaintEvent, QPainter, QPainterPath,
QPainterPathStroker, QPalette, QPen, QPicture,
QPictureIO, QPixmap, QPixmapCache, QPolygon,
- QPolygonF, QQuaternion, QRadialGradient, QRawFont,
- QRegExpValidator, QRegion, QResizeEvent,
+ QPolygonF, QRegExpValidator, QRegion, QResizeEvent,
QSessionManager, QShortcutEvent, QShowEvent,
- QStandardItem, QStandardItemModel, QStaticText,
+ QStandardItem, QStandardItemModel,
QStatusTipEvent, QSyntaxHighlighter, QTabletEvent,
QTextBlock, QTextBlockFormat, QTextBlockGroup,
QTextBlockUserData, QTextCharFormat,
@@ -53,17 +63,28 @@
QTextLength, QTextLine, QTextList, QTextListFormat,
QTextObject, QTextObjectInterface, QTextOption,
QTextTable, QTextTableCell, QTextTableCellFormat,
- QTextTableFormat, QTouchEvent, QTransform,
- QValidator, QVector2D, QVector3D, QVector4D,
- QWhatsThisClickedEvent, QWheelEvent,
+ QTextTableFormat, QTransform,
+ QValidator, QWhatsThisClickedEvent, QWheelEvent,
QWindowStateChangeEvent, qAlpha, qBlue,
- qFuzzyCompare, qGray, qGreen, qIsGray, qRed, qRgb,
+ qGray, qGreen, qIsGray, qRed, qRgb,
qRgba, QIntValidator)
+
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # It only exposes QDesktopServices that are still in pyqt5
+ from PyQt4.QtGui import QDesktopServices as _QDesktopServices
+
+ class QDesktopServices():
+ openUrl = _QDesktopServices.openUrl
+ setUrlHandler = _QDesktopServices.setUrlHandler
+ unsetUrlHandler = _QDesktopServices.unsetUrlHandler
+
+
elif PYSIDE:
from PySide.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
QBrush, QClipboard, QCloseEvent, QColor,
QConicalGradient, QContextMenuEvent, QCursor,
- QDesktopServices, QDoubleValidator, QDrag,
+ QDoubleValidator, QDrag,
QDragEnterEvent, QDragLeaveEvent, QDragMoveEvent,
QDropEvent, QFileOpenEvent, QFocusEvent, QFont,
QFontDatabase, QFontInfo, QFontMetrics,
@@ -99,5 +120,14 @@
QWindowStateChangeEvent, qAlpha, qBlue,
qGray, qGreen, qIsGray, qRed, qRgb, qRgba,
QIntValidator)
+ # QDesktopServices has has been split into (QDesktopServices and
+ # QStandardPaths) in Qt5
+ # It only exposes QDesktopServices that are still in pyqt5
+ from PySide.QtGui import QDesktopServices as _QDesktopServices
+
+ class QDesktopServices():
+ openUrl = _QDesktopServices.openUrl
+ setUrlHandler = _QDesktopServices.setUrlHandler
+ unsetUrlHandler = _QDesktopServices.unsetUrlHandler
else:
raise PythonQtError('No Qt bindings could be found')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtMultimedia.py new/QtPy-1.3.1/qtpy/QtMultimedia.py
--- old/QtPy-1.2.1/qtpy/QtMultimedia.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtMultimedia.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,10 +1,15 @@
from . import PYQT5
from . import PYQT4
from . import PYSIDE
+from . import PYSIDE2
if PYQT5:
from PyQt5.QtMultimedia import *
+elif PYSIDE2:
+ # Current wheels don't have this module
+ # from PySide2.QtMultimedia import *
+ pass
elif PYQT4:
from PyQt4.QtMultimedia import *
from PyQt4.QtGui import QSound
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtNetwork.py new/QtPy-1.3.1/qtpy/QtNetwork.py
--- old/QtPy-1.2.1/qtpy/QtNetwork.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtNetwork.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,11 +10,13 @@
Provides QtNetwork classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtNetwork import *
+elif PYSIDE2:
+ from PySide2.QtNetwork import *
elif PYQT4:
from PyQt4.QtNetwork import *
elif PYSIDE:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtOpenGL.py new/QtPy-1.3.1/qtpy/QtOpenGL.py
--- old/QtPy-1.2.1/qtpy/QtOpenGL.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtOpenGL.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtOpenGL classes and functions."""
+
+# Local imports
+from . import PYQT4, PYQT5, PYSIDE, PythonQtError
+
+if PYQT5:
+ from PyQt5.QtOpenGL import *
+elif PYQT4:
+ from PyQt4.QtOpenGL import *
+elif PYSIDE:
+ from PySide.QtOpenGL import *
+else:
+ raise PythonQtError('No Qt bindings could be found')
+
+del PYQT4, PYQT5, PYSIDE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtPrintSupport.py new/QtPy-1.3.1/qtpy/QtPrintSupport.py
--- old/QtPy-1.2.1/qtpy/QtPrintSupport.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtPrintSupport.py 2017-05-11 17:36:04.000000000 +0200
@@ -9,11 +9,13 @@
Provides QtPrintSupport classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4,PYSIDE2, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtPrintSupport import *
+elif PYSIDE2:
+ from PySide2.QtPrintSupport import *
elif PYQT4:
from PyQt4.QtGui import (QAbstractPrintDialog, QPageSetupDialog,
QPrintDialog, QPrintEngine, QPrintPreviewDialog,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtSvg.py new/QtPy-1.3.1/qtpy/QtSvg.py
--- old/QtPy-1.2.1/qtpy/QtSvg.py 2017-01-02 22:17:23.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtSvg.py 2017-05-11 17:36:04.000000000 +0200
@@ -8,10 +8,12 @@
"""Provides QtSvg classes and functions."""
# Local imports
-from . import PYQT4, PYQT5, PYSIDE, PythonQtError
+from . import PYQT4, PYSIDE2, PYQT5, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtSvg import *
+elif PYSIDE2:
+ from PySide2.QtSvg import *
elif PYQT4:
from PyQt4.QtSvg import *
elif PYSIDE:
@@ -19,4 +21,4 @@
else:
raise PythonQtError('No Qt bindings could be found')
-del PYQT4, PYQT5, PYSIDE
+del PYQT4, PYQT5, PYSIDE, PYSIDE2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtTest.py new/QtPy-1.3.1/qtpy/QtTest.py
--- old/QtPy-1.2.1/qtpy/QtTest.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtTest.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,11 +10,13 @@
Provides QtTest and functions
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
if PYQT5:
from PyQt5.QtTest import QTest
+elif PYSIDE2:
+ from PySide2.QtTest import QTest
elif PYQT4:
from PyQt4.QtTest import QTest as OldQTest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtWebEngineWidgets.py new/QtPy-1.3.1/qtpy/QtWebEngineWidgets.py
--- old/QtPy-1.2.1/qtpy/QtWebEngineWidgets.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtWebEngineWidgets.py 2017-05-11 17:36:04.000000000 +0200
@@ -10,7 +10,7 @@
Provides QtWebEngineWidgets classes and functions.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
# To test if we are using WebEngine or WebKit
@@ -27,6 +27,18 @@
from PyQt5.QtWebKitWidgets import QWebView as QWebEngineView
from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
+elif PYSIDE2:
+ try:
+ from PySide2.QtWebEngineWidgets import QWebEnginePage
+ from PySide2.QtWebEngineWidgets import QWebEngineView
+ # Current PySide2 wheels seem to be missing this.
+ # from PySide2.QtWebEngineWidgets import QWebEngineSettings
+ except ImportError:
+ from PySide2.QtWebKitWidgets import QWebPage as QWebEnginePage
+ from PySide2.QtWebKitWidgets import QWebView as QWebEngineView
+ # Current PySide2 wheels seem to be missing this.
+ # from PySide2.QtWebKit import QWebSettings as QWebEngineSettings
+ WEBENGINE = False
elif PYQT4:
from PyQt4.QtWebKit import QWebPage as QWebEnginePage
from PyQt4.QtWebKit import QWebView as QWebEngineView
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/QtWidgets.py new/QtPy-1.3.1/qtpy/QtWidgets.py
--- old/QtPy-1.2.1/qtpy/QtWidgets.py 2017-01-02 23:05:09.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/QtWidgets.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,36 +13,46 @@
were the ``PyQt5.QtWidgets`` module.
"""
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
from ._patch.qcombobox import patch_qcombobox
from ._patch.qheaderview import introduce_renamed_methods_qheaderview
if PYQT5:
from PyQt5.QtWidgets import *
+elif PYSIDE2:
+ from PySide2.QtWidgets import *
elif PYQT4:
from PyQt4.QtGui import *
QStyleOptionViewItem = QStyleOptionViewItemV4
del QStyleOptionViewItemV4
# These objects belong to QtGui
+ try:
+ # Older versions of PyQt4 do not provide these
+ del (QGlyphRun,
+ QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2, QMatrix3x3,
+ QMatrix3x4, QMatrix4x2, QMatrix4x3, QMatrix4x4,
+ QQuaternion, QRadialGradient, QRawFont, QRegExpValidator,
+ QStaticText, QTouchEvent, QVector2D, QVector3D, QVector4D,
+ qFuzzyCompare)
+ except NameError:
+ pass
del (QAbstractTextDocumentLayout, QActionEvent, QBitmap, QBrush, QClipboard,
QCloseEvent, QColor, QConicalGradient, QContextMenuEvent, QCursor,
QDesktopServices, QDoubleValidator, QDrag, QDragEnterEvent,
QDragLeaveEvent, QDragMoveEvent, QDropEvent, QFileOpenEvent,
QFocusEvent, QFont, QFontDatabase, QFontInfo, QFontMetrics,
- QFontMetricsF, QGlyphRun, QGradient, QHelpEvent, QHideEvent,
+ QFontMetricsF, QGradient, QHelpEvent, QHideEvent,
QHoverEvent, QIcon, QIconDragEvent, QIconEngine, QImage,
QImageIOHandler, QImageReader, QImageWriter, QInputEvent,
QInputMethodEvent, QKeyEvent, QKeySequence, QLinearGradient,
- QMatrix2x2, QMatrix2x3, QMatrix2x4, QMatrix3x2, QMatrix3x3,
- QMatrix3x4, QMatrix4x2, QMatrix4x3, QMatrix4x4, QMouseEvent,
- QMoveEvent, QMovie, QPaintDevice, QPaintEngine, QPaintEngineState,
- QPaintEvent, QPainter, QPainterPath, QPainterPathStroker, QPalette,
- QPen, QPicture, QPictureIO, QPixmap, QPixmapCache, QPolygon,
- QPolygonF, QQuaternion, QRadialGradient, QRawFont, QRegExpValidator,
+ QMouseEvent, QMoveEvent, QMovie, QPaintDevice, QPaintEngine,
+ QPaintEngineState, QPaintEvent, QPainter, QPainterPath,
+ QPainterPathStroker, QPalette, QPen, QPicture, QPictureIO, QPixmap,
+ QPixmapCache, QPolygon, QPolygonF,
QRegion, QResizeEvent, QSessionManager, QShortcutEvent, QShowEvent,
- QStandardItem, QStandardItemModel, QStaticText, QStatusTipEvent,
+ QStandardItem, QStandardItemModel, QStatusTipEvent,
QSyntaxHighlighter, QTabletEvent, QTextBlock, QTextBlockFormat,
QTextBlockGroup, QTextBlockUserData, QTextCharFormat, QTextCursor,
QTextDocument, QTextDocumentFragment, QTextDocumentWriter,
@@ -50,9 +60,9 @@
QTextImageFormat, QTextInlineObject, QTextItem, QTextLayout,
QTextLength, QTextLine, QTextList, QTextListFormat, QTextObject,
QTextObjectInterface, QTextOption, QTextTable, QTextTableCell,
- QTextTableCellFormat, QTextTableFormat, QTouchEvent, QTransform,
- QValidator, QVector2D, QVector3D, QVector4D, QWhatsThisClickedEvent,
- QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue, qFuzzyCompare,
+ QTextTableCellFormat, QTextTableFormat, QTransform,
+ QValidator, QWhatsThisClickedEvent,
+ QWheelEvent, QWindowStateChangeEvent, qAlpha, qBlue,
qGray, qGreen, qIsGray, qRed, qRgb, qRgba, QIntValidator,
QStringListModel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/__init__.py new/QtPy-1.3.1/qtpy/__init__.py
--- old/QtPy-1.2.1/qtpy/__init__.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/__init__.py 2017-05-11 17:36:04.000000000 +0200
@@ -26,6 +26,17 @@
>>> print(QtWidgets.QWidget)
+PySide2
+======
+
+Set the QT_API environment variable to 'pyside2' before importing other
+packages::
+
+ >>> import os
+ >>> os.environ['QT_API'] = 'pyside2'
+ >>> from qtpy import QtGui, QtWidgets, QtCore
+ >>> print(QtWidgets.QWidget)
+
PyQt4
=====
@@ -55,25 +66,32 @@
# Version of QtPy
from ._version import __version__
-#: Qt API environment variable name
+# Qt API environment variable name
QT_API = 'QT_API'
-#: names of the expected PyQt5 api
+
+# Names of the expected PyQt5 api
PYQT5_API = ['pyqt5']
-#: names of the expected PyQt4 api
+
+# Names of the expected PyQt4 api
PYQT4_API = [
'pyqt', # name used in IPython.qt
'pyqt4' # pyqode.qt original name
]
-#: names of the expected PySide api
+
+# Names of the expected PySide api
PYSIDE_API = ['pyside']
+# Names of the expected PySide2 api
+PYSIDE2_API = ['pyside2']
+
+# Setting a default value for QT_API
os.environ.setdefault(QT_API, 'pyqt5')
API = os.environ[QT_API].lower()
-assert API in (PYQT5_API + PYQT4_API + PYSIDE_API)
+assert API in (PYQT5_API + PYQT4_API + PYSIDE_API + PYSIDE2_API)
is_old_pyqt = is_pyqt46 = False
PYQT5 = True
-PYQT4 = PYSIDE = False
+PYQT4 = PYSIDE = PYSIDE2 = False
class PythonQtError(Exception):
@@ -87,6 +105,17 @@
from PyQt5.Qt import QT_VERSION_STR as QT_VERSION # analysis:ignore
PYSIDE_VERSION = None
except ImportError:
+ API = os.environ['QT_API'] = 'pyside2'
+
+if API in PYSIDE2_API:
+ try:
+ from PySide2 import __version__ as PYSIDE_VERSION # analysis:ignore
+ from PySide2.QtCore import __version__ as QT_VERSION # analysis:ignore
+
+ PYQT_VERSION = None
+ PYQT5 = False
+ PYSIDE2 = True
+ except ImportError:
API = os.environ['QT_API'] = 'pyqt'
if API in PYQT4_API:
@@ -119,13 +148,14 @@
from PySide import __version__ as PYSIDE_VERSION # analysis:ignore
from PySide.QtCore import __version__ as QT_VERSION # analysis:ignore
PYQT_VERSION = None
- PYQT5 = False
+ PYQT5 = PYSIDE2 = False
PYSIDE = True
except ImportError:
raise PythonQtError('No Qt bindings could be found')
API_NAME = {'pyqt5': 'PyQt5', 'pyqt': 'PyQt4', 'pyqt4': 'PyQt4',
- 'pyside': 'PySide'}[API]
+ 'pyside': 'PySide', 'pyside2':'PySide2'}[API]
+
if PYQT4:
import sip
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/_patch/qheaderview.py new/QtPy-1.3.1/qtpy/_patch/qheaderview.py
--- old/QtPy-1.2.1/qtpy/_patch/qheaderview.py 2017-01-02 22:36:20.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/_patch/qheaderview.py 2017-08-21 18:38:49.000000000 +0200
@@ -4,6 +4,7 @@
#
# Licensed under the terms of the MIT License
# (see LICENSE.txt for details)
+import warnings
def introduce_renamed_methods_qheaderview(QHeaderView):
@@ -15,8 +16,9 @@
return _isClickable(self)
QHeaderView.sectionsClickable = sectionsClickable
def isClickable(self):
- raise Exception('isClickable is only available in Qt4. Use '
- 'sectionsClickable instead.')
+ warnings.warn('isClickable is only available in Qt4. Use '
+ 'sectionsClickable instead.', stacklevel=2)
+ return _isClickable(self)
QHeaderView.isClickable = isClickable
@@ -28,8 +30,9 @@
return _isMovable(self)
QHeaderView.sectionsMovable = sectionsMovable
def isMovable(self):
- raise Exception('isMovable is only available in Qt4. Use '
- 'sectionsMovable instead.')
+ warnings.warn('isMovable is only available in Qt4. Use '
+ 'sectionsMovable instead.', stacklevel=2)
+ return _isMovable(self)
QHeaderView.isMovable = isMovable
@@ -41,8 +44,9 @@
return _resizeMode(self, logicalIndex)
QHeaderView.sectionResizeMode = sectionResizeMode
def resizeMode(self, logicalIndex):
- raise Exception('resizeMode is only available in Qt4. Use '
- 'sectionResizeMode instead.')
+ warnings.warn('resizeMode is only available in Qt4. Use '
+ 'sectionResizeMode instead.', stacklevel=2)
+ return _resizeMode(self, logicalIndex)
QHeaderView.resizeMode = resizeMode
_setClickable = QHeaderView.setClickable
@@ -53,8 +57,9 @@
return _setClickable(self, clickable)
QHeaderView.setSectionsClickable = setSectionsClickable
def setClickable(self, clickable):
- raise Exception('setClickable is only available in Qt4. Use '
- 'setSectionsClickable instead.')
+ warnings.warn('setClickable is only available in Qt4. Use '
+ 'setSectionsClickable instead.', stacklevel=2)
+ return _setClickable(self, clickable)
QHeaderView.setClickable = setClickable
@@ -66,8 +71,9 @@
return _setMovable(self, movable)
QHeaderView.setSectionsMovable = setSectionsMovable
def setMovable(self, movable):
- raise Exception('setMovable is only available in Qt4. Use '
- 'setSectionsMovable instead.')
+ warnings.warn('setMovable is only available in Qt4. Use '
+ 'setSectionsMovable instead.', stacklevel=2)
+ return _setMovable(self, movable)
QHeaderView.setMovable = setMovable
@@ -80,8 +86,9 @@
_setResizeMode(self, *args)
QHeaderView.setSectionResizeMode = setSectionResizeMode
def setResizeMode(self, *args):
- raise Exception('setResizeMode is only available in Qt4. Use '
- 'setSectionResizeMode instead.')
+ warnings.warn('setResizeMode is only available in Qt4. Use '
+ 'setSectionResizeMode instead.', stacklevel=2)
+ _setResizeMode(self, *args)
QHeaderView.setResizeMode = setResizeMode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/_version.py new/QtPy-1.3.1/qtpy/_version.py
--- old/QtPy-1.2.1/qtpy/_version.py 2017-01-22 03:09:46.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/_version.py 2017-08-21 18:46:27.000000000 +0200
@@ -1,2 +1,2 @@
-version_info = (1, 2, 1)
+version_info = (1, 3, 1)
__version__ = '.'.join(map(str, version_info))
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/conftest.cpython-35.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/conftest.cpython-35.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_main.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_patch_qcombobox.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_qtmultimedia.cpython-35-PYTEST.pyc differ
Binary files old/QtPy-1.2.1/qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc and new/QtPy-1.3.1/qtpy/tests/__pycache__/test_uic.cpython-35-PYTEST.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/conftest.py new/QtPy-1.3.1/qtpy/tests/conftest.py
--- old/QtPy-1.2.1/qtpy/tests/conftest.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/conftest.py 2017-05-11 17:36:04.000000000 +0200
@@ -55,5 +55,17 @@
versions += 'unknown version'
versions += os.linesep
+ versions += 'PySide2: '
+
+ try:
+ import PySide2
+ from PySide2 import QtCore
+ versions += "PySide: {0} - Qt: {1}".format(PySide2.__version__, QtCore.__version__)
+ except ImportError:
+ versions += 'not installed'
+ except AttributeError:
+ versions += 'unknown version'
+
+ versions += os.linesep
return versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_main.py new/QtPy-1.3.1/qtpy/tests/test_main.py
--- old/QtPy-1.2.1/qtpy/tests/test_main.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_main.py 2017-05-11 17:36:04.000000000 +0200
@@ -13,6 +13,15 @@
assert QtWidgets.QWidget is PySide.QtGui.QWidget
assert QtWebEngineWidgets.QWebEnginePage is PySide.QtWebKit.QWebPage
+def assert_pyside2():
+ """
+ Make sure that we are using PySide
+ """
+ import PySide2
+ assert QtCore.QEvent is PySide2.QtCore.QEvent
+ assert QtGui.QPainter is PySide2.QtGui.QPainter
+ assert QtWidgets.QWidget is PySide2.QtWidgets.QWidget
+ assert QtWebEngineWidgets.QWebEnginePage is PySide2.QtWebEngineWidgets.QWebEnginePage
def assert_pyqt4():
"""
@@ -52,6 +61,8 @@
assert_pyqt4()
elif QT_API == 'pyqt5':
assert_pyqt5()
+ elif QT_API == 'pyside2':
+ assert_pyside2()
else:
# If the tests are run locally, USE_QT_API and QT_API may not be
# defined, but we still want to make sure qtpy is behaving sensibly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_patch_qcombobox.py new/QtPy-1.3.1/qtpy/tests/test_patch_qcombobox.py
--- old/QtPy-1.2.1/qtpy/tests/test_patch_qcombobox.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_patch_qcombobox.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,6 +1,12 @@
from __future__ import absolute_import
-from qtpy import QtGui, QtWidgets
+import sys
+
+import pytest
+from qtpy import PYSIDE2, QtGui, QtWidgets
+
+
+PY3 = sys.version[0] == "3"
def get_qapp(icon_path=None):
@@ -19,6 +25,7 @@
raise ValueError("Failing")
+(a)pytest.mark.skipif(PY3 or PYSIDE2, reason="It segfaults in Python 3 and PYSIDE2")
def test_patched_qcombobox():
"""
In PySide, using Python objects as userData in QComboBox causes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_patch_qheaderview.py new/QtPy-1.3.1/qtpy/tests/test_patch_qheaderview.py
--- old/QtPy-1.2.1/qtpy/tests/test_patch_qheaderview.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_patch_qheaderview.py 2017-08-21 18:38:49.000000000 +0200
@@ -1,12 +1,17 @@
from __future__ import absolute_import
-from qtpy import PYSIDE, PYQT4
+import sys
+
+import pytest
+from qtpy import PYSIDE, PYSIDE2, PYQT4
from qtpy.QtWidgets import QApplication
from qtpy.QtWidgets import QHeaderView
from qtpy.QtCore import Qt
from qtpy.QtCore import QAbstractListModel
-import pytest
+
+PY3 = sys.version[0] == "3"
+
def get_qapp(icon_path=None):
qapp = QApplication.instance()
@@ -14,6 +19,8 @@
qapp = QApplication([''])
return qapp
+
+(a)pytest.mark.skipif(PY3 or PYSIDE2, reason="It fails on Python 3 and PySide2")
def test_patched_qheaderview():
"""
This will test whether QHeaderView has the new methods introduced in Qt5.
@@ -75,17 +82,17 @@
# test that the old methods in Qt4 raise exceptions
if PYQT4 or PYSIDE:
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.isClickable()
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.isMovable()
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.resizeMode(0)
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
headerview.setClickable(True)
- with pytest.raises(Exception):
- headerview.setMovableClickable(True)
- with pytest.raises(Exception):
+ with pytest.warns(UserWarning):
+ headerview.setMovable(True)
+ with pytest.warns(UserWarning):
headerview.setResizeMode(0, QHeaderView.Interactive)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qdesktopservice_split.py new/QtPy-1.3.1/qtpy/tests/test_qdesktopservice_split.py
--- old/QtPy-1.2.1/qtpy/tests/test_qdesktopservice_split.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qdesktopservice_split.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,28 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2
+
+"""Test QDesktopServices split in Qt5."""
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qstandarpath():
+ """Test the qtpy.QStandardPaths namespace"""
+ from qtpy.QtCore import QStandardPaths
+
+ assert QStandardPaths.StandardLocation is not None
+
+ # Attributes from QDesktopServices shouldn't be in QStandardPaths
+ with pytest.raises(AttributeError) as excinfo:
+ QStandardPaths.setUrlHandler
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qdesktopservice():
+ """Test the qtpy.QDesktopServices namespace"""
+ from qtpy.QtGui import QDesktopServices
+
+ assert QDesktopServices.setUrlHandler is not None
+
+ # Attributes from QStandardPaths shouldn't be in QDesktopServices
+ with pytest.raises(AttributeError) as excinfo:
+ QDesktopServices.StandardLocation
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtcore.py new/QtPy-1.3.1/qtpy/tests/test_qtcore.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtcore.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtcore.py 2017-08-12 17:19:03.000000000 +0200
@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtCore
+
+"""Test QtCore."""
+
+def test_qtmsghandler():
+ """Test the qtpy.QtMsgHandler"""
+ assert QtCore.qInstallMessageHandler is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtdesigner.py new/QtPy-1.3.1/qtpy/tests/test_qtdesigner.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtdesigner.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtdesigner.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,28 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2, PYSIDE
+
+(a)pytest.mark.skipif(PYSIDE2 or PYSIDE, reason="QtDesigner is not avalaible in PySide/PySide2")
+def test_qtdesigner():
+ from qtpy import QtDesigner
+ """Test the qtpy.QtDesigner namespace"""
+ assert QtDesigner.QAbstractExtensionFactory is not None
+ assert QtDesigner.QAbstractExtensionManager is not None
+ assert QtDesigner.QDesignerActionEditorInterface is not None
+ assert QtDesigner.QDesignerContainerExtension is not None
+ assert QtDesigner.QDesignerCustomWidgetCollectionInterface is not None
+ assert QtDesigner.QDesignerCustomWidgetInterface is not None
+ assert QtDesigner.QDesignerFormEditorInterface is not None
+ assert QtDesigner.QDesignerFormWindowCursorInterface is not None
+ assert QtDesigner.QDesignerFormWindowInterface is not None
+ assert QtDesigner.QDesignerFormWindowManagerInterface is not None
+ assert QtDesigner.QDesignerMemberSheetExtension is not None
+ assert QtDesigner.QDesignerObjectInspectorInterface is not None
+ assert QtDesigner.QDesignerPropertyEditorInterface is not None
+ assert QtDesigner.QDesignerPropertySheetExtension is not None
+ assert QtDesigner.QDesignerTaskMenuExtension is not None
+ assert QtDesigner.QDesignerWidgetBoxInterface is not None
+ assert QtDesigner.QExtensionFactory is not None
+ assert QtDesigner.QExtensionManager is not None
+ assert QtDesigner.QFormBuilder is not None
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtmultimedia.py new/QtPy-1.3.1/qtpy/tests/test_qtmultimedia.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtmultimedia.py 2017-01-02 21:13:51.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtmultimedia.py 2017-05-11 17:36:04.000000000 +0200
@@ -1,8 +1,10 @@
from __future__ import absolute_import
-from qtpy import QtMultimedia
+import pytest
+from qtpy import PYSIDE2, QtMultimedia
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
def test_qtmultimedia():
"""Test the qtpy.QtMultimedia namespace"""
assert QtMultimedia.QAbstractVideoBuffer is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtnetwork.py new/QtPy-1.3.1/qtpy/tests/test_qtnetwork.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtnetwork.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtnetwork.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,42 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE, PYSIDE2, QtNetwork
+
+
+(a)pytest.mark.skipif(PYSIDE2 or PYSIDE, reason="It fails on PySide/PySide2")
+def test_qtnetwork():
+ """Test the qtpy.QtNetwork namespace"""
+ assert QtNetwork.QAbstractNetworkCache is not None
+ assert QtNetwork.QNetworkCacheMetaData is not None
+ assert QtNetwork.QHttpMultiPart is not None
+ assert QtNetwork.QHttpPart is not None
+ assert QtNetwork.QNetworkAccessManager is not None
+ assert QtNetwork.QNetworkCookie is not None
+ assert QtNetwork.QNetworkCookieJar is not None
+ assert QtNetwork.QNetworkDiskCache is not None
+ assert QtNetwork.QNetworkReply is not None
+ assert QtNetwork.QNetworkRequest is not None
+ assert QtNetwork.QNetworkConfigurationManager is not None
+ assert QtNetwork.QNetworkConfiguration is not None
+ assert QtNetwork.QNetworkSession is not None
+ assert QtNetwork.QAuthenticator is not None
+ assert QtNetwork.QHostAddress is not None
+ assert QtNetwork.QHostInfo is not None
+ assert QtNetwork.QNetworkAddressEntry is not None
+ assert QtNetwork.QNetworkInterface is not None
+ assert QtNetwork.QNetworkProxy is not None
+ assert QtNetwork.QNetworkProxyFactory is not None
+ assert QtNetwork.QNetworkProxyQuery is not None
+ assert QtNetwork.QAbstractSocket is not None
+ assert QtNetwork.QLocalServer is not None
+ assert QtNetwork.QLocalSocket is not None
+ assert QtNetwork.QTcpServer is not None
+ assert QtNetwork.QTcpSocket is not None
+ assert QtNetwork.QUdpSocket is not None
+ assert QtNetwork.QSslCertificate is not None
+ assert QtNetwork.QSslCipher is not None
+ assert QtNetwork.QSslConfiguration is not None
+ assert QtNetwork.QSslError is not None
+ assert QtNetwork.QSslKey is not None
+ assert QtNetwork.QSslSocket is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtprintsupport.py new/QtPy-1.3.1/qtpy/tests/test_qtprintsupport.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtprintsupport.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtprintsupport.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,18 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtPrintSupport
+
+
+def test_qtprintsupport():
+ """Test the qtpy.QtPrintSupport namespace"""
+ assert QtPrintSupport.QAbstractPrintDialog is not None
+ assert QtPrintSupport.QPageSetupDialog is not None
+ assert QtPrintSupport.QPrintDialog is not None
+ assert QtPrintSupport.QPrintPreviewDialog is not None
+ assert QtPrintSupport.QPrintEngine is not None
+ assert QtPrintSupport.QPrinter is not None
+ assert QtPrintSupport.QPrinterInfo is not None
+ assert QtPrintSupport.QPrintPreviewWidget is not None
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qtsvg.py new/QtPy-1.3.1/qtpy/tests/test_qtsvg.py
--- old/QtPy-1.2.1/qtpy/tests/test_qtsvg.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qtsvg.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import PYSIDE2
+
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
+def test_qtsvg():
+ """Test the qtpy.QtSvg namespace"""
+ from qtpy import QtSvg
+
+ assert QtSvg.QGraphicsSvgItem is not None
+ assert QtSvg.QSvgGenerator is not None
+ assert QtSvg.QSvgRenderer is not None
+ assert QtSvg.QSvgWidget is not None
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_qttest.py new/QtPy-1.3.1/qtpy/tests/test_qttest.py
--- old/QtPy-1.2.1/qtpy/tests/test_qttest.py 1970-01-01 01:00:00.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_qttest.py 2017-05-11 17:36:04.000000000 +0200
@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+import pytest
+from qtpy import QtTest
+
+
+def test_qttest():
+ """Test the qtpy.QtTest namespace"""
+ assert QtTest.QTest is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/tests/test_uic.py new/QtPy-1.3.1/qtpy/tests/test_uic.py
--- old/QtPy-1.2.1/qtpy/tests/test_uic.py 2017-01-06 03:16:17.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/tests/test_uic.py 2017-08-12 17:19:03.000000000 +0200
@@ -2,7 +2,8 @@
import sys
import contextlib
-from qtpy import QtWidgets
+import pytest
+from qtpy import PYSIDE2, QtWidgets
from qtpy.QtWidgets import QComboBox
from qtpy import uic
from qtpy.uic import loadUi
@@ -69,6 +70,7 @@
assert isinstance(ui.comboBox, _QComboBoxSubclass)
+(a)pytest.mark.skipif(PYSIDE2, reason="It fails on PySide2")
def test_load_full_uic():
"""Test that we load the full uic objects for PyQt5 and PyQt4."""
QT_API = os.environ.get('QT_API', '').lower()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.2.1/qtpy/uic.py new/QtPy-1.3.1/qtpy/uic.py
--- old/QtPy-1.2.1/qtpy/uic.py 2017-01-06 03:16:17.000000000 +0100
+++ new/QtPy-1.3.1/qtpy/uic.py 2017-08-12 17:19:03.000000000 +0200
@@ -1,6 +1,6 @@
import os
-from . import PYSIDE, PYQT4, PYQT5
+from . import PYSIDE, PYSIDE2, PYQT4, PYQT5
from .QtWidgets import QComboBox
@@ -12,7 +12,7 @@
from PyQt4.uic import *
-elif PYSIDE:
+else:
__all__ = ['loadUi']
@@ -78,8 +78,12 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
- from PySide.QtCore import QMetaObject
- from PySide.QtUiTools import QUiLoader
+ if PYSIDE:
+ from PySide.QtCore import QMetaObject
+ from PySide.QtUiTools import QUiLoader
+ elif PYSIDE2:
+ from PySide2.QtCore import QMetaObject
+ from PySide2.QtUiTools import QUiLoader
class UiLoader(QUiLoader):
"""
1
0
Hello community,
here is the log from the commit of package mednafen for openSUSE:Factory checked in at 2017-08-29 11:46:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mednafen (Old)
and /work/SRC/openSUSE:Factory/.mednafen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mednafen"
Tue Aug 29 11:46:21 2017 rev:7 rq:519185 version:0.9.47
Changes:
--------
--- /work/SRC/openSUSE:Factory/mednafen/mednafen.changes 2017-08-12 20:27:27.801835080 +0200
+++ /work/SRC/openSUSE:Factory/.mednafen.new/mednafen.changes 2017-08-29 11:47:36.246523444 +0200
@@ -1,0 +2,6 @@
+Sun Aug 27 21:52:03 UTC 2017 - ilya(a)ilya.pp.ua
+
+- Update to mednafen 0.9.47
+ * ChangeLog https://mednafen.github.io/documentation/ChangeLog.txt
+
+-------------------------------------------------------------------
Old:
----
mednafen-0.9.46.tar.xz
New:
----
mednafen-0.9.47.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mednafen.spec ++++++
--- /var/tmp/diff_new_pack.jv1egN/_old 2017-08-29 11:47:37.278378002 +0200
+++ /var/tmp/diff_new_pack.jv1egN/_new 2017-08-29 11:47:37.306374056 +0200
@@ -18,7 +18,7 @@
Name: mednafen
License: GPL-2.0+
Group: System/Emulators/Other
-Version: 0.9.46
+Version: 0.9.47
Release: 0
Summary: Multiple video game console emulator
Source: https://mednafen.github.io/releases/files/%{name}-%{version}.tar.xz
++++++ mednafen-0.9.46.tar.xz -> mednafen-0.9.47.tar.xz ++++++
++++ 8217 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-rope for openSUSE:Factory checked in at 2017-08-29 11:46:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-rope (Old)
and /work/SRC/openSUSE:Factory/.python-rope.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rope"
Tue Aug 29 11:46:17 2017 rev:10 rq:519182 version:0.10.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-rope/python-rope.changes 2017-08-16 16:11:36.115169028 +0200
+++ /work/SRC/openSUSE:Factory/.python-rope.new/python-rope.changes 2017-08-29 11:47:33.618893811 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 16:14:30 UTC 2017 - toddrme2178(a)gmail.com
+
+- update to 0.10.7
+ + Upstream provides no changelog
+- Add tag for CVE-2014-3539-disable-doa.patch
+
+-------------------------------------------------------------------
Old:
----
rope-0.10.5.tar.gz
New:
----
rope-0.10.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-rope.spec ++++++
--- /var/tmp/diff_new_pack.5zAycI/_old 2017-08-29 11:47:35.346650282 +0200
+++ /var/tmp/diff_new_pack.5zAycI/_new 2017-08-29 11:47:35.350649717 +0200
@@ -19,13 +19,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-rope
-Version: 0.10.5
+Version: 0.10.7
Release: 0
Summary: A python refactoring library
License: GPL-2.0+
Group: Development/Languages/Python
Url: https://github.com/python-rope/rope
Source: https://files.pythonhosted.org/packages/source/r/rope/rope-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM - CVE-2014-3539-disable-doa.patch - https://github.com/python-rope/rope/issues/105
Patch0: CVE-2014-3539-disable-doa.patch
BuildRequires: %{python_module devel}
BuildRequires: fdupes
@@ -48,17 +49,19 @@
%install
export LANG=en_US.UTF-8
%{python_install}
-rm -rf %{buildroot}/%{python_sitelib}/python-rope/ropetest/
-%{python_expand %fdupes %{buildroot}/%{$python_sitelib}}
+%{python_expand rm -rf %{buildroot}/%{%python_sitelib}/python-rope/ropetest/
+%fdupes %{buildroot}/%{$python_sitelib}
+}
%if %{with test}
%check
export LANG=en_US.UTF-8
-%{python_exec setup.py test}
+%python_exec setup.py test
%endif
%files %{python_files}
-%doc COPYING README.rst docs/
+%doc COPYING README.rst
+%doc docs/
%{python_sitelib}/
%changelog
++++++ rope-0.10.5.tar.gz -> rope-0.10.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/PKG-INFO new/rope-0.10.7/PKG-INFO
--- old/rope-0.10.5/PKG-INFO 2017-02-23 18:57:18.000000000 +0100
+++ new/rope-0.10.7/PKG-INFO 2017-08-23 06:44:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: rope
-Version: 0.10.5
+Version: 0.10.7
Summary: a python refactoring library...
Home-page: https://github.com/python-rope/rope
Author: Ali Gholami Rudi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/rope/__init__.py new/rope-0.10.7/rope/__init__.py
--- old/rope-0.10.5/rope/__init__.py 2017-02-23 18:56:42.000000000 +0100
+++ new/rope-0.10.7/rope/__init__.py 2017-08-23 06:41:28.000000000 +0200
@@ -1,7 +1,7 @@
"""rope, a python refactoring library"""
INFO = __doc__
-VERSION = '0.10.5'
+VERSION = '0.10.7'
COPYRIGHT = """\
Copyright (C) 2015-2016 Nicholas Smith
Copyright (C) 2014-2015 Matej Cepl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/rope.egg-info/PKG-INFO new/rope-0.10.7/rope.egg-info/PKG-INFO
--- old/rope-0.10.5/rope.egg-info/PKG-INFO 2017-02-23 18:57:18.000000000 +0100
+++ new/rope-0.10.7/rope.egg-info/PKG-INFO 2017-08-23 06:44:12.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: rope
-Version: 0.10.5
+Version: 0.10.7
Summary: a python refactoring library...
Home-page: https://github.com/python-rope/rope
Author: Ali Gholami Rudi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rope-0.10.5/setup.py new/rope-0.10.7/setup.py
--- old/rope-0.10.5/setup.py 2017-02-23 18:56:42.000000000 +0100
+++ new/rope-0.10.7/setup.py 2017-08-23 06:39:32.000000000 +0200
@@ -57,9 +57,9 @@
def get_long_description():
- lines = open('README.rst').read().splitlines(False)
- end = lines.index('Getting Started')
- return '\n' + '\n'.join(lines[:end]) + '\n'
+ lines = open('README.rst', 'rb').read().splitlines(False)
+ end = lines.index(b'Getting Started')
+ return '\n' + str(b'\n'.join(lines[:end])) + '\n'
setup(name='rope',
version=rope.VERSION,
1
0