[xtensor-python] 02/04: Refresh 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 xtensor-python.

commit d3dc589132281d2a8e6587ab065ff5df4d9cca6a
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Apr 18 19:40:21 2017 +0100

    Refresh the patch queue
---
 ...Support-pybind11-2.0-for-Debian-packaging.patch | 62 +++-------------------
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/debian/patches/Support-pybind11-2.0-for-Debian-packaging.patch b/debian/patches/Support-pybind11-2.0-for-Debian-packaging.patch
index 503128e..891f4cd 100644
--- a/debian/patches/Support-pybind11-2.0-for-Debian-packaging.patch
+++ b/debian/patches/Support-pybind11-2.0-for-Debian-packaging.patch
@@ -3,60 +3,14 @@ Date: Thu, 6 Apr 2017 19:30:22 +0200
 Subject: Support pybind11 2.0 for Debian packaging
 
 ---
- .appveyor.yml                          |  7 ++-----
- .travis.yml                            |  7 ++-----
  include/xtensor-python/pycontainer.hpp | 30 +++++++++++++++++++++++++++++-
- 3 files changed, 33 insertions(+), 11 deletions(-)
+ 1 file changed, 29 insertions(+), 1 deletion(-)
 
-diff --git a/.appveyor.yml b/.appveyor.yml
-index 9090b34..7141d5d 100644
---- a/.appveyor.yml
-+++ b/.appveyor.yml
-@@ -23,13 +23,10 @@ install:
-   - conda update -q conda
-   - conda info -a
-   - conda install gtest cmake -c conda-forge
--  - conda install xtensor==0.8.3 pytest numpy pybind11==2.1.1 -c conda-forge
-+  - conda install xtensor==0.8.3 pytest numpy pybind11==2.0.1 -c conda-forge
-   - "set PYTHONHOME=%MINICONDA%"
--  - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
--  - nmake test_xtensor_python
-+  - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
-   - nmake install
- 
- build_script:
-   - py.test -s
--  - cd test
--  - .\test_xtensor_python
-diff --git a/.travis.yml b/.travis.yml
-index 6a65ae9..2cb0905 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -94,17 +94,14 @@ install:
-     - conda update -q conda
-     # Useful for debugging any issues with conda
-     - conda info -a
--    - conda install xtensor==0.8.3 pytest numpy pybind11==2.1.1 -c conda-forge
-+    - conda install xtensor==0.8.3 pytest numpy pybind11==2.0.1 -c conda-forge
-     - cd test
-     - conda env create -f ./test-environment.yml
-     - source activate test-xtensor-python
-     - cd ..
--    - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
--    - make -j2 test_xtensor_python
-+    - cmake -D BUILD_TESTS=OFF -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
-     - make install
- 
- script:
-     - py.test -s
--    - cd test
--    - ./test_xtensor_python
- 
 diff --git a/include/xtensor-python/pycontainer.hpp b/include/xtensor-python/pycontainer.hpp
-index 34642c1..4d993fe 100644
+index eee5a89..74ae14f 100644
 --- a/include/xtensor-python/pycontainer.hpp
 +++ b/include/xtensor-python/pycontainer.hpp
-@@ -113,6 +113,34 @@ namespace xt
+@@ -118,6 +118,34 @@ namespace xt
  
      namespace detail
      {
@@ -71,8 +25,8 @@ index 34642c1..4d993fe 100644
 +        {
 +            return (n <= 1) ? k : log2(n >> 1, k + 1);
 +        }
-+		
-+        template <typename T>		
++
++        template <typename T>
 +        struct is_fmt_numeric<T, std::enable_if_t<std::is_arithmetic<T>::value>>
 +        {
 +            static constexpr bool value = true;
@@ -80,8 +34,8 @@ index 34642c1..4d993fe 100644
 +                 std::is_integral<T>::value ? log2(sizeof(T)) * 2 + std::is_unsigned<T>::value : 8 + (
 +                     std::is_same<T, double>::value ? 1 : std::is_same<T, long double>::value ? 2 : 0));
 +        };
-+ 	
-+        template <class T>		
++
++        template <class T>
 +        struct is_fmt_numeric<std::complex<T>>
 +        {
 +            static constexpr bool value = true;
@@ -91,7 +45,7 @@ index 34642c1..4d993fe 100644
          template <class T>
          struct numpy_traits
          {
-@@ -130,7 +158,7 @@ namespace xt
+@@ -135,7 +163,7 @@ namespace xt
  
              using value_type = std::remove_const_t<T>;
  

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