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

[Ole Streicher]

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

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

commit 2cbe52e01256b14c61f273ce12ce85327f266962
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Aug 13 10:56:29 2015 +0200

    Adjust patches for new version
---
 debian/changelog                         |  5 +++--
 debian/patches/mark_known_failures.patch | 13 -------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56d7525..01d166c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-python-astropy (1.0.3-4) UNRELEASED; urgency=low
+python-astropy (1.0.4-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * Re-enable dh_strip_nondeterminism override. See #791574 for details.
 
- -- Ole Streicher <olebole at debian.org>  Thu, 06 Aug 2015 09:27:01 +0200
+ -- Ole Streicher <olebole at debian.org>  Thu, 13 Aug 2015 10:50:29 +0200
 
 python-astropy (1.0.3-3) unstable; urgency=low
 
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index a388c74..b66d39f 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -41,16 +41,3 @@ Description: Mark all known test failures as xfail.
  
  if _wcs is not None:
      WCSBase = _wcs._Wcs
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@
- def _square(x):
-     return x ** 2
- 
--
-- at pytest.mark.skipif('not PY3_4 or sys.platform == "win32"')
-+# see https://github.com/astropy/astropy/issues/3886
-+ at pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps

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