tags 945605 patch
user ubuntu-de...@lists.ubuntu.com
usertags 945605 origin-ubuntu focal ubuntu-patch

thank you

The attached patch fixes the issue by backporting 2 commits from upstream

diff -Nru python-neovim-0.3.0/debian/changelog python-neovim-0.3.0/debian/changelog
--- python-neovim-0.3.0/debian/changelog	2019-01-08 15:27:39.000000000 +0100
+++ python-neovim-0.3.0/debian/changelog	2019-12-17 16:18:21.000000000 +0100
@@ -1,3 +1,11 @@
+python-neovim (0.3.0-2) UNRELEASED; urgency=medium
+
+  * debian/patches/git_options_handling.patch:
+    - backported some upstream patches to make the test work with the
+      new neovim version (Closes: #945605 )
+
+ -- Sebastien Bacher <seb...@ubuntu.com>  Tue, 17 Dec 2019 16:17:10 +0100
+
 python-neovim (0.3.0-1) unstable; urgency=medium
 
   * New upstream version 0.3.0
diff -Nru python-neovim-0.3.0/debian/patches/git_options_handling.patch python-neovim-0.3.0/debian/patches/git_options_handling.patch
--- python-neovim-0.3.0/debian/patches/git_options_handling.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-neovim-0.3.0/debian/patches/git_options_handling.patch	2019-12-17 16:16:24.000000000 +0100
@@ -0,0 +1,26 @@
+# Description: backport some upstream fixes for the new neovim
+# https://github.com/neovim/pynvim/commit/5a329f22
+# https://github.com/neovim/pynvim/commit/1d121e08
+Index: python-neovim-0.3.0/test/test_vim.py
+===================================================================
+--- python-neovim-0.3.0.orig/test/test_vim.py
++++ python-neovim-0.3.0/test/test_vim.py
+@@ -81,9 +81,15 @@ def test_vars(vim):
+ 
+ 
+ def test_options(vim):
+-    assert vim.options['listchars'] == 'tab:> ,trail:-,nbsp:+'
+-    vim.options['listchars'] = 'tab:xy'
+-    assert vim.options['listchars'] == 'tab:xy'
++    assert vim.options['background'] == 'dark'
++    vim.options['background'] = 'light'
++    assert vim.options['background'] == 'light'
++
++
++def test_local_options(vim):
++    assert vim.windows[0].options['foldmethod'] == 'manual'
++    vim.windows[0].options['foldmethod'] = 'syntax'
++    assert vim.windows[0].options['foldmethod'] == 'syntax'
+ 
+ 
+ def test_buffers(vim):
diff -Nru python-neovim-0.3.0/debian/patches/series python-neovim-0.3.0/debian/patches/series
--- python-neovim-0.3.0/debian/patches/series	2019-01-08 14:50:30.000000000 +0100
+++ python-neovim-0.3.0/debian/patches/series	2019-12-17 16:15:02.000000000 +0100
@@ -1 +1,2 @@
 0001-Add-missing-conftest.py-in-sdist.patch
+git_options_handling.patch

Reply via email to