[Debian-astro-commits] [python-astropy] 03/04: Revert "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 1b23d8ef1d2794e3c0cb49a4195118deda380f8d
Author: Leo Singer <leo.singer at ligo.org>
Date:   Thu Apr 13 11:43:38 2017 -0400

    Revert "Use bundled version of six"
    
    This reverts commit 322d55bba509073dcbc5bb9d77cb50653846fc02.
---
 debian/README.source                            |  4 ----
 debian/changelog                                |  4 ++--
 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, 7 insertions(+), 35 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index b21f15e..a8ea359 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,3 @@
 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 624fa5f..4ac3162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 python-astropy (1.3-8~bpo8+2) UNRELEASED; urgency=medium
 
-  * Don't use bundled version of ply. A sufficiently new version
-    is now available in jessie-backports.
+  * Don't use bundled versions of ply or six. Sufficiently new
+    versions are now available in jessie-backports.
   * Backport dependency on python-ply >= 3.5 from master.
 
  -- Leo Singer <leo.singer at ligo.org>  Thu, 13 Apr 2017 11:39:25 -0400
diff --git a/debian/clean b/debian/clean
index abaaffd..add9bec 100644
--- a/debian/clean
+++ b/debian/clean
@@ -15,6 +15,7 @@ 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 497631c..4898b6b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: cython,
                python-scipy,
                python-setuptools (>= 0.6.4),
                python-sphinx (>= 1.3),
+               python-six (>= 1.10.0),
                python-yaml,
                python3-all-dev,
                python3-astropy-helpers (>= 1.1~),
@@ -35,6 +36,7 @@ Build-Depends: cython,
                python3-pytest (>= 2.7.0),
                python3-scipy,
                python3-setuptools (>= 0.6.4),
+               python3-six (>= 1.10.0),
                python3-yaml,
                wcslib-dev (>= 5.8),
                zlib1g-dev
@@ -50,6 +52,7 @@ Architecture: any
 Depends: python-configobj,
          python-ply (>= 3.5),
          python-pytest (>= 2.7.0),
+         python-six (>= 1.10.0),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -76,6 +79,7 @@ Architecture: any
 Depends: python3-configobj,
          python3-ply (>= 3.5),
          python3-pytest (>= 2.7.0),
+         python3-six (>= 1.10.0),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
diff --git a/debian/copyright b/debian/copyright
index 9917f98..b79b22b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,12 +53,6 @@ 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
deleted file mode 100644
index 1962e24..0000000
--- a/debian/patches/Use-bundled-version-of-six.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 a37864b..0855047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ 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