[Debian-astro-commits] [python-astropy] 03/10: Use external module six 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 06e3c4e8400c01e7d0ae699ccc51ead2c3e1233b
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 6 13:24:43 2017 +0100

    Use external module six instead of convenience copy
---
 debian/clean                      |  1 +
 debian/control                    |  2 ++
 debian/patches/external_six.patch | 13 +++++++++++++
 debian/patches/series             |  1 +
 4 files changed, 17 insertions(+)

diff --git a/debian/clean b/debian/clean
index 47d14ea..4fe6d4f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -15,4 +15,5 @@ astropy/wcs/include/wcsconfig.h
 astropy/wcs/src/docstrings.c
 astropy/extern/configobj/*
 astropy/extern/ply/*
+astropy/extern/six/*
 docs/api/*
diff --git a/debian/control b/debian/control
index c8f05fb..bafd85f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: cython,
                python-pytest,
                python-scipy,
                python-setuptools (>= 0.6.4),
+               python-six (>= 1.10.0),
                python-sphinx (>= 1.0.7+dfsg),
                python-yaml,
                python3-all-dev,
@@ -34,6 +35,7 @@ Build-Depends: cython,
                python3-pytest,
                python3-scipy,
                python3-setuptools (>= 0.6.4),
+               python3-six (>= 1.10.0),
                python3-yaml,
                wcslib-dev (<< 5) | wcslib-dev (>= 5.8),
                wcslib-dev (>= 4.24),
diff --git a/debian/patches/external_six.patch b/debian/patches/external_six.patch
new file mode 100644
index 0000000..72023ac
--- /dev/null
+++ b/debian/patches/external_six.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Use external module six instead of convenience copy
+--- a/astropy/extern/six.py
++++ b/astropy/extern/six.py
+@@ -13,7 +13,7 @@
+ # Update this to prevent Astropy from using its bundled copy of six
+ # (but only if some other version of at least _SIX_MIN_VERSION can
+ # be provided)
+-_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
++_SIX_SEARCH_PATH = ['six']
+ 
+ 
+ def _find_module(name, path=None):
diff --git a/debian/patches/series b/debian/patches/series
index 0a5c608..78bb793 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ mark_known_failures.patch
 Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch
 external_configobj.patch
 external_ply.patch
+external_six.patch

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