[Debian-astro-commits] [python-astropy] 07/10: Use system pytest

[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 5e13b1fba6dbbec6e80df15d798752350db1195f
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Jan 12 12:13:01 2017 +0100

    Use system pytest
---
 debian/clean                              |  1 +
 debian/patches/external_python_pkgs.patch | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/clean b/debian/clean
index 6653bfb..add9bec 100644
--- a/debian/clean
+++ b/debian/clean
@@ -18,4 +18,5 @@ astropy/extern/ply/*
 astropy/extern/six/*
 astropy/extern/js/*
 astropy/extern/css/*
+astropy/extern/pytest.py
 docs/api/*
diff --git a/debian/patches/external_python_pkgs.patch b/debian/patches/external_python_pkgs.patch
index 33df90a..f4f5238 100644
--- a/debian/patches/external_python_pkgs.patch
+++ b/debian/patches/external_python_pkgs.patch
@@ -8,10 +8,11 @@ Subject: Use external python modules instead of convenience copies
  astropy/extern/six.py                  |  2 +-
  astropy/table/jsviewer.py              | 14 ++++++++------
  astropy/table/tests/test_jsviewer.py   |  6 +++---
+ astropy/tests/helper.py                |  2 +-
  astropy/units/format/cds.py            |  4 ++--
  astropy/units/format/generic.py        |  4 ++--
  astropy/units/format/ogip.py           |  4 ++--
- 8 files changed, 23 insertions(+), 18 deletions(-)
+ 9 files changed, 24 insertions(+), 19 deletions(-)
 
 diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py
 index ddaeaf6..06eefaf 100644
@@ -114,6 +115,19 @@ index af04b7e..e02d4be 100644
      )
      with open(tmpfile) as f:
          assert f.read().strip() == ref.strip()
+diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
+index 9b0bf3b..b9743c5 100644
+--- a/astropy/tests/helper.py
++++ b/astropy/tests/helper.py
+@@ -40,7 +40,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
+            'pickle_protocol', 'generic_recursive_equality_test']
+ 
+ 
+-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
++if True:
+     import pytest
+ 
+ else:
 diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py
 index ecb78e2..d864738 100644
 --- a/astropy/units/format/cds.py

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