Hello community, here is the log from the commit of package spyder3 for openSUSE:Factory checked in at 2019-11-03 12:10:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder3 (Old) and /work/SRC/openSUSE:Factory/.spyder3.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spyder3" Sun Nov 3 12:10:35 2019 rev:26 rq:744739 version:3.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/spyder3/spyder3.changes 2019-09-16 10:51:24.171164458 +0200 +++ /work/SRC/openSUSE:Factory/.spyder3.new.2990/spyder3.changes 2019-11-03 12:10:37.112440508 +0100 @@ -1,0 +2,5 @@ +Fri Nov 1 11:33:59 UTC 2019 - Ondřej Súkup <[email protected]> + +- add pytest41.patch - fix tests with pytest-4+ + +------------------------------------------------------------------- New: ---- pytest41.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder3.spec ++++++ --- /var/tmp/diff_new_pack.9nX5WP/_old 2019-11-03 12:10:38.160441999 +0100 +++ /var/tmp/diff_new_pack.9nX5WP/_new 2019-11-03 12:10:38.164442005 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %ifarch x86_64 aarch64 ppc64le %{arm} %{ix86} %{ppc} %bcond_without test %else @@ -27,9 +28,9 @@ Url: https://www.spyder-ide.org/ Summary: The Scientific Python Development Environment License: MIT -Group: Development/Languages/Python Source: https://github.com/spyder-ide/spyder/archive/v%{version}.tar.gz#/spyder-%{version}.tar.gz Source1: spyder3-rpmlintrc +Patch0: pytest41.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Pygments >= 2.0 @@ -62,7 +63,7 @@ BuildRequires: python3-matplotlib BuildRequires: python3-opengl BuildRequires: python3-pandas -BuildRequires: python3-pytest < 4.1 +BuildRequires: python3-pytest < 5 BuildRequires: python3-pytest-cov BuildRequires: python3-pytest-mock BuildRequires: python3-pytest-qt @@ -127,7 +128,6 @@ %package breakpoints Summary: Breakpoint plugin for the Spyder IDE -Group: Development/Languages/Python Requires: %{name} = %{version} %description breakpoints @@ -139,7 +139,6 @@ %package dicom Summary: DICOM I/O plugin for the Spyder IDE -Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python3-pydicom @@ -152,7 +151,6 @@ %package hdf5 Summary: HDF5 I/O plugin for the Spyder IDE -Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python3-h5py @@ -165,7 +163,6 @@ %package profiler Summary: Profiler plugin for the Spyder IDE -Group: Development/Languages/Python Requires: %{name} = %{version} %description profiler @@ -177,7 +174,6 @@ %package pylint Summary: Pylint plugin for the Spyder IDE -Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python3-pylint @@ -190,7 +186,6 @@ %package doc Summary: Documentation for the Spyder IDE -Group: Development/Languages/Python Recommends: %{name} = %{version} %description doc @@ -206,6 +201,7 @@ %prep %setup -q -n spyder-%{version} +%patch0 -p1 # Fix wrong-file-end-of-line-encoding RPMLint warning sed -i 's/\r$//' spyder/app/restart.py sed -i 's/\r$//' LICENSE.txt CHANGELOG.md ++++++ pytest41.patch ++++++ Index: spyder-3.3.6/spyder/app/tests/test_mainwindow.py =================================================================== --- spyder-3.3.6.orig/spyder/app/tests/test_mainwindow.py +++ spyder-3.3.6/spyder/app/tests/test_mainwindow.py @@ -151,7 +151,7 @@ def main_window(request): # Check if we need to use introspection in a given test # (it's faster and less memory consuming not to use it!) - use_introspection = request.node.get_marker('use_introspection') + use_introspection = request.node.get_closest_marker('use_introspection') if use_introspection: os.environ['SPY_TEST_USE_INTROSPECTION'] = 'True' else: @@ -161,7 +161,7 @@ def main_window(request): pass # Only use single_instance mode for tests that require it - single_instance = request.node.get_marker('single_instance') + single_instance = request.node.get_closest_marker('single_instance') if single_instance: CONF.set('main', 'single_instance', True) else: Index: spyder-3.3.6/spyder/plugins/tests/test_ipythonconsole.py =================================================================== --- spyder-3.3.6.orig/spyder/plugins/tests/test_ipythonconsole.py +++ spyder-3.3.6/spyder/plugins/tests/test_ipythonconsole.py @@ -92,21 +92,21 @@ def ipyconsole(qtbot, request): CONF.set('ipython_console', 'pylab/backend', 0) # Test the console with a non-ascii temp dir - non_ascii_dir = request.node.get_marker('non_ascii_dir') + non_ascii_dir = request.node.get_closest_marker('non_ascii_dir') if non_ascii_dir: test_dir = NON_ASCII_DIR else: test_dir = None # Instruct the console to not use a stderr file - no_stderr_file = request.node.get_marker('no_stderr_file') + no_stderr_file = request.node.get_closest_marker('no_stderr_file') if no_stderr_file: test_no_stderr = True else: test_no_stderr = False # Use the automatic backend if requested - auto_backend = request.node.get_marker('auto_backend') + auto_backend = request.node.get_closest_marker('auto_backend') if auto_backend: CONF.set('ipython_console', 'pylab/backend', 1) Index: spyder-3.3.6/spyder/widgets/projects/tests/test_project_explorer.py =================================================================== --- spyder-3.3.6.orig/spyder/widgets/projects/tests/test_project_explorer.py +++ spyder-3.3.6/spyder/widgets/projects/tests/test_project_explorer.py @@ -22,7 +22,7 @@ from spyder.py3compat import to_text_str @pytest.fixture def project_explorer(qtbot, request, tmpdir): """Setup Project Explorer widget.""" - directory = request.node.get_marker('change_directory') + directory = request.node.get_closest_marker('change_directory') if directory: project_dir = to_text_string(tmpdir.mkdir('project')) else: Index: spyder-3.3.6/spyder/widgets/tests/test_save.py =================================================================== --- spyder-3.3.6.orig/spyder/widgets/tests/test_save.py +++ spyder-3.3.6/spyder/widgets/tests/test_save.py @@ -57,7 +57,7 @@ def editor_bot(base_editor_bot, request) """ editor_stack, qtbot = base_editor_bot - show_save_dialog = request.node.get_marker('show_save_dialog') + show_save_dialog = request.node.get_closest_marker('show_save_dialog') if show_save_dialog: editor_stack.save_dialog_on_tests = True
