[Debian-astro-commits] [python-astropy] 04/10: Combine last three patches into one

[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 062dd32861dee08292cdd002b26bf15d6b86c01e
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 6 13:28:02 2017 +0100

    Combine last three patches into one
---
 debian/patches/external_configobj.patch            | 14 ------------
 ...ternal_ply.patch => external_python_pkgs.patch} | 25 +++++++++++++++++++++-
 debian/patches/external_six.patch                  | 13 -----------
 debian/patches/series                              |  4 +---
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/debian/patches/external_configobj.patch b/debian/patches/external_configobj.patch
deleted file mode 100644
index 3aa1125..0000000
--- a/debian/patches/external_configobj.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/external_ply.patch b/debian/patches/external_python_pkgs.patch
similarity index 67%
rename from debian/patches/external_ply.patch
rename to debian/patches/external_python_pkgs.patch
index 5d1a8c5..1d7551f 100644
--- a/debian/patches/external_ply.patch
+++ b/debian/patches/external_python_pkgs.patch
@@ -1,5 +1,17 @@
 Author: Ole Streicher <olebole at debian.org>
-Description: Use external module ply instead of convenience copy
+Description: Use external python modules instead of convenience copies
+--- 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__
 --- a/astropy/coordinates/angle_utilities.py
 +++ b/astropy/coordinates/angle_utilities.py
 @@ -64,7 +64,7 @@
@@ -71,3 +83,14 @@ Description: Use external module ply instead of convenience copy
  
          tokens = cls._tokens
  
+--- 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/external_six.patch b/debian/patches/external_six.patch
deleted file mode 100644
index 72023ac..0000000
--- a/debian/patches/external_six.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 78bb793..87d4632 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +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
-external_ply.patch
-external_six.patch
+external_python_pkgs.patch

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