Control: tags 937941 + patch
Control: tags 937941 + pending
Control: tags 945605 + pending

Dear maintainer,

I've prepared an NMU for python-neovim (versioned as 0.3.0-1.1) and 
uploaded it to DELAYED/15. Please feel free to tell me if I should 
cancel it.

cu
Adrian
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 16:27:39.000000000 +0200
+++ python-neovim-0.3.0/debian/changelog	2019-12-23 12:23:24.000000000 +0200
@@ -1,3 +1,16 @@
+python-neovim (0.3.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Stop providing the Python2 package. (Closes: #937941)
+
+  [ Sebastien Bacher ]
+  * debian/patches/git_options_handling.patch:
+    - Backported some upstream patches to make the test work with the
+      new neovim version. (Closes: #945605)
+
+
+ -- Adrian Bunk <b...@debian.org>  Mon, 23 Dec 2019 12:23:24 +0200
+
 python-neovim (0.3.0-1) unstable; urgency=medium
 
   * New upstream version 0.3.0
diff -Nru python-neovim-0.3.0/debian/control python-neovim-0.3.0/debian/control
--- python-neovim-0.3.0/debian/control	2019-01-08 16:13:48.000000000 +0200
+++ python-neovim-0.3.0/debian/control	2019-12-23 12:23:24.000000000 +0200
@@ -7,46 +7,19 @@
 Build-Depends:
  debhelper (>= 11),
  dh-python,
- python-all (>= 2.6.6-3~),
- python-setuptools,
  python3-all,
  python3-setuptools,
-# dependencies for python2:
- python-msgpack (>= 0.5.0),
- python-greenlet,
- cython,
- python-trollius,
 # dependencies for python3:
  python3-msgpack (>= 0.5.0),
  python3-greenlet,
 # dependencies for tests:
  neovim (>= 0.2.1),
- python-pytest (>= 3.4.0),
  python3-pytest (>= 3.4.0),
 Standards-Version: 4.3.0
 Homepage: https://github.com/neovim/python-client
 Vcs-Git: https://salsa.debian.org/python-team/modules/python-neovim.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/python-neovim
 
-
-Package: python-neovim
-Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends}
-Provides:
- ${python:Provides},
- vim-python,
-Breaks: neovim (<< 0.2.1)
-Recommends: neovim
-Description: Python2 library for scripting Neovim processes through its msgpack-rpc API
- Neovim is a Vim fork that focuses on refactoring, extensibility and
- simplification of the original code base.
- .
- This is the Python2 version of the package (If you only use one of python2 or
- python3, it is enough to install that version.)
-
-
 Package: python3-neovim
 Architecture: all
 Depends:
@@ -57,9 +30,6 @@
  vim-python3,
 Breaks: neovim (<< 0.2.1)
 Recommends: neovim
-Description: Python3 library for scripting Neovim processes through its msgpack-rpc API
+Description: Python library for scripting Neovim processes through its msgpack-rpc API
  Neovim is a Vim fork that focuses on refactoring, extensibility and
  simplification of the original code base.
- .
- This is the Python3 version of the package (If you only use one of python2 or
- python3, it is enough to install that version.)
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 02:00:00.000000000 +0200
+++ python-neovim-0.3.0/debian/patches/git_options_handling.patch	2019-12-23 12:23:24.000000000 +0200
@@ -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 15:50:30.000000000 +0200
+++ python-neovim-0.3.0/debian/patches/series	2019-12-23 12:23:24.000000000 +0200
@@ -1 +1,2 @@
 0001-Add-missing-conftest.py-in-sdist.patch
+git_options_handling.patch
diff -Nru python-neovim-0.3.0/debian/python-neovim.docs python-neovim-0.3.0/debian/python-neovim.docs
--- python-neovim-0.3.0/debian/python-neovim.docs	2019-01-08 15:29:30.000000000 +0200
+++ python-neovim-0.3.0/debian/python-neovim.docs	1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-README.md
\ No newline at end of file
diff -Nru python-neovim-0.3.0/debian/rules python-neovim-0.3.0/debian/rules
--- python-neovim-0.3.0/debian/rules	2019-01-08 15:29:30.000000000 +0200
+++ python-neovim-0.3.0/debian/rules	2019-12-23 12:23:24.000000000 +0200
@@ -4,7 +4,7 @@
 export PYBUILD_TEST_ARGS := -vv
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
diff -Nru python-neovim-0.3.0/debian/tests/control python-neovim-0.3.0/debian/tests/control
--- python-neovim-0.3.0/debian/tests/control	2019-01-08 15:29:30.000000000 +0200
+++ python-neovim-0.3.0/debian/tests/control	2019-12-23 12:23:24.000000000 +0200
@@ -1,5 +1,2 @@
-Tests: python-neovim
-Depends: python-neovim, python-pytest (>= 3.4.0), neovim
-
 Tests: python3-neovim
 Depends: python3-neovim, python3-pytest (>= 3.4.0), neovim
diff -Nru python-neovim-0.3.0/debian/tests/python-neovim python-neovim-0.3.0/debian/tests/python-neovim
--- python-neovim-0.3.0/debian/tests/python-neovim	2019-01-08 15:29:30.000000000 +0200
+++ python-neovim-0.3.0/debian/tests/python-neovim	1970-01-01 02:00:00.000000000 +0200
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -eu
-cp -r test "$AUTOPKGTEST_TMP/"
-cd "$AUTOPKGTEST_TMP"
-
-for python in $(pyversions -i); do
-    PYTHONWARNINGS=d $python -m pytest -vv 2>&1
-done
_______________________________________________
Python-modules-team mailing list
Python-modules-team@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to