[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 0b585ade219b8b24afb0046e678ce34b1681199b
Author: Sébastien Fabbro gentoo org>
AuthorDate: Mon Jul 10 18:47:04 2017 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Mon Jul 10 18:49:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b585ade
dev-python/astropy: version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-python/astropy/Manifest| 1 +
dev-python/astropy/astropy-2.0.ebuild | 93
.../files/astropy-2.0-external-python-pkgs.patch | 120 +
3 files changed, 214 insertions(+)
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 93eb031730c..2cb34d56b18 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,2 +1,3 @@
DIST astropy-1.2.1.tar.gz 8179665 SHA256
0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512
2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595
WHIRLPOOL
d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d
DIST astropy-1.3.3.tar.gz 8427036 SHA256
ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99 SHA512
15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5
WHIRLPOOL
a9246b1ba56ecda5eec42e89998f18da4987f611d1154ba8ef5d3480d398fd77c0fdad6c15614885ae722454b9c284b9281ee926fed0f39c314864a015bf658f
+DIST astropy-2.0.tar.gz 8217371 SHA256
cdd60fce57c2be5d93fdc39a8ddf3621c4099026f50617294875273321cd8f99 SHA512
b49289da6564539dc9321cd1bf4c8295ce9c659f501f7cdab6ef97cf34fcd80cd68d734178b99b8aa2ffccd6529b6c03629d384c7155804d12f467973cda90cc
WHIRLPOOL
e90586613c4426f875bbdc9387048a32a5424a1b7d3d11ff1ac0d349de899b7f3f4a2863247cb7329b5261afbe6e648663123aaf33a98c2ba39dc2d556f0dbd0
diff --git a/dev-python/astropy/astropy-2.0.ebuild
b/dev-python/astropy/astropy-2.0.ebuild
new file mode 100644
index 000..539de59e144
--- /dev/null
+++ b/dev-python/astropy/astropy-2.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+MYPV=${PV/_/}
+S=${WORKDIR}/${PN}-${MYPV}
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://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"
+
+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-gallery[${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}"
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: cfe66eaac18ce62aad4e6c441e41ff2efd86ba57
Author: Sébastien Fabbro gentoo org>
AuthorDate: Tue Jun 27 16:58:48 2017 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Wed Jun 28 04:00:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe66eaa
dev-python/astropy: ply-3.10 is not compatible, so to simplify, keep bundled
ply.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-python/astropy/astropy-1.3.3.ebuild| 6 +-
.../files/astropy-1.3.3-external-python-pkgs.patch | 81 +-
2 files changed, 6 insertions(+), 81 deletions(-)
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild
b/dev-python/astropy/astropy-1.3.3.ebuild
index fad05b0a7b5..784a43072ae 100644
--- a/dev-python/astropy/astropy-1.3.3.ebuild
+++ b/dev-python/astropy/astropy-1.3.3.ebuild
@@ -16,11 +16,14 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc 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/ply[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
>=sci-astronomy/erfa-1.3:0=
>=sci-astronomy/wcslib-5:0=
@@ -61,7 +64,6 @@ 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
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
index 41796094060..5c69704df9b 100644
--- 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
@@ -1,3 +1,5 @@
+Edit: bicat...@gentoo.org, ply-3.10 incompatible, so keep bundled.
+
From: Ole Streicher
Date: Thu, 12 Jan 2017 11:37:47 +0100
Subject: Use external python modules instead of convenience copies
@@ -14,19 +16,6 @@ Subject: Use external python modules instead of convenience
copies
astropy/units/format/ogip.py | 4 ++--
9 files changed, 24 insertions(+), 19 deletions(-)
-diff --git a/astropy/coordinates/angle_utilities.py
b/astropy/coordinates/angle_utilities.py
-index cfa894e..bb8fb7d 100644
a/astropy/coordinates/angle_utilities.py
-+++ b/astropy/coordinates/angle_utilities.py
-@@ -64,7 +64,7 @@ class _AngleParser(object):
-
- @classmethod
- def _make_parser(cls):
--from ..extern.ply import lex, yacc
-+from ply import lex, yacc
-
- # List of token names.
- tokens = (
diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py
index 8d1bd8c..e3bb0e0 100644
--- a/astropy/extern/configobj.py
@@ -128,69 +117,3 @@ index 9e88d1f..94bd40a 100644
import pytest
else:
-diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py
-index e40c1cf..0d5e033 100644
a/astropy/units/format/cds.py
-+++ b/astropy/units/format/cds.py
-@@ -78,7 +78,7 @@ class CDS(Base):
-
- @classmethod
- def _make_lexer(cls):
--from ...extern.ply import lex
-+from ply import lex
-
- tokens = cls._tokens
-
-@@ -142,7 +142,7 @@ class CDS(Base):
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 6210899ddc89d87f07c32711f65d2dfaebd42947
Author: Sébastien Fabbro gentoo org>
AuthorDate: Mon Jun 26 03:25:55 2017 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Mon Jun 26 04:16:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6210899d
dev-python/astropy: version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-python/astropy/Manifest| 2 +-
.../{astropy-1.3.ebuild => astropy-1.3.3.ebuild} | 20 +--
.../files/astropy-1.3.3-external-python-pkgs.patch | 196 +
...tch => astropy-1.3.3-mark-known-failures.patch} | 0
4 files changed, 206 insertions(+), 12 deletions(-)
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index fb18d25d266..93eb031730c 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,2 +1,2 @@
DIST astropy-1.2.1.tar.gz 8179665 SHA256
0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512
2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595
WHIRLPOOL
d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d
-DIST astropy-1.3.tar.gz 8372366 SHA256
49de3e86482abe24e3cd02c4a30a469ee4b928d5b46ea5f70fa605ff6f9c6d38 SHA512
1dd667af78be568bd4719d273d432881d7dea03725deb24a045726b315f8e5cd8afac3f6f925867b05c4c7924cd71d7e7d6ae15985a95c7fcc4421e52273983b
WHIRLPOOL
2913c195989c2af0a58ab5e675bd41607bb28273265c0a502c8b1d33925994f9127c9a03058b55aabc1b3a8c594e89ddbd2d5fc38c42dd4723998bad01c7bd45
+DIST astropy-1.3.3.tar.gz 8427036 SHA256
ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99 SHA512
15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5
WHIRLPOOL
a9246b1ba56ecda5eec42e89998f18da4987f611d1154ba8ef5d3480d398fd77c0fdad6c15614885ae722454b9c284b9281ee926fed0f39c314864a015bf658f
diff --git a/dev-python/astropy/astropy-1.3.ebuild
b/dev-python/astropy/astropy-1.3.3.ebuild
similarity index 81%
rename from dev-python/astropy/astropy-1.3.ebuild
rename to dev-python/astropy/astropy-1.3.3.ebuild
index 7fa95760a88..923ff494b4b 100644
--- a/dev-python/astropy/astropy-1.3.ebuild
+++ b/dev-python/astropy/astropy-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 xdg-utils
@@ -24,10 +24,10 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
>=sci-astronomy/erfa-1.3:0=
>=sci-astronomy/wcslib-5:0=
- sci-libs/cfitsio:0=
+ >=sci-libs/cfitsio-3.410:0=
sys-libs/zlib:0="
DEPEND="${RDEPEND}
- >=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
+ dev-python/astropy-helpers[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
virtual/pkgconfig
@@ -37,25 +37,23 @@ DEPEND="${RDEPEND}
dev-python/h5py[${PYTHON_USEDEP}]
dev-python/jplephem[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},jpeg]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/sphinx-gallery[${PYTHON_USEDEP}]
- dev-python/wcsaxes[${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}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
)"
PATCHES=(
- "${FILESDIR}"/${PN}-1.0.4-system-six.patch
- "${FILESDIR}"/${PN}-1.0.4-system-configobj.patch
- "${FILESDIR}"/${PN}-1.3-mark-known-failures.patch
- "${FILESDIR}"/${PN}-1.2.1-cfitsio-338.patch
+ "${FILESDIR}"/${PN}-1.3.3-mark-known-failures.patch
+ "${FILESDIR}"/${PN}-1.3.3-external-python-pkgs.patch
)
python_prepare_all() {
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
new file mode 100644
index 000..41796094060
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
@@ -0,0 +1,196 @@
+From: Ole Streicher
+Date: Thu, 12 Jan 2017 11:37:47 +0100
+Subject: Use external python modules instead of convenience copies
+
+---
+ astropy/coordinates/angle_utilities.py | 2 +-
+
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 3c4b373497aeea66ccd19209c3395b306a880c7e
Author: Sébastien Fabbro gentoo org>
AuthorDate: Wed Dec 28 23:42:26 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Wed Dec 28 23:44:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4b3734
dev-python/astropy: version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/astropy/Manifest| 2 +-
.../{astropy-1.1.2.ebuild => astropy-1.3.ebuild} | 37 --
.../astropy/files/astropy-1.1.2-cfitsio-338.patch | 35 -
.../files/astropy-1.1.2-fix-for-pytest-28.patch| 37 --
.../files/astropy-1.3-mark-known-failures.patch| 84 ++
5 files changed, 100 insertions(+), 95 deletions(-)
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 6cf0a59..fb18d25 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,2 +1,2 @@
-DIST astropy-1.1.2.tar.gz 8059713 SHA256
6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512
b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb
WHIRLPOOL
01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9
DIST astropy-1.2.1.tar.gz 8179665 SHA256
0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512
2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595
WHIRLPOOL
d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d
+DIST astropy-1.3.tar.gz 8372366 SHA256
49de3e86482abe24e3cd02c4a30a469ee4b928d5b46ea5f70fa605ff6f9c6d38 SHA512
1dd667af78be568bd4719d273d432881d7dea03725deb24a045726b315f8e5cd8afac3f6f925867b05c4c7924cd71d7e7d6ae15985a95c7fcc4421e52273983b
WHIRLPOOL
2913c195989c2af0a58ab5e675bd41607bb28273265c0a502c8b1d33925994f9127c9a03058b55aabc1b3a8c594e89ddbd2d5fc38c42dd4723998bad01c7bd45
diff --git a/dev-python/astropy/astropy-1.1.2.ebuild
b/dev-python/astropy/astropy-1.3.ebuild
similarity index 63%
rename from dev-python/astropy/astropy-1.1.2.ebuild
rename to dev-python/astropy/astropy-1.3.ebuild
index c8b61ae..d85184f 100644
--- a/dev-python/astropy/astropy-1.1.2.ebuild
+++ b/dev-python/astropy/astropy-1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit distutils-r1
+inherit distutils-r1 xdg-utils
DESCRIPTION="Core functionality for performing astrophysics with Python"
HOMEPAGE="http://astropy.org/;
@@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="
- >=dev-libs/expat-2.1.0:0=
+ 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/erfa-1.3:0=
>=sci-astronomy/wcslib-5:0=
sci-libs/cfitsio:0=
sys-libs/zlib:0="
@@ -34,13 +34,13 @@ DEPEND="${RDEPEND}
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)
+ dev-libs/libxml2[${PYTHON_USEDEP}]
+ dev-python/h5py[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/wcsaxes[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
)
test? (
dev-libs/libxml2[${PYTHON_USEDEP}]
@@ -50,20 +50,13 @@ DEPEND="${RDEPEND}
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.1.2-fix-for-pytest-28.patch"
- "${FILESDIR}/${PN}-1.1.2-cfitsio-338.patch"
+ "${FILESDIR}"/${PN}-1.0.4-system-six.patch
+ "${FILESDIR}"/${PN}-1.0.4-system-configobj.patch
+ "${FILESDIR}"/${PN}-1.3-mark-known-failures.patch
+
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 63ac55e0f89cd9e634fe37e96176045bed11be29
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Jun 9 16:12:46 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Thu Jun 9 17:23:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ac55e0
dev-python/astropy: force numpy-1.10
Fixing (maybe):
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=585468
Package-Manager: portage-2.3.0_rc1
dev-python/astropy/Manifest| 2 -
dev-python/astropy/astropy-1.0.6.ebuild| 89
dev-python/astropy/astropy-1.1.1.ebuild| 96 --
dev-python/astropy/astropy-1.1.2.ebuild| 2 +-
.../files/astropy-1.0.4-disable_helper.patch | 14
.../files/astropy-1.0.4-system-pytest.patch| 14
.../astropy/files/astropy-1.1.1-fix-wcs.patch | 15
7 files changed, 1 insertion(+), 231 deletions(-)
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 3d68604..2f4f81f 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,3 +1 @@
-DIST astropy-1.0.6.tar.gz 7632331 SHA256
1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512
84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40
WHIRLPOOL
b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02
-DIST astropy-1.1.1.tar.gz 8157305 SHA256
4d2e7a8bd5191a66d7e1a52beefb4a0b6f496a1e9e8212422613219cb514769f SHA512
bc3c370da32d5f0098dbfc2808dba9d4d4424d3dcfba4d7ffd84b39569387b79ad93086e10678c259237f9cfe1229725501d0dc4eba51c9d01a4cd8a72024fb4
WHIRLPOOL
5b40955f56e6f080ad93b224eabd345565ef9f5e7f5ccb00e2737bd714117bc9b35922a044fe4ccaddb9d30fa72e13dd560577392120bfbd0a9d10c8aaa5aa01
DIST astropy-1.1.2.tar.gz 8059713 SHA256
6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512
b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb
WHIRLPOOL
01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9
diff --git a/dev-python/astropy/astropy-1.0.6.ebuild
b/dev-python/astropy/astropy-1.0.6.ebuild
deleted file mode 100644
index b5ae9cd..000
--- a/dev-python/astropy/astropy-1.0.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://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"
-
-RDEPEND="
- >=dev-libs/expat-2.1.0:0=
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-astronomy/erfa-1.2:0=
- >=sci-astronomy/wcslib-4.25:0=
- >=sci-libs/cfitsio-3.350: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? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- )
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.4-disable_helper.patch"
- "${FILESDIR}/${PN}-1.0.4-system-six.patch"
- "${FILESDIR}/${PN}-1.0.4-system-pytest.patch"
- "${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
- )
-
-python_prepare_all() {
- export mydistutilsargs="--offline"
- rm -r ${PN}_helpers || die
- cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
- rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
- #rm -rvf ${PN}/extern/* || die
- #{configobj,{six,pytest,configobj}.py} || die
-
- cat >> setup.cfg <<-EOF
-
- [build]
- use_system_libraries=1
- EOF
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- python_export_best
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${BUILD_DIR}"/lib \
- esetup.py build_sphinx
- fi
-}
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 74951654691dd578db646dec8591eab10f642667
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Mar 17 18:24:48 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Fri Mar 18 20:10:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74951654
dev-python/astropy: Version bump
Package-Manager: portage-2.2.28
dev-python/astropy/Manifest| 1 +
dev-python/astropy/astropy-1.1.2.ebuild| 98 ++
.../astropy/files/astropy-1.1.2-cfitsio-338.patch | 35
.../files/astropy-1.1.2-fix-for-pytest-28.patch| 37
4 files changed, 171 insertions(+)
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index f32eecc..3d68604 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,2 +1,3 @@
DIST astropy-1.0.6.tar.gz 7632331 SHA256
1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512
84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40
WHIRLPOOL
b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02
DIST astropy-1.1.1.tar.gz 8157305 SHA256
4d2e7a8bd5191a66d7e1a52beefb4a0b6f496a1e9e8212422613219cb514769f SHA512
bc3c370da32d5f0098dbfc2808dba9d4d4424d3dcfba4d7ffd84b39569387b79ad93086e10678c259237f9cfe1229725501d0dc4eba51c9d01a4cd8a72024fb4
WHIRLPOOL
5b40955f56e6f080ad93b224eabd345565ef9f5e7f5ccb00e2737bd714117bc9b35922a044fe4ccaddb9d30fa72e13dd560577392120bfbd0a9d10c8aaa5aa01
+DIST astropy-1.1.2.tar.gz 8059713 SHA256
6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512
b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb
WHIRLPOOL
01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9
diff --git a/dev-python/astropy/astropy-1.1.2.ebuild
b/dev-python/astropy/astropy-1.1.2.ebuild
new file mode 100644
index 000..c3bd961
--- /dev/null
+++ b/dev-python/astropy/astropy-1.1.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://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"
+
+RDEPEND="
+ >=dev-libs/expat-2.1.0:0=
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/numpy[${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.1.2-fix-for-pytest-28.patch"
+ "${FILESDIR}/${PN}-1.1.2-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
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: dd405d6fe3d6502c6403a15112e6d924f5913732
Author: Sébastien Fabbro gentoo org>
AuthorDate: Thu Feb 18 18:50:33 2016 +
Commit: Sebastien Fabbro gentoo org>
CommitDate: Thu Feb 18 19:05:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd405d6f
dev-python/astropy: removed old
dev-python/astropy/astropy-1.0.4.ebuild| 84 --
.../astropy/files/astropy--system-pytest.patch | 16 -
2 files changed, 100 deletions(-)
diff --git a/dev-python/astropy/astropy-1.0.4.ebuild
b/dev-python/astropy/astropy-1.0.4.ebuild
deleted file mode 100644
index a9ca39d..000
--- a/dev-python/astropy/astropy-1.0.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://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"
-
-RDEPEND="
- >=dev-libs/expat-2.1.0:0=
- dev-python/configobj[${PYTHON_USEDEP}]
- =sci-astronomy/erfa-1.2:0=
- >=sci-astronomy/wcslib-4.25:0=
- >=sci-libs/cfitsio-3.350: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? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- )
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-disable_helper.patch"
- "${FILESDIR}/${P}-system-six.patch"
- "${FILESDIR}/${P}-system-pytest.patch"
- "${FILESDIR}/${P}-system-configobj.patch"
- )
-
-python_prepare_all() {
- export mydistutilsargs="--offline"
- rm -r ${PN}_helpers || die
- cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
- rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-
- echo "[build]" >> setup.cfg
- echo "use_system_libraries=1" >> setup.cfg
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- python_export_best
- 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/files/astropy--system-pytest.patch
b/dev-python/astropy/files/astropy--system-pytest.patch
deleted file mode 100644
index 19b321d..000
--- a/dev-python/astropy/files/astropy--system-pytest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- astropy/tests/helper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
-index 97d2617..a75db15 100644
a/astropy/tests/helper.py
-+++ b/astropy/tests/helper.py
-@@ -42,7 +42,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 or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in
sys.modules:
- import pytest
-
- else:
[gentoo-commits] repo/gentoo:master commit in: dev-python/astropy/files/, dev-python/astropy/
commit: 9bfc3cd91fb88333c88bd9b6e2976a64f1bc99e2
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 14 11:39:58 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 14 11:55:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfc3cd9
dev-python/astropy: Version Bump
import patches from fedora for unbundling
Closes gentoo/gentoo#10
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=556884
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
dev-python/astropy/astropy-1.0.4.ebuild| 31 +++-
.../files/astropy-1.0.4-system-configobj.patch | 14 ++
.../files/astropy-1.0.4-system-pytest.patch| 14 ++
.../astropy/files/astropy-1.0.4-system-six.patch | 12 +
dev-python/astropy/files/astropy-ply.py| 58 ++
5 files changed, 116 insertions(+), 13 deletions(-)
diff --git a/dev-python/astropy/astropy-1.0.4.ebuild
b/dev-python/astropy/astropy-1.0.4.ebuild
index 88cd6a8..e8700ab 100644
--- a/dev-python/astropy/astropy-1.0.4.ebuild
+++ b/dev-python/astropy/astropy-1.0.4.ebuild
@@ -20,6 +20,8 @@ IUSE="doc test"
RDEPEND="
>=dev-libs/expat-2.1.0:0=
dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
>=sci-astronomy/erfa-1.2:0=
>=sci-astronomy/wcslib-4.25:0=
>=sci-libs/cfitsio-3.350:0=
@@ -42,16 +44,23 @@ DEPEND="${RDEPEND}
sci-libs/scipy[${PYTHON_USEDEP}]
)"
-PATCHES=( "${FILESDIR}/${P}-disable_helper.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-disable_helper.patch"
+ "${FILESDIR}/${P}-system-six.patch"
+ "${FILESDIR}/${P}-system-pytest.patch"
+ "${FILESDIR}/${P}-system-configobj.patch"
+ )
python_prepare_all() {
+ export mydistutilsargs="--offline"
rm -r ${PN}_helpers || die
- rm -r cextern/*/* || die
- distutils-r1_python_prepare_all
-}
+ cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
+ rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+
+ echo "[build]" >> setup.cfg
+ echo "use_system_libraries=1" >> setup.cfg
-python_compile() {
- distutils-r1_python_compile --use-system-libraries --offline
+ distutils-r1_python_prepare_all
}
python_compile_all() {
@@ -60,19 +69,15 @@ python_compile_all() {
VARTEXFONTS="${T}"/fonts \
MPLCONFIGDIR="${BUILD_DIR}" \
PYTHONPATH="${BUILD_DIR}"/lib \
- esetup.py build_sphinx --offline
+ esetup.py build_sphinx
fi
}
python_test() {
- esetup.py --offline test
-}
-
-python_install() {
- distutils-r1_python_install --offline --use-system-libraries
+ py.test -vv -k "not test_web_profile" astropy || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all --offline
+ distutils-r1_python_install_all
}
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
new file mode 100644
index 000..9578c0d
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
@@ -0,0 +1,14 @@
+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.py2014-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-pytest.patch
b/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
new file mode 100644
index 000..638f7e8
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
@@ -0,0 +1,14 @@
+diff -ur astropy-1.0/astropy/tests/helper.py
astropy-1.0.pytest/astropy/tests/helper.py
+--- astropy-1.0/astropy/tests/helper.py2015-02-18 22:45:32.0
+0100
astropy-1.0.pytest/astropy/tests/helper.py 2015-02-19 16:20:28.201778929
+0100
+@@ -35,8 +35,8 @@
+ AstropyDeprecationWarning,
+ AstropyPendingDeprecationWarning)
+ from ..config import configuration
+-
+-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
++# Modified by Fedora package
++if True or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in
sys.modules:
+ import pytest
+
+ else:
diff --git
