[Debian-astro-commits] [python-astropy] 01/02: Re-enable unfixed yet tests

[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 e6e60410768e931dedb8c25edde99a955d535c72
Author: Ole Streicher <ole at aip.de>
Date:   Thu Jun 16 14:05:36 2016 +0200

    Re-enable unfixed yet tests
---
 debian/changelog                        |  6 ++++++
 debian/patches/fix_for_pytest_2.8.patch | 37 ---------------------------------
 debian/patches/series                   |  1 +
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b65182..6de5cea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (1.2~rc1-3) UNRELEASED; urgency=low
+
+  * Re-enable unfixed yet tests
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 16 Jun 2016 14:05:13 +0200
+
 python-astropy (1.2~rc1-2) experimental; urgency=low
 
   * Temporarily disable all xfail marks
diff --git a/debian/patches/fix_for_pytest_2.8.patch b/debian/patches/fix_for_pytest_2.8.patch
deleted file mode 100644
index 0d62e9c..0000000
--- a/debian/patches/fix_for_pytest_2.8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e904df784b91fd45e7dfcdec0713c471bb03efff Mon Sep 17 00:00:00 2001
-From: Thomas Robitaille <thomas.robitaille at gmail.com>
-Date: Fri, 1 Jan 2016 19:36:39 +0000
-Bug: https://bugs.debian.org/812648
-Bug: https://github.com/astropy/astropy/pull/4349
-Subject: [PATCH] Fixes to pytest plugins for pytest >= 2.8.0
---- a/astropy/tests/pytest_plugins.py
-+++ b/astropy/tests/pytest_plugins.py
-@@ -161,7 +161,10 @@
-         # handling __doctest_skip__) doesn't happen.
-         def collect(self):
-             if self.fspath.basename == "conftest.py":
--                module = self.config._conftest.importconftest(self.fspath)
-+                try:
-+                    module = self.config._conftest.importconftest(self.fspath)
-+                except AttributeError:  # pytest >= 2.8.0
-+                    module = self.config.pluginmanager._importconftest(self.fspath)
-             else:
-                 try:
-                     module = self.fspath.pyimport()
-@@ -191,8 +194,14 @@
-         def runtest(self):
-             # satisfy `FixtureRequest` constructor...
-             self.funcargs = {}
--            self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {})
--            fixture_request = doctest_plugin.FixtureRequest(self)
-+            try:
-+                self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {})
-+                fixture_request = doctest_plugin.FixtureRequest(self)
-+            except AttributeError:  # pytest >= 2.8.0
-+                python_plugin = config.pluginmanager.getplugin('python')
-+                self._fixtureinfo = python_plugin.FuncFixtureInfo((), [], {})
-+                fixture_request = python_plugin.FixtureRequest(self)
-+
-             failed, tot = doctest.testfile(
-                 str(self.fspath), module_relative=False,
-                 optionflags=opts, parser=DocTestParserPlus(),
diff --git a/debian/patches/series b/debian/patches/series
index a6f2a85..7b0f25c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+mark_known_failures.patch
 disable_helper.patch
 fix_for_cfitsio_3380.patch
 only_python3-binaries.patch

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