[Debian-astro-commits] [python-astropy] 03/07: Use bundled version of six

[Leo Singer]

This is an automated email from the git hooks/post-receive script.

lsinger-guest pushed a commit to branch debian/jessie-backports
in repository python-astropy.

commit 322d55bba509073dcbc5bb9d77cb50653846fc02
Author: Leo Singer <leo.singer at ligo.org>
Date:   Sun Apr 9 04:23:13 2017 -0400

    Use bundled version of six
    
    jessie-backports does not currently have a sufficiently new version.
---
 debian/README.source                            |  4 ++++
 debian/changelog                                |  2 ++
 debian/clean                                    |  1 -
 debian/control                                  |  4 ----
 debian/copyright                                |  6 ++++++
 debian/patches/Use-bundled-version-of-six.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 7 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index a8ea359..b21f15e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,7 @@
 The unit test `test_metadata_too_large` in `astropy/io/misc/tests/test_hdf5.py`
 has been patched in order to adjust for a slight wording change in an HDF5
 exception message between Jessie and Stretch.
+
+The patch `external_python_pkgs.patch` from master has been partially
+reverted by `Use-bundled-version-of-six.patch` because there is not
+currently a sufficiently new version of python-six in jessie-backports.
diff --git a/debian/changelog b/debian/changelog
index 79988a1..24ec6ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-astropy (1.3-8~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
+  * Use bundled version of six because jessie-backports does not have
+    a sufficiently new version of python-six.
 
  -- Leo Singer <leo.singer at ligo.org>  Sun, 09 Apr 2017 04:15:57 -0400
 
diff --git a/debian/clean b/debian/clean
index add9bec..abaaffd 100644
--- a/debian/clean
+++ b/debian/clean
@@ -15,7 +15,6 @@ astropy/wcs/include/wcsconfig.h
 astropy/wcs/src/docstrings.c
 astropy/extern/configobj/*
 astropy/extern/ply/*
-astropy/extern/six/*
 astropy/extern/js/*
 astropy/extern/css/*
 astropy/extern/pytest.py
diff --git a/debian/control b/debian/control
index 23352a2..47beef3 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ 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,
@@ -36,7 +35,6 @@ Build-Depends: cython,
                python3-pytest,
                python3-scipy,
                python3-setuptools (>= 0.6.4),
-               python3-six (>= 1.10.0),
                python3-yaml,
                wcslib-dev (>= 5.8),
                zlib1g-dev
@@ -52,7 +50,6 @@ Architecture: any
 Depends: python-configobj,
          python-ply,
          python-pytest,
-         python-six (>= 1.10.0),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -79,7 +76,6 @@ Architecture: any
 Depends: python3-configobj,
          python3-ply,
          python3-pytest,
-         python3-six (>= 1.10.0),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
diff --git a/debian/copyright b/debian/copyright
index b79b22b..9917f98 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,6 +53,12 @@ Copyright: 2001-2007 Expat maintainers,
  1998-2003 Thai Open Source Software Center Ltd and Clark Cooper
  2014 jQuery Foundation and other contributors
 License: Expat
+
+Files: astropy/extern/bundled/six.py
+Copyright: Copyright (c) 2010-2015 Benjamin Peterson
+License: Expat
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, includingwithout limitation the rights
diff --git a/debian/patches/Use-bundled-version-of-six.patch b/debian/patches/Use-bundled-version-of-six.patch
new file mode 100644
index 0000000..1962e24
--- /dev/null
+++ b/debian/patches/Use-bundled-version-of-six.patch
@@ -0,0 +1,22 @@
+From: Leo Singer <leo.singer at ligo.org>
+Date: Sun, 9 Apr 2017 04:17:34 -0400
+Subject: Use bundled version of six
+
+jessie-backports does not currently provide a sufficiently new version.
+---
+ astropy/extern/six.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/astropy/extern/six.py b/astropy/extern/six.py
+index fb3a30c..5398fc0 100644
+--- a/astropy/extern/six.py
++++ b/astropy/extern/six.py
+@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0')
+ # 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 = ['six']
++_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
+ 
+ 
+ def _find_module(name, path=None):
diff --git a/debian/patches/series b/debian/patches/series
index 0855047..a37864b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ external_python_pkgs.patch
 Fix-default-value-for-remote_data-option.patch
 Use-parametrize-instead-of-yield.patch
 Allow-pytest-3.x-to-use-plugin-for-doctests-in-.rst-files.patch
+Use-bundled-version-of-six.patch

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