[Debian-astro-commits] [python-astropy] 02/02: Adjust patch for new version

[Ole Streicher]

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

olebole pushed a commit to branch experimental
in repository python-astropy.

commit 675ff1151ffce99492c90677779a05c7179a701c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 8 09:32:28 2015 +0100

    Adjust patch for new version
---
 debian/changelog                         |  6 ++++++
 debian/control                           |  2 ++
 debian/patches/mark_known_failures.patch | 12 ++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49474ab..ed0525e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (1.1~rc2-1) experimental; urgency=low
+
+  * New upstream RC version
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 08 Dec 2015 09:29:29 +0100
+
 python-astropy (1.1~rc1-1) experimental; urgency=low
 
   * New upstream RC version
diff --git a/debian/control b/debian/control
index 9a519fe..524914b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: cython,
                python-matplotlib,
                python-nose,
                python-numpy (>= 1.4),
+               python-pytest,
                python-scipy,
                python-setuptools (>= 0.6.4),
                python-sphinx (>= 1.0.7+dfsg),
@@ -25,6 +26,7 @@ Build-Depends: cython,
                python3-matplotlib,
                python3-nose,
                python3-numpy (>= 1:1.6.2),
+               python3-pytest,
                python3-scipy,
                python3-setuptools (>= 0.6.4),
                wcslib-dev (<< 5) | wcslib-dev (>= 5.8),
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 56ec137..f6b9048 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -68,7 +68,7 @@ Description: Mark all known test failures as xfail.
  
 --- a/astropy/visualization/tests/test_histogram.py
 +++ b/astropy/visualization/tests/test_histogram.py
-@@ -45,6 +45,8 @@
+@@ -50,6 +50,8 @@
      assert patches2[0].axes is ax[1]
  
  
@@ -79,7 +79,15 @@ Description: Mark all known test failures as xfail.
      rng = np.random.RandomState(rseed)
 --- a/astropy/table/tests/test_info.py
 +++ b/astropy/table/tests/test_info.py
-@@ -225,7 +225,8 @@
+@@ -6,6 +6,7 @@
+ import warnings
+ import numpy as np
+ 
++from ...tests.helper import pytest
+ from ...extern import six
+ from ... import units as u
+ from ... import time
+@@ -225,7 +226,8 @@
          t.info(out=out)
          assert out.getvalue().splitlines() == exp
  

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