[Debian-astro-commits] [python-astropy] 01/10: Use external modules configobj and validate instead of convenience copy

[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 f1bec7f6790a7345dddbb7c2a6fa526dcf3caf5f
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 6 12:04:28 2017 +0100

    Use external modules configobj and validate instead of convenience copy
---
 debian/clean                            |  1 +
 debian/control                          |  6 ++++--
 debian/patches/external_configobj.patch | 14 ++++++++++++++
 debian/patches/series                   |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/clean b/debian/clean
index 391fa44..cfafb7d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -13,4 +13,5 @@ astropy/wcs/include/astropy_wcs/wcsconfig.h
 astropy/wcs/include/docstrings.h
 astropy/wcs/include/wcsconfig.h
 astropy/wcs/src/docstrings.c
+astropy/extern/configobj/*
 docs/api/*
diff --git a/debian/control b/debian/control
index 51b6c81..23764ec 100644
--- a/debian/control
+++ b/debian/control
@@ -14,23 +14,25 @@ Build-Depends: cython,
                pkg-config,
                python-all-dev (>= 2.6.6-3~),
                python-astropy-helpers (>= 1.1~),
+               python-configobj,
                python-matplotlib,
                python-nose,
                python-numpy (>= 1.4),
-               python-yaml,
                python-pytest,
                python-scipy,
                python-setuptools (>= 0.6.4),
                python-sphinx (>= 1.0.7+dfsg),
+               python-yaml,
                python3-all-dev,
                python3-astropy-helpers (>= 1.1~),
+               python3-configobj,
                python3-matplotlib,
                python3-nose,
                python3-numpy (>= 1:1.6.2),
-               python3-yaml,
                python3-pytest,
                python3-scipy,
                python3-setuptools (>= 0.6.4),
+               python3-yaml,
                wcslib-dev (<< 5) | wcslib-dev (>= 5.8),
                wcslib-dev (>= 4.24),
                zlib1g-dev
diff --git a/debian/patches/external_configobj.patch b/debian/patches/external_configobj.patch
new file mode 100644
index 0000000..3aa1125
--- /dev/null
+++ b/debian/patches/external_configobj.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Use external modules configobj and validate instead of convenience copy
+--- a/astropy/extern/configobj.py
++++ b/astropy/extern/configobj.py
+@@ -7,5 +7,8 @@
+ Also, this should actually never actually show up as a docstring, because
+ it should get overwritten by the appropriate configobj docstring.
+ """
++from __future__ import absolute_import
++import validate
++import configobj
++
+ 
+-from .configobj import configobj, validate, __doc__
diff --git a/debian/patches/series b/debian/patches/series
index 878c3c8..c9be4f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_for_cfitsio_3380.patch
 only_python3-binaries.patch
 mark_known_failures.patch
 Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch
+external_configobj.patch

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