[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/, dev-python/astropy/files/

[Mikle Kolyada]

commit:     5511595e336f25098e0ab5f89de3eb73f9f582c8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 17:08:44 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 17:08:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5511595e

dev-python/astropy: remove last-rited pkg

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-python/astropy/Manifest                        |   3 -
 dev-python/astropy/astropy-1.2.1.ebuild            |  98 -----------------
 dev-python/astropy/astropy-1.3.3.ebuild            |  97 -----------------
 dev-python/astropy/astropy-2.0.1.ebuild            |  95 ----------------
 .../files/astropy-1.0.4-system-configobj.patch     |  14 ---
 .../astropy/files/astropy-1.0.4-system-six.patch   |  12 ---
 .../files/astropy-1.1.1-mark-kown-failures.patch   |  99 -----------------
 .../astropy/files/astropy-1.2.1-cfitsio-338.patch  |  16 ---
 .../files/astropy-1.3.3-external-python-pkgs.patch | 119 ---------------------
 .../files/astropy-1.3.3-mark-known-failures.patch  |  84 ---------------
 dev-python/astropy/files/astropy-ply.py            |  58 ----------
 dev-python/astropy/metadata.xml                    |  16 ---
 12 files changed, 711 deletions(-)

diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
deleted file mode 100644
index f8286fd16f0..00000000000
--- a/dev-python/astropy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST astropy-1.2.1.tar.gz 8179665 BLAKE2B d61dbb7a4e56d9a0273dd87fde5b6ed8b2fc8cd206eb51f57621d0ed48adffb76653e1ee5954a7b33ba6e0e2e9d3edb9a5a5afd269d674a899196280fea379fa SHA512 2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595
-DIST astropy-1.3.3.tar.gz 8427036 BLAKE2B 60a9f78f01fe3607314d69bc66180f2afb0ca9a53f7916079f18bf982cff2cda8986823ec03ea8ecd439df6d213547067d04425f43536f37baadc1caa56e9db0 SHA512 15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5
-DIST astropy-2.0.1.tar.gz 8220097 BLAKE2B f9332b828d2204f60a0e032e79fb841235a08ce3be974563fa0818f98d02c95743dc42ec6c8bae5f239c0917b030b073f5a9ee5cbf848682b7d2ca01ef9b5009 SHA512 0677b4f22a9eb7d3334109a639ec14ce904935dc58925d303dc98c27cbac2be7d0e95bd873cc21d3cd92e8e553481d203382c281f91cb7a4e41c27d1ff83aac7

diff --git a/dev-python/astropy/astropy-1.2.1.ebuild b/dev-python/astropy/astropy-1.2.1.ebuild
deleted file mode 100644
index e7786c0fe17..00000000000
--- a/dev-python/astropy/astropy-1.2.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.2:0=
-	>=sci-astronomy/wcslib-5:0=
-	sci-libs/cfitsio:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		$(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]' python2_7)
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
-	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
-	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
-	"${FILESDIR}/${PN}-1.2.1-cfitsio-338.patch"
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	rm -r ${PN}_helpers || die
-	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-	[build]
-	use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup "python2*"
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild
deleted file mode 100644
index 924aeef85f4..00000000000
--- a/dev-python/astropy/astropy-1.3.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# ply-3.10 incompatible, keep bundled (bug #622802)
-#rdep: dev-python/ply[${PYTHON_USEDEP}]
-#prep: cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.3:0=
-	>=sci-astronomy/wcslib-5:0=
-	>=sci-libs/cfitsio-3.410:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/jplephem[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx-gallery[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.3-mark-known-failures.patch
-	"${FILESDIR}"/${PN}-1.3.3-external-python-pkgs.patch
-)
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	#rm -r ${PN}_helpers || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-	[build]
-	use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir -p examples
-		touch examples/README.txt || die
-		python_setup
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_docs --no-intersphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/astropy/astropy-2.0.1.ebuild b/dev-python/astropy/astropy-2.0.1.ebuild
deleted file mode 100644
index 4cc6a45fc86..00000000000
--- a/dev-python/astropy/astropy-2.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 xdg-utils
-
-MYPV=${PV/_/}
-S=${WORKDIR}/${PN}-${MYPV}
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="https://www.astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MYPV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/jplephem[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/mpmath[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/objgraph[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.3:0=
-	>=sci-astronomy/wcslib-5:0=
-	>=sci-libs/cfitsio-3.410:0=
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	sys-libs/zlib:0=
-"
-DEPEND="
-	>=dev-python/astropy-helpers-2[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		${RDEPEND}
-		media-gfx/graphviz
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.9[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mpl[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	rm -r ${PN}_helpers || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-
-		[build]
-		use_system_libraries=1
-	EOF
-	xdg_environment_reset
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts MPLCONFIGDIR="${T}" PYTHONPATH="${BUILD_DIR}"/lib \
-				   esetup.py build_docs --no-intersphinx
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test
-}

diff --git a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
deleted file mode 100644
index 9578c0d4357..00000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur astropy-0.4.1/astropy/config/configuration.py astropy-0.4.1.configobj/astropy/config/configuration.py
---- astropy-0.4.1/astropy/config/configuration.py	2014-09-01 22:41:30.066853605 +0200
-+++ astropy-0.4.1.configobj/astropy/config/configuration.py	2014-09-01 22:40:50.793528942 +0200
-@@ -23,7 +23,8 @@
- import types
- from warnings import warn
- 
--from ..extern.configobj import configobj, validate
-+import configobj
-+import validate
- from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
- from ..utils import find_current_module
- from ..utils.misc import InheritDocstrings
-

diff --git a/dev-python/astropy/files/astropy-1.0.4-system-six.patch b/dev-python/astropy/files/astropy-1.0.4-system-six.patch
deleted file mode 100644
index 8bfab98124b..00000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-six.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur astropy-0.4.1/astropy/extern/six.py astropy-0.4.1.six/astropy/extern/six.py
---- astropy-0.4.1/astropy/extern/six.py	2014-09-01 21:57:56.663393218 +0200
-+++ astropy-0.4.1.six/astropy/extern/six.py	2014-09-01 21:59:02.940933294 +0200
-@@ -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', 'astropy.extern.bundled.six']
- 
- 
- def _find_module(name, path=None):

diff --git a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
deleted file mode 100644
index 2e2c82af541..00000000000
--- a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Mark all known test failures as xfail.
- These failures have been discussed with upstream.
---- a/astropy/io/fits/tests/test_connect.py
-+++ b/astropy/io/fits/tests/test_connect.py
-@@ -136,6 +136,8 @@
-         # while reading is to check whether col.null is present. For float columns, col.null
-         # is not initialized
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read_from_fileobj(self, tmpdir):
-         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
-         hdu = BinTableHDU(self.data)
-@@ -172,6 +174,8 @@
-     def setup_method(self, method):
-         warnings.filterwarnings('always')
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read(self, tmpdir):
-         filename = str(tmpdir.join('test_read.fits'))
-         self.hdus.writeto(filename)
-@@ -189,6 +193,8 @@
-             Table.read(filename, hdu=0)
-         assert exc.value.args[0] == 'No table found in hdu=0'
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     @pytest.mark.parametrize('hdu', [1, 'first'])
-     def test_read_with_hdu_1(self, tmpdir, hdu):
-         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -84,6 +84,8 @@
- if six.PY3 or platform.system() == 'Windows':
-     __doctest_skip__ = ['WCS.all_world2pix']
- 
-+# see https://github.com/astropy/astropy/issues/3380
-+__doctest_skip__ = ['WCS.all_world2pix']
- 
- if _wcs is not None:
-     WCSBase = _wcs._Wcs
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@
- def _square(x):
-     return x ** 2
- 
--
--@×××××××××××.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+@×××××××××××.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps
---- a/astropy/coordinates/tests/test_api_ape5.py
-+++ b/astropy/coordinates/tests/test_api_ape5.py
-@@ -319,7 +319,8 @@
-     # coordinate object, and one that returns a cartesian matrix but does *not*
-     # require `newobj` or `fk5frame` - this allows optimization of the transform.
- 
--
-+# Temporary mark until scipy/numpy is fully on 3.5
-+@×××××××××××.xfail()
- def test_highlevel_api():
-     J2001 = time.Time('J2001', scale='utc')
- 
---- a/astropy/visualization/tests/test_histogram.py
-+++ b/astropy/visualization/tests/test_histogram.py
-@@ -50,6 +50,8 @@
-     assert patches2[0].axes is ax[1]
- 
- 
-+# see https://github.com/astropy/astropy/issues/4329
-+@×××××××××××.xfail()
- @pytest.mark.skipif('not HAS_PLT')
- def test_hist_autobin(rseed=0):
-     rng = np.random.RandomState(rseed)
---- a/astropy/table/tests/test_info.py
-+++ b/astropy/table/tests/test_info.py
-@@ -6,6 +6,7 @@
- import warnings
- import numpy as np
- 
-+from ...tests.helper import pytest
- from ...extern import six
- from ... import units as u
- from ... import time
-@@ -225,7 +226,8 @@
-         t.info(out=out)
-         assert out.getvalue().splitlines() == exp
- 
--
-+# see https://github.com/astropy/astropy/issues/4336
-+@×××××××××××.xfail()
- def test_ignore_warnings():
-     t = table.Table([[np.nan, np.nan]])
-     with warnings.catch_warnings(record=True) as warns:

diff --git a/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch b/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
deleted file mode 100644
index 9a688d95985..00000000000
--- a/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Make TFORMx check more flexible
- The maximal column length in cfitsio changed between version 3370 and 3380.
- This patch checks their syntax, without a specific length.
-Bug: https://github.com/astropy/astropy/issues/4646
---- a/astropy/io/fits/tests/test_image.py
-+++ b/astropy/io/fits/tests/test_image.py
-@@ -1070,7 +1070,7 @@
-         hdu.writeto(self.temp('test.fits'))
- 
-         with fits.open(self.temp('test.fits')) as hdul:
--            assert (hdul['SCI'].data == cube).all()
-+            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
- 
-     def test_subtractive_dither_seed(self):
-         """

diff --git a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
deleted file mode 100644
index 5c69704df9b..00000000000
--- a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Edit: bicatali@g.o, ply-3.10 incompatible, so keep bundled.
-
-From: Ole Streicher <olebole@××××××.org>
-Date: Thu, 12 Jan 2017 11:37:47 +0100
-Subject: Use external python modules instead of convenience copies
-
----
- astropy/coordinates/angle_utilities.py |  2 +-
- astropy/extern/configobj.py            |  5 ++++-
- astropy/extern/six.py                  |  2 +-
- astropy/table/jsviewer.py              | 14 ++++++++------
- astropy/table/tests/test_jsviewer.py   |  6 +++---
- astropy/tests/helper.py                |  2 +-
- astropy/units/format/cds.py            |  4 ++--
- astropy/units/format/generic.py        |  4 ++--
- astropy/units/format/ogip.py           |  4 ++--
- 9 files changed, 24 insertions(+), 19 deletions(-)
-
-diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py
-index 8d1bd8c..e3bb0e0 100644
---- a/astropy/extern/configobj.py
-+++ b/astropy/extern/configobj.py
-@@ -7,5 +7,8 @@ currently installed version of python.
- 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/astropy/extern/six.py b/astropy/extern/six.py
-index 5398fc0..fb3a30c 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 = ['astropy.extern.bundled.six', 'six']
-+_SIX_SEARCH_PATH = ['six']
- 
- 
- def _find_module(name, path=None):
-diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py
-index d0cc380..9f686ea 100644
---- a/astropy/table/jsviewer.py
-+++ b/astropy/table/jsviewer.py
-@@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace):
- conf = Conf()
- 
- 
--EXTERN_JS_DIR = abspath(join(dirname(extern.__file__), 'js'))
--EXTERN_CSS_DIR = abspath(join(dirname(extern.__file__), 'css'))
-+EXTERN_JS_DIR = '/usr/share/javascript'
-+EXTERN_CSS_DIR = EXTERN_JS_DIR
- 
- _SORTING_SCRIPT_PART_1 = """
- var astropy_sort_num = function(a, b) {{
-@@ -134,22 +134,24 @@ class JSViewer(object):
-     @property
-     def jquery_urls(self):
-         if self._use_local_files:
--            return ['file://' + join(EXTERN_JS_DIR, 'jquery-3.1.1.min.js'),
--                    'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min.js')]
-+            return ['file://' + join(EXTERN_JS_DIR, 'jquery', 'jquery.min.js'),
-+                    'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
-+                                     'jquery.dataTables.min.js')]
-         else:
-             return [conf.jquery_url, conf.datatables_url]
- 
-     @property
-     def css_urls(self):
-         if self._use_local_files:
--            return ['file://' + join(EXTERN_CSS_DIR,
-+            return ['file://' + join(EXTERN_CSS_DIR, 'jquery-datatables', 'css',
-                                      'jquery.dataTables.css')]
-         else:
-             return conf.css_urls
- 
-     def _jstable_file(self):
-         if self._use_local_files:
--            return 'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min')
-+            return 'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
-+                                    'jquery.dataTables.min')
-         else:
-             return conf.datatables_url[:-3]
- 
-diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py
-index 6a8b033..5018bd4 100644
---- a/astropy/table/tests/test_jsviewer.py
-+++ b/astropy/table/tests/test_jsviewer.py
-@@ -145,9 +145,9 @@ def test_write_jsviewer_local(tmpdir):
-         table_id='test',
-         length='50',
-         display_length='10, 25, 50, 100, 500, 1000',
--        datatables_css_url='file://' + join(EXTERN_DIR, 'css', 'jquery.dataTables.css'),
--        datatables_js_url='file://' + join(EXTERN_DIR, 'js', 'jquery.dataTables.min.js'),
--        jquery_url='file://' + join(EXTERN_DIR, 'js', 'jquery-3.1.1.min.js')
-+        datatables_css_url='file:///usr/share/javascript/jquery-datatables/css/jquery.dataTables.css',
-+        datatables_js_url='file:///usr/share/javascript/jquery-datatables/jquery.dataTables.min.js',
-+        jquery_url='file:///usr/share/javascript/jquery/jquery.min.js'
-     )
-     with open(tmpfile) as f:
-         assert f.read().strip() == ref.strip()
-diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
-index 9e88d1f..94bd40a 100644
---- a/astropy/tests/helper.py
-+++ b/astropy/tests/helper.py
-@@ -40,7 +40,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
-            'pickle_protocol', 'generic_recursive_equality_test']
- 
- 
--if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-+if True:
-     import pytest
- 
- else:

diff --git a/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch b/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
deleted file mode 100644
index 1a30bc1d10a..00000000000
--- a/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Ole Streicher <olebole@××××××.org>
-Date: Tue, 13 Dec 2016 09:41:39 +0100
-Subject: Mark all known test failures as xfail. These failures have been
- discussed with upstream.
-
----
- astropy/table/tests/test_info.py                                      | 4 +++-
- astropy/tests/tests/test_socketblocker.py                             | 4 ++--
- astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
- astropy/vo/samp/tests/test_standard_profile.py                        | 2 ++
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
-index 2bbcc7a..50fbdb4 100644
---- a/astropy/table/tests/test_info.py
-+++ b/astropy/table/tests/test_info.py
-@@ -8,6 +8,7 @@ from collections import OrderedDict
- 
- import numpy as np
- 
-+from ...tests.helper import pytest
- from ...extern import six
- from ...extern.six.moves import cStringIO as StringIO
- from ... import units as u
-@@ -229,7 +230,8 @@ def test_class_attribute():
-         t.info(out=out)
-         assert out.getvalue().splitlines() == exp
- 
--
-+# see https://github.com/astropy/astropy/issues/4336
-+@×××××××××××.xfail()
- def test_ignore_warnings():
-     t = table.Table([[np.nan, np.nan]])
-     with warnings.catch_warnings(record=True) as warns:
-diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
-index c362fa5..783defe 100644
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
- def _square(x):
-     return x ** 2
- 
--
--@×××××××××××.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+@×××××××××××.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps
-diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-index 53436dd..4c710e7 100644
---- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-+++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
-@@ -3,6 +3,8 @@ from ..core import WCSAxes
- import matplotlib.pyplot as plt
- from matplotlib.backend_bases import KeyEvent
- 
-+import pytest
-+
- from ....wcs import WCS
- from ....extern import six
- from ....coordinates import FK5
-@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests):
- 
-         assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)')
- 
-+    # See https://github.com/astropy/astropy/issues/5601
-+    @pytest.mark.xfail()
-     def test_cube_coords(self, tmpdir):
-         wcs = WCS(self.cube_header)
- 
-diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py
-index 325ac96..ac25e55 100644
---- a/astropy/vo/samp/tests/test_standard_profile.py
-+++ b/astropy/vo/samp/tests/test_standard_profile.py
-@@ -62,6 +62,8 @@ class TestStandardProfile(object):
- 
-         self.hub.stop()
- 
-+    # see https://github.com/astropy/astropy/issues/5460
-+    @pytest.mark.skipif(True, reason="Setup fails due to SSL problems")
-     def test_main(self):
- 
-         self.client1_id = self.client1.get_public_id()

diff --git a/dev-python/astropy/files/astropy-ply.py b/dev-python/astropy/files/astropy-ply.py
deleted file mode 100644
index 19eb104c4ca..00000000000
--- a/dev-python/astropy/files/astropy-ply.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Licensed under a 3-clause BSD style license - see LICENSE.rst
-
-"""
-Handle loading ply package from system or from the bundled copy
-"""
-
-import imp
-from distutils.version import StrictVersion
-
-
-def _find_module(name, path=None):
-    """
-    Alternative to `imp.find_module` that can also search in subpackages.
-    """
-
-    parts = name.split('.')
-
-    for part in parts:
-        if path is not None:
-            path = [path]
-
-        fh, path, descr = imp.find_module(part, path)
-
-    return fh, path, descr
-
-_PLY_MIN_VERSION = StrictVersion('3.4')
-
-# Update this to prevent Astropy from using its bundled copy of ply
-# (but only if some other version of at least _PLY_MIN_VERSION can
-# be provided)
-_PLY_SEARCH_PATH = ['ply']
-
-
-for mod_name in _PLY_SEARCH_PATH:
-    try:
-        mod_info = _find_module(mod_name)
-        #mod_lex_info = _find_module(mod_name + '.lex')
-    except ImportError:
-        continue
-
-    mod = imp.load_module(__name__, *mod_info)
-    #mod_lex = imp.load_module(__name__ + '.lex', *mod_lex_info)
-
-    try:
-    #    if StrictVersion(mod_lex.__version__) >= _PLY_MIN_VERSION:
-    #        break
-        break
-    except (AttributeError, ValueError):
-        # Attribute error if the ply module isn't what it should be and doesn't
-        # have a .__version__; ValueError if the version string exists but is
-        # somehow bogus/unparseable
-        continue
-else:
-    raise ImportError(
-        "Astropy requires the 'ply' module of minimum version {0}; "
-        "normally this is bundled with the astropy package so if you get "
-        "this warning consult the packager of your Astropy "
-        "distribution.".format(_PLY_MIN_VERSION))

diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
deleted file mode 100644
index 85615ff002c..00000000000
--- a/dev-python/astropy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@g.o</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Astropy is a community-driven package intended to contain much of
-  the core functionality and some common tools needed for performing
-  astronomy and astrophysics with Python.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">astropy</remote-id>
-  </upstream>
-</pkgmetadata>