[python-ltfatpy] 03/06: Update the patch queue

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-ltfatpy.

commit 346f5290190aa9336004f2b8b15ff5efd1ed0c27
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Jul 9 23:36:10 2017 +0100

    Update the patch queue
    
    - Drop No-coverage.patch, superseded by new patch
    - Drop Fix-Unicode-errors.patch, applied upstream
    - Drop Install-the-tests.patch, applied upstream
    - New patch No-pytest-options.patch
    
    Gbp-Dch: Full
---
 debian/patches/Fix-Unicode-errors.patch            | 22 -----------
 debian/patches/Install-the-tests.patch             | 45 ----------------------
 .../{No-coverage.patch => No-pytest-options.patch} | 24 +++++-------
 debian/patches/series                              |  4 +-
 4 files changed, 10 insertions(+), 85 deletions(-)

diff --git a/debian/patches/Fix-Unicode-errors.patch b/debian/patches/Fix-Unicode-errors.patch
deleted file mode 100644
index f66105d..0000000
--- a/debian/patches/Fix-Unicode-errors.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sun, 16 Apr 2017 22:07:53 +0100
-Subject: Fix Unicode errors
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index ba394b7..478f87d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -212,7 +212,8 @@ class m_build_ext(build_ext):
- ##########################
- def read(*paths):
-     """Build a file path from *paths* and return the contents."""
--    with open(os.path.join(*paths), 'r') as f:
-+    from io import open
-+    with open(os.path.join(*paths), 'r', encoding='utf-8') as f:
-         return f.read()
- 
- 
diff --git a/debian/patches/Install-the-tests.patch b/debian/patches/Install-the-tests.patch
deleted file mode 100644
index 5668f18..0000000
--- a/debian/patches/Install-the-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Mon, 17 Apr 2017 13:28:41 +0100
-Subject: Install the tests
-
----
- setup.py | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 478f87d..88df0a1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -64,14 +64,9 @@ import distutils.spawn as ds
- import distutils.dir_util as dd
- 
- # Always prefer setuptools over distutils
--try:
--    from setuptools import setup, Extension
--    from setuptools.command.clean import clean
--    from setuptools.command.sdist import sdist
--except ImportError:
--    from distutils.core import setup, Extension
--    from distutils.command.clean import clean
--    from distutils.command.sdist import sdist
-+from setuptools import setup, find_packages, Extension
-+from distutils.command.clean import clean
-+from distutils.command.sdist import sdist
- 
- # Test if Cython is installed
- USE_CYTHON = True
-@@ -319,11 +314,10 @@ def setup_package():
-           long_description=(read('README.rst') + '\n\n' +
-                             read('HISTORY.rst') + '\n\n' +
-                             read('AUTHORS.rst')),
--          packages=["ltfatpy", "ltfatpy.comp", "ltfatpy.fourier",
--                    "ltfatpy.gabor", "ltfatpy.signals", "ltfatpy.sigproc",
--                    "ltfatpy.tools"],
-+          packages=find_packages(),
-           package_data={'ltfatpy.signals': ['*.wav'],
--                        'ltfatpy.comp': ['*.pxd']},
-+                        'ltfatpy.comp': ['*.pxd'],
-+                        'ltfatpy.tests.datasets': ['*.mat']},
-           url="https://gitlab.lif.univ-mrs.fr/dev/ltfatpy",
-           license='GNU GPL V3',
-           author='Denis Arrivault and Florent Jaillet',
diff --git a/debian/patches/No-coverage.patch b/debian/patches/No-pytest-options.patch
similarity index 52%
rename from debian/patches/No-coverage.patch
rename to debian/patches/No-pytest-options.patch
index 2b37f87..6e653e0 100644
--- a/debian/patches/No-coverage.patch
+++ b/debian/patches/No-pytest-options.patch
@@ -1,27 +1,21 @@
 From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 19 Apr 2017 19:44:08 +0100
-Subject: No coverage
+Date: Thu, 13 Jul 2017 19:08:04 +0100
+Subject: No pytest options
 
 ---
- setup.cfg | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ setup.cfg | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index 9af616e..a679ec6 100644
+index f7fb1ae..c7b4d4e 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -11,12 +11,6 @@ cover-html-dir=../htmlcov
+@@ -12,8 +12,6 @@ cover-html-dir=../build/htmlcov
+ [pytest]
  # Specifies a minimal pytest version required for running tests.
  minversion = 2.6
- # Specifies the options
+-# Specifies the options
 -addopts = --resultlog=pytests_results.txt -k "not _old" --cov-report term-missing --cov=ltfatpy
-+addopts = --resultlog=pytests_results.txt -k "not _old"
  # Set the directory basename patterns to avoid when recursing for test discovery.
  norecursedirs = .git bin build cmake-modules ltfat_C_kernel sandboxes .settings
--
--[coverage run]
--source=./ltfatpy
--omit = ./ltfatpy/tests/*
--[coverage html]
--directory=../htmlcov
-\ No newline at end of file
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 69f56fe..5cf8b75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-No-coverage.patch
-Fix-Unicode-errors.patch
-Install-the-tests.patch
+No-pytest-options.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-ltfatpy.git