root
9 years ago
parent
3685168665
commit
d2fd77fbff
@ -1,5 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>emacs</herd>
|
||||
<herd>emacs</herd>
|
||||
<upstream>
|
||||
<remote-id type="github">magnars/dash.el</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,122 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
JAVA_PKG_IUSE="doc"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Mind-mapping software written in Java"
|
||||
HOMEPAGE="http://freemind.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="groovy latex pdf svg"
|
||||
|
||||
CDEPEND="
|
||||
dev-java/javahelp:0
|
||||
dev-java/jgoodies-forms:0
|
||||
dev-java/jibx:0
|
||||
dev-java/jortho:0
|
||||
>=dev-java/simplyhtml-0.13.1:0
|
||||
groovy? ( dev-java/groovy )
|
||||
latex? ( dev-java/hoteqn:0 )
|
||||
pdf? (
|
||||
dev-java/batik:1.8
|
||||
dev-java/fop:0
|
||||
)
|
||||
svg? (
|
||||
dev-java/batik:1.8
|
||||
dev-java/fop:0
|
||||
)"
|
||||
DEPEND="${CDEPEND}
|
||||
>=virtual/jdk-1.6
|
||||
pdf? ( dev-java/avalon-framework:4.2 )
|
||||
svg? ( dev-java/avalon-framework:4.2 )"
|
||||
RDEPEND="${CDEPEND}
|
||||
>=virtual/jre-1.6"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
java_prepare() {
|
||||
chmod +x check_for_duplicate_resources.sh || die
|
||||
|
||||
# someone got it all wrong (set/unset vs. bool)
|
||||
sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
|
||||
|
||||
# disable dmg build on Mac OS X
|
||||
sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
|
||||
|
||||
use groovy || rm plugins/build_scripting.xml || die
|
||||
use latex || rm plugins/build_latex.xml || die
|
||||
use pdf || use svg || rm plugins/build_svg.xml || die
|
||||
# not compatible with releases of jmapviewer
|
||||
rm plugins/build_map.xml || die
|
||||
|
||||
rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local build_files=( $(find "${S}" -name 'build*.xml') )
|
||||
JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
|
||||
JAVA_ANT_REWRITE_CLASSPATH="yes"
|
||||
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
|
||||
JAVA_ANT_ENCODING="utf-8"
|
||||
java-ant-2_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local svg_deps svg_build_deps
|
||||
if use pdf || use svg; then
|
||||
svg_deps="batik-1.8,fop"
|
||||
svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
|
||||
fi
|
||||
EANT_GENTOO_CLASSPATH="
|
||||
jgoodies-forms,jibx,javahelp,jortho,simplyhtml
|
||||
$(usex groovy groovy '')
|
||||
$(usex latex hoteqn '')
|
||||
${svg_deps}"
|
||||
EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
|
||||
EANT_BUILD_TARGET="dist"
|
||||
EANT_DOC_TARGET="doc"
|
||||
EANT_ANT_TASKS="jibx"
|
||||
java-pkg-2_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd "${WORKDIR}"/bin/dist || die
|
||||
local dest="/usr/share/${PN}/"
|
||||
|
||||
java-pkg_dojar lib/*.jar
|
||||
|
||||
if use doc; then
|
||||
java-pkg_dojavadoc doc/javadoc
|
||||
rm -r doc/javadoc
|
||||
fi
|
||||
|
||||
insinto "${dest}"
|
||||
doins -r accessories browser doc plugins patterns.xml
|
||||
|
||||
# register plugins for java-dep-check
|
||||
local plugins="help"
|
||||
use groovy && plugins+=" script"
|
||||
use latex && plugins+=" latex"
|
||||
if use pdf || use svg; then
|
||||
plugins+=" svg"
|
||||
fi
|
||||
local plugin
|
||||
for plugin in ${plugins}; do
|
||||
java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
|
||||
done
|
||||
|
||||
java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
|
||||
--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
|
||||
|
||||
newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
|
||||
|
||||
make_desktop_entry freemind Freemind freemind Utility
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>gnome</herd>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
|
||||
</upstream>
|
||||
<herd>gnome</herd>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
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:
|
||||
@ -0,0 +1,36 @@
|
||||
test/test_environ.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/test/test_environ.py b/test/test_environ.py
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 2b8079b..2feebe3
|
||||
--- a/test/test_environ.py
|
||||
+++ b/test/test_environ.py
|
||||
@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
|
||||
r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
|
||||
cookies = sorted([value for name, value in r.headerlist
|
||||
if name.title() == 'Set-Cookie'])
|
||||
- self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
|
||||
+ self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
|
||||
self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
|
||||
|
||||
def test_set_cookie_expires(self):
|
||||
@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
|
||||
r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
|
||||
cookies = sorted([value for name, value in r.headerlist
|
||||
if name.title() == 'Set-Cookie'])
|
||||
- self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
|
||||
+ self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
|
||||
self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
|
||||
|
||||
def test_delete_cookie(self):
|
||||
@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
|
||||
response.delete_cookie('name')
|
||||
cookies = [value for name, value in response.headerlist
|
||||
if name.title() == 'Set-Cookie']
|
||||
- self.assertTrue('name=;' in cookies[0])
|
||||
+ self.assertTrue('Max-Age=-1' in cookies[0])
|
||||
|
||||
def test_set_header(self):
|
||||
response = BaseResponse()
|
||||
@ -0,0 +1 @@
|
||||
DIST cycler-0.9.0.tar.gz 3472 SHA256 96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc SHA512 fc48d432eeeff4eb2f148cc3a07ac6affb422481d4d1405fbcb505442d64929ce1cfcbf4cac7e64ce3192b24991dadee591cd01ae8a6118e45d11d316064e6cb WHIRLPOOL 46cba5b7fe4a634ed1e847df90038da4fdeb0ce55ecc811a6adcb71f999417c862c79ff6499984c8bb6403e84f382984ffed6008fdd1b1807491adccc4d5499e
|
||||
@ -0,0 +1,36 @@
|
||||
# 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
|
||||
|
||||
MY_PN="Cycler"
|
||||
|
||||
DESCRIPTION="Composable style cycles"
|
||||
HOMEPAGE="
|
||||
http://tacaswell.github.io/cycler/
|
||||
https://pypi.python.org/pypi/Cycler/
|
||||
http://github.com/matplotlib/cycler"
|
||||
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
# Not shipped
|
||||
# https://github.com/matplotlib/cycler/issues/21
|
||||
RESTRICT=test
|
||||
|
||||
python_test() {
|
||||
${PYTHON} run_tests.py || die
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="github">matplotlib/cycler</remote-id>
|
||||
<remote-id type="pypi">Cycler</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,126 @@
|
||||
commit f98c4846dc3c15b3d24aafb973764cb9b860d935
|
||||
Author: Thomas A Caswell <tcaswell@gmail.com>
|
||||
Date: Sat Jan 10 16:10:29 2015 -0500
|
||||
|
||||
MNT : removed deprecated method/kwargs from patheffects
|
||||
|
||||
Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
|
||||
|
||||
attn @pelson had to known-fail a test which was using the
|
||||
proxy renderer to verify that PathEffectRender was working
|
||||
correctly.
|
||||
|
||||
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
|
||||
index 13f8ce0..19e1c4a 100644
|
||||
--- a/lib/matplotlib/patheffects.py
|
||||
+++ b/lib/matplotlib/patheffects.py
|
||||
@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
|
||||
import six
|
||||
|
||||
from matplotlib.backend_bases import RendererBase
|
||||
-from matplotlib.backends.backend_mixed import MixedModeRenderer
|
||||
import matplotlib.transforms as mtransforms
|
||||
-import matplotlib.cbook as cbook
|
||||
from matplotlib.colors import colorConverter
|
||||
import matplotlib.patches as mpatches
|
||||
|
||||
@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
|
||||
return transform + self._offset_trans.clear().translate(offset_x,
|
||||
offset_y)
|
||||
|
||||
- def get_proxy_renderer(self, renderer):
|
||||
- """Return a PathEffectRenderer instance for this PathEffect."""
|
||||
- cbook.deprecated('v1.4', name='get_proxy_renderer',
|
||||
- alternative='PathEffectRenderer')
|
||||
- return PathEffectRenderer([self], renderer)
|
||||
-
|
||||
def _update_gc(self, gc, new_gc_dict):
|
||||
"""
|
||||
Update the given GraphicsCollection with the given
|
||||
@@ -219,9 +211,9 @@ class withStroke(Stroke):
|
||||
|
||||
class SimplePatchShadow(AbstractPathEffect):
|
||||
"""A simple shadow via a filled patch."""
|
||||
- def __init__(self, offset=(2,-2),
|
||||
- shadow_rgbFace=None, alpha=None, patch_alpha=None,
|
||||
- rho=0.3, offset_xy=None, **kwargs):
|
||||
+ def __init__(self, offset=(2, -2),
|
||||
+ shadow_rgbFace=None, alpha=None,
|
||||
+ rho=0.3, **kwargs):
|
||||
"""
|
||||
Parameters
|
||||
----------
|
||||
@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
|
||||
:meth:`AbstractPathEffect._update_gc`.
|
||||
|
||||
"""
|
||||
- if offset_xy is not None:
|
||||
- cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
|
||||
- 'Use the offset keyword instead.')
|
||||
- offset = offset_xy
|
||||
super(SimplePatchShadow, self).__init__(offset)
|
||||
|
||||
if shadow_rgbFace is None:
|
||||
self._shadow_rgbFace = shadow_rgbFace
|
||||
else:
|
||||
self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
|
||||
- if patch_alpha is not None:
|
||||
- cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
|
||||
- 'Use the alpha keyword instead. Transform your '
|
||||
- 'patch_alpha by alpha = 1 - patch_alpha')
|
||||
- if alpha is not None:
|
||||
- raise ValueError("Both alpha and patch_alpha were set. "
|
||||
- "Just use alpha.")
|
||||
- alpha = 1 - patch_alpha
|
||||
|
||||
if alpha is None:
|
||||
alpha = 0.3
|
||||
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
|
||||
index 8298ceb..5af71e5 100644
|
||||
--- a/lib/matplotlib/tests/test_patheffects.py
|
||||
+++ b/lib/matplotlib/tests/test_patheffects.py
|
||||
@@ -5,7 +5,8 @@ import six
|
||||
|
||||
import numpy as np
|
||||
|
||||
-from matplotlib.testing.decorators import image_comparison, cleanup
|
||||
+from matplotlib.testing.decorators import (image_comparison, cleanup,
|
||||
+ knownfailureif)
|
||||
import matplotlib.pyplot as plt
|
||||
import matplotlib.patheffects as path_effects
|
||||
|
||||
@@ -84,19 +85,7 @@ def test_patheffect3():
|
||||
|
||||
|
||||
@cleanup
|
||||
-def test_PathEffect_get_proxy():
|
||||
- pe = path_effects.AbstractPathEffect()
|
||||
- fig = plt.gcf()
|
||||
- renderer = fig.canvas.get_renderer()
|
||||
-
|
||||
- with mock.patch('matplotlib.cbook.deprecated') as dep:
|
||||
- proxy_renderer = pe.get_proxy_renderer(renderer)
|
||||
- assert_equal(proxy_renderer._renderer, renderer)
|
||||
- assert_equal(proxy_renderer._path_effects, [pe])
|
||||
- dep.assert_called()
|
||||
-
|
||||
-
|
||||
-@cleanup
|
||||
+@knownfailureif(True)
|
||||
def test_PathEffect_points_to_pixels():
|
||||
fig = plt.figure(dpi=150)
|
||||
p1, = plt.plot(range(10))
|
||||
@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
|
||||
pe_renderer.points_to_pixels(15))
|
||||
|
||||
|
||||
-def test_SimplePatchShadow_offset_xy():
|
||||
- with mock.patch('matplotlib.cbook.deprecated') as dep:
|
||||
- pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
|
||||
+def test_SimplePatchShadow_offset():
|
||||
+ pe = path_effects.SimplePatchShadow(offset=(4, 5))
|
||||
assert_equal(pe._offset, (4, 5))
|
||||
- dep.assert_called()
|
||||
|
||||
|
||||
@image_comparison(baseline_images=['collection'])
|
||||
@ -0,0 +1,127 @@
|
||||
From 3a816a4db9b498eb64eb837fdcca0fa8ddbe063e Mon Sep 17 00:00:00 2001
|
||||
From: Allan Haldane <allan.haldane@gmail.com>
|
||||
Date: Sat, 17 Oct 2015 14:00:36 -0400
|
||||
Subject: [PATCH] BUG: recarrays viewed as subarrays don't convert to np.record
|
||||
type
|
||||
|
||||
Record array views were updated in #5943 to return np.record dtype
|
||||
where possible, but forgot about the case of sub-arrays.
|
||||
|
||||
That's fixed here, so accessing subarray fields by attribute or index
|
||||
works sensibly, as well as viewing a record array as a subarray dtype,
|
||||
and printing subarrays.
|
||||
|
||||
This also happens to fix #6459, since it affects the same lines.
|
||||
|
||||
Fixes #6497 #6459
|
||||
---
|
||||
numpy/core/records.py | 30 +++++++++++++++++++-----------
|
||||
numpy/core/tests/test_records.py | 23 +++++++++++++++++++++++
|
||||
2 files changed, 42 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/numpy/core/records.py b/numpy/core/records.py
|
||||
index 4a99553..4ce3fe9 100644
|
||||
--- a/numpy/core/records.py
|
||||
+++ b/numpy/core/records.py
|
||||
@@ -448,12 +448,14 @@ def __getattribute__(self, attr):
|
||||
|
||||
# At this point obj will always be a recarray, since (see
|
||||
# PyArray_GetField) the type of obj is inherited. Next, if obj.dtype is
|
||||
- # non-structured, convert it to an ndarray. If obj is structured leave
|
||||
- # it as a recarray, but make sure to convert to the same dtype.type (eg
|
||||
- # to preserve numpy.record type if present), since nested structured
|
||||
- # fields do not inherit type.
|
||||
+ # non-structured, convert it to an ndarray. Then if obj is structured
|
||||
+ # with void type convert it to the same dtype.type (eg to preserve
|
||||
+ # numpy.record type if present), since nested structured fields do not
|
||||
+ # inherit type. Don't do this for non-void structures though.
|
||||
if obj.dtype.fields:
|
||||
- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
|
||||
+ if issubclass(obj.dtype.type, nt.void):
|
||||
+ return obj.view(dtype=(self.dtype.type, obj.dtype))
|
||||
+ return obj
|
||||
else:
|
||||
return obj.view(ndarray)
|
||||
|
||||
@@ -463,8 +465,9 @@ def __getattribute__(self, attr):
|
||||
# Thus, you can't create attributes on-the-fly that are field names.
|
||||
def __setattr__(self, attr, val):
|
||||
|
||||
- # Automatically convert (void) dtypes to records.
|
||||
- if attr == 'dtype' and issubclass(val.type, nt.void):
|
||||
+ # Automatically convert (void) structured types to records
|
||||
+ # (but not non-void structures, subarrays, or non-structured voids)
|
||||
+ if attr == 'dtype' and issubclass(val.type, nt.void) and val.fields:
|
||||
val = sb.dtype((record, val))
|
||||
|
||||
newattr = attr not in self.__dict__
|
||||
@@ -499,7 +502,9 @@ def __getitem__(self, indx):
|
||||
# we might also be returning a single element
|
||||
if isinstance(obj, ndarray):
|
||||
if obj.dtype.fields:
|
||||
- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
|
||||
+ if issubclass(obj.dtype.type, nt.void):
|
||||
+ return obj.view(dtype=(self.dtype.type, obj.dtype))
|
||||
+ return obj
|
||||
else:
|
||||
return obj.view(type=ndarray)
|
||||
else:
|
||||
@@ -519,11 +524,14 @@ def __repr__(self):
|
||||
# If this is a full record array (has numpy.record dtype),
|
||||
# or if it has a scalar (non-void) dtype with no records,
|
||||
# represent it using the rec.array function. Since rec.array
|
||||
- # converts dtype to a numpy.record for us, use only dtype.descr,
|
||||
- # not repr(dtype).
|
||||
+ # converts dtype to a numpy.record for us, convert back
|
||||
+ # to non-record before printing
|
||||
+ plain_dtype = self.dtype
|
||||
+ if plain_dtype.type is record:
|
||||
+ plain_dtype = sb.dtype((nt.void, plain_dtype))
|
||||
lf = '\n'+' '*len("rec.array(")
|
||||
return ('rec.array(%s, %sdtype=%s)' %
|
||||
- (lst, lf, repr(self.dtype.descr)))
|
||||
+ (lst, lf, plain_dtype))
|
||||
else:
|
||||
# otherwise represent it using np.array plus a view
|
||||
# This should only happen if the user is playing
|
||||
diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
|
||||
index 7a18f29..290bc4f 100644
|
||||
--- a/numpy/core/tests/test_records.py
|
||||
+++ b/numpy/core/tests/test_records.py
|
||||
@@ -121,6 +121,23 @@ def test_recarray_views(self):
|
||||
assert_equal(type(rv), np.recarray)
|
||||
assert_equal(rv.dtype.type, np.record)
|
||||
|
||||
+ # check that accessing nested structures keep record type, but
|
||||
+ # not for subarrays, non-void structures, non-structured voids
|
||||
+ test_dtype = [('a', 'f4,f4'), ('b', 'V8'), ('c', ('f4',2)),
|
||||
+ ('d', ('i8', 'i4,i4'))]
|
||||
+ r = np.rec.array([((1,1), b'11111111', [1,1], 1),
|
||||
+ ((1,1), b'11111111', [1,1], 1)], dtype=test_dtype)
|
||||
+ assert_equal(r.a.dtype.type, np.record)
|
||||
+ assert_equal(r.b.dtype.type, np.void)
|
||||
+ assert_equal(r.c.dtype.type, np.float32)
|
||||
+ assert_equal(r.d.dtype.type, np.int64)
|
||||
+ # check the same, but for views
|
||||
+ r = np.rec.array(np.ones(4, dtype='i4,i4'))
|
||||
+ assert_equal(r.view('f4,f4').dtype.type, np.record)
|
||||
+ assert_equal(r.view(('i4',2)).dtype.type, np.int32)
|
||||
+ assert_equal(r.view('V8').dtype.type, np.void)
|
||||
+ assert_equal(r.view(('i8', 'i4,i4')).dtype.type, np.int64)
|
||||
+
|
||||
#check that we can undo the view
|
||||
arrs = [np.ones(4, dtype='f4,i4'), np.ones(4, dtype='f8')]
|
||||
for arr in arrs:
|
||||
@@ -135,6 +152,12 @@ def test_recarray_repr(self):
|
||||
a = np.array(np.ones(4, dtype='f8'))
|
||||
assert_(repr(np.rec.array(a)).startswith('rec.array'))
|
||||
|
||||
+ # check that the 'np.record' part of the dtype isn't shown
|
||||
+ a = np.rec.array(np.ones(3, dtype='i4,i4'))
|
||||
+ assert_equal(repr(a).find('numpy.record'), -1)
|
||||
+ a = np.rec.array(np.ones(3, dtype='i4'))
|
||||
+ assert_(repr(a).find('dtype=int32') != -1)
|
||||
+
|
||||
def test_recarray_from_names(self):
|
||||
ra = np.rec.array([
|
||||
(1, 'abc', 3.7000002861022949, 0),
|
||||
@ -0,0 +1,73 @@
|
||||
From 0d25dc4175e00cdaf9545e8b1b1a5b879cf67248 Mon Sep 17 00:00:00 2001
|
||||
From: Ethan Kruse <eakruse@uw.edu>
|
||||
Date: Mon, 19 Oct 2015 13:29:01 -0700
|
||||
Subject: [PATCH 1/2] Potential fix for #6462
|
||||
|
||||
---
|
||||
numpy/lib/function_base.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
|
||||
index 555d083..fef69df 100644
|
||||
--- a/numpy/lib/function_base.py
|
||||
+++ b/numpy/lib/function_base.py
|
||||
@@ -3339,7 +3339,7 @@ def _median(a, axis=None, out=None, overwrite_input=False):
|
||||
indexer[axis] = slice(index-1, index+1)
|
||||
|
||||
# Check if the array contains any nan's
|
||||
- if np.issubdtype(a.dtype, np.inexact):
|
||||
+ if np.issubdtype(a.dtype, np.inexact) and sz > 0:
|
||||
# warn and return nans like mean would
|
||||
rout = mean(part[indexer], axis=axis, out=out)
|
||||
part = np.rollaxis(part, axis, part.ndim)
|
||||
|
||||
From 59d859fb2160950ac93267d7461ad952145c8724 Mon Sep 17 00:00:00 2001
|
||||
From: Ethan Kruse <eakruse@uw.edu>
|
||||
Date: Tue, 20 Oct 2015 11:40:49 -0700
|
||||
Subject: [PATCH 2/2] Added tests for median of empty arrays
|
||||
|
||||
---
|
||||
numpy/lib/tests/test_function_base.py | 30 ++++++++++++++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
|
||||
index 4516c92..aa41c1f 100644
|
||||
--- a/numpy/lib/tests/test_function_base.py
|
||||
+++ b/numpy/lib/tests/test_function_base.py
|
||||
@@ -2597,6 +2597,36 @@ def test_nan_behavior(self):
|
||||
assert_equal(np.median(a, (0, 2)), b)
|
||||
assert_equal(len(w), 1)
|
||||
|
||||
+ def test_empty(self):
|
||||
+ # empty arrays
|
||||
+ a = np.array([], dtype=float)
|
||||
+ with warnings.catch_warnings(record=True) as w:
|
||||
+ warnings.filterwarnings('always', '', RuntimeWarning)
|
||||
+ assert_equal(np.median(a), np.nan)
|
||||
+ assert_(w[0].category is RuntimeWarning)
|
||||
+
|
||||
+ # multiple dimensions
|
||||
+ a = np.array([], dtype=float, ndmin=3)
|
||||
+ # no axis
|
||||
+ with warnings.catch_warnings(record=True) as w:
|
||||
+ warnings.filterwarnings('always', '', RuntimeWarning)
|
||||
+ assert_equal(np.median(a), np.nan)
|
||||
+ assert_(w[0].category is RuntimeWarning)
|
||||
+
|
||||
+ # axis 0 and 1
|
||||
+ b = np.array([], dtype=float, ndmin=2)
|
||||
+ with warnings.catch_warnings(record=True) as w:
|
||||
+ warnings.filterwarnings('always', '', RuntimeWarning)
|
||||
+ assert_equal(np.median(a, axis=0), b)
|
||||
+ assert_equal(np.median(a, axis=1), b)
|
||||
+
|
||||
+ # axis 2
|
||||
+ b = np.array(np.nan, dtype=float, ndmin=2)
|
||||
+ with warnings.catch_warnings(record=True) as w:
|
||||
+ warnings.filterwarnings('always', '', RuntimeWarning)
|
||||
+ assert_equal(np.median(a, axis=2), b)
|
||||
+ assert_(w[0].category is RuntimeWarning)
|
||||
+
|
||||
def test_object(self):
|
||||
o = np.arange(7.)
|
||||
assert_(type(np.median(o.astype(object))), float)
|
||||
@ -0,0 +1,154 @@
|
||||
# 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} )
|
||||
|
||||
FORTRAN_NEEDED=lapack
|
||||
|
||||
inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
|
||||
|
||||
DOC_PV="1.9.1"
|
||||
DOC_P="${PN}-${DOC_PV}"
|
||||
|
||||
DESCRIPTION="Fast array and numerical python library"
|
||||
HOMEPAGE="http://www.numpy.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
|
||||
doc? (
|
||||
http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
|
||||
http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
|
||||
http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
|
||||
)"
|
||||
# It appears the docs haven't been upgraded, still @ 1.8.1
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc lapack test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
lapack? ( virtual/cblas virtual/lapack )"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-arch/unzip )
|
||||
lapack? ( virtual/pkgconfig )
|
||||
test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
|
||||
|
||||
# Uses distutils.command.config.
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
|
||||
"${FILESDIR}"/${P}-backport-1.patch
|
||||
"${FILESDIR}"/${P}-backport-2.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
if use doc; then
|
||||
unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
|
||||
fi
|
||||
}
|
||||
|
||||
pc_incdir() {
|
||||
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
|
||||
sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
|
||||
}
|
||||
|
||||
pc_libdir() {
|
||||
$(tc-getPKG_CONFIG) --libs-only-L $@ | \
|
||||
sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
|
||||
}
|
||||
|
||||
pc_libs() {
|
||||
$(tc-getPKG_CONFIG) --libs-only-l $@ | \
|
||||
sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
|
||||
-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
|
||||
| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
|
||||
}
|
||||
|
||||
python_prepare_all() {
|
||||
if use lapack; then
|
||||
append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
|
||||
local libdir="${EPREFIX}"/usr/$(get_libdir)
|
||||
# make sure _dotblas.so gets built
|
||||
sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
|
||||
cat >> site.cfg <<-EOF
|
||||
[blas]
|
||||
include_dirs = $(pc_incdir cblas)
|
||||
library_dirs = $(pc_libdir cblas blas):${libdir}
|
||||
blas_libs = $(pc_libs cblas blas)
|
||||
[lapack]
|
||||
library_dirs = $(pc_libdir lapack):${libdir}
|
||||
lapack_libs = $(pc_libs lapack)
|
||||
EOF
|
||||
else
|
||||
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
|
||||
fi
|
||||
|
||||
export CC="$(tc-getCC) ${CFLAGS}"
|
||||
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
|
||||
# with the subtle difference that we don't want to break Darwin where
|
||||
# -shared is not a valid linker argument
|
||||
if [[ ${CHOST} != *-darwin* ]]; then
|
||||
append-ldflags -shared
|
||||
fi
|
||||
|
||||
# only one fortran to link with:
|
||||
# linking with cblas and lapack library will force
|
||||
# autodetecting and linking to all available fortran compilers
|
||||
append-fflags -fPIC
|
||||
if use lapack; then
|
||||
NUMPY_FCONFIG="config_fc --noopt --noarch"
|
||||
# workaround bug 335908
|
||||
[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
|
||||
fi
|
||||
|
||||
# don't version f2py, we will handle it.
|
||||
sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
|
||||
|
||||
# we don't have f2py-3.3
|
||||
sed \
|
||||
-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
|
||||
-i numpy/tests/test_scripts.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
|
||||
}
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing ${NUMPY_FCONFIG}
|
||||
|
||||
cd "${TMPDIR}" || die
|
||||
${EPYTHON} -c "
|
||||
import numpy, sys
|
||||
r = numpy.test(label='full', verbose=3)
|
||||
sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install ${NUMPY_FCONFIG}
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
dodoc COMPATIBILITY DEV_README.txt THANKS.txt
|
||||
|
||||
if use doc; then
|
||||
dohtml -r "${WORKDIR}"/html/*
|
||||
dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
|
||||
fi
|
||||
|
||||
# absent in 1.9
|
||||
#docinto f2py
|
||||
#dodoc numpy/f2py/docs/*.txt
|
||||
#doman numpy/f2py/f2py.1
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST oct2py-0.4.0.tar.gz 107828 SHA256 f44da1ff41d8b21806976eaef500f1690c9c023bcd2be9a34d2dbbf26e442f00 SHA512 d62b6c7cc0f3a61e78cd4cd6a43d93a90f5d69187eb946847aa3f1df50edf6402ee845c51094696667afc29c284d6ef6e9af58d74b62ec177c2e4d18108c615e WHIRLPOOL 96da3725d4a53fa74791c219bd03d6adc49f11e47deb0ef864c86acc15f52145e303d4ac669667e79ef90dbb4af4cc7df298f16ebff7d5c20d02710c57c7738b
|
||||
DIST oct2py-1.3.0.tar.gz 321768 SHA256 f0cae7aae111631c0fffb7f2511ee14fb847b4f501340e8506b0805b50c32f28 SHA512 b9a8896fa463356a08dee7cd2db97bedd5487d93ed33fe73e2c5205118915eac86dcd51dea42dc7338a7f6486704d1c8cb3259c3d8a2b53230c50608d1d043d8 WHIRLPOOL f06214e8005281fec801856596f076a5ad0c35bc3bdc62db3057b320ac1ef8ab07a7f073c4e9ced62ce336c64e773128d333fd0bb26fb891ea6931b84ee22001
|
||||
DIST oct2py-3.3.3.tar.gz 666775 SHA256 0b881a25043d7be713dab5d38b0f96acef5a4cf8130e5726cb9a6bec78448180 SHA512 02c80be8480c5b846a4269155c54fbea1ce8642c8bba0ecb6074a2468b20b930f8ba6d5eaae6a8274a02c1c6719e5b96ee5a32c0c4c0697c028c98ffa327c8e5 WHIRLPOOL 6eb6802b07b55a2ad0d56a8728262e1bc5720a0d9fab04e5af3e961e6a68821e9c2b52905507439ba388d6761aea047d45526fb39d1e50ca3b2104b20c20eb27
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sci-mathematics</herd>
|
||||
<longdescription lang="en">
|
||||
<herd>sci-mathematics</herd>
|
||||
<longdescription lang="en">
|
||||
Uses Octave to run commands and m-files. Supports any Octave
|
||||
function or m-file, passing the data seamlessly between Python and
|
||||
Octave using MAT files.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="pypi">oct2py</remote-id>
|
||||
</upstream>
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="pypi">oct2py</remote-id>
|
||||
<remote-id type="github">blink1073/oct2py</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,45 +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 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python to GNU Octave bridge"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/oct2py"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc examples test"
|
||||
|
||||
RDEPEND="
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]
|
||||
sci-mathematics/octave"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
sphinx-build doc html || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( html/. )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/${PF}/
|
||||
doins -r example
|
||||
fi
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2014 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="Python to GNU Octave bridge"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/oct2py"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc examples test"
|
||||
|
||||
RDEPEND="
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]
|
||||
sci-mathematics/octave"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? (
|
||||
dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
|
||||
dev-python/numpydoc[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
sphinx-build docs html || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests oct2py --with-doctest || die "Tests fail with ${EPYTHON}"
|
||||
iptest -v IPython.extensions.tests.test_octavemagic || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( html/. )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r example
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
# 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="Python to GNU Octave bridge"
|
||||
HOMEPAGE="
|
||||
https://pypi.python.org/pypi/oct2py
|
||||
http://pythonhosted.org/oct2py/
|
||||
http://github.com/blink1073/oct2py"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc examples test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
|
||||
>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
|
||||
sci-mathematics/octave"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? (
|
||||
dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
|
||||
dev-python/numpydoc[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
python_prepare_all() {
|
||||
# https://github.com/blink1073/oct2py/issues/77
|
||||
sed \
|
||||
-e 's:test_help:disabled:g' \
|
||||
-i oct2py/tests/test_usage.py || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
sphinx-build docs html || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
unset DISPLAY
|
||||
if [[ ${EPYTHON} == python2.7 ]]; then
|
||||
local OPTIONS="--with-doctest"
|
||||
fi
|
||||
nosetests --exe -v oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( html/. )
|
||||
use examples && EXAMPLES=( example/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
tests/memory_mgmt_test.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/memory_mgmt_test.py b/tests/memory_mgmt_test.py
|
||||
index 08636ae..a7b8a21 100644
|
||||
--- a/tests/memory_mgmt_test.py
|
||||
+++ b/tests/memory_mgmt_test.py
|
||||
@@ -258,4 +258,6 @@ class MemoryMgmtTest(unittest.TestCase):
|
||||
|
||||
gc.collect()
|
||||
new_object_count = len(gc.get_objects())
|
||||
- self.assertEqual(new_object_count, object_count)
|
||||
+ # it seems that GC sometimes collects something that existed
|
||||
+ # before this test ran, GH issues #273/#274
|
||||
+ self.assertTrue(new_object_count in (object_count, object_count-1))
|
||||
@ -1 +1,2 @@
|
||||
DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
|
||||
DIST rpy2-2.7.2.tar.gz 176481 SHA256 b8c376c2bb78a602effa44c654633f7a11b9bcc582aa3d4828a11302bc290e21 SHA512 d282e81cdd4c69ac4655d019151e2c7ce0aaeeb55479f7f7405ed16ac4124d2f3eedccb37a7d563deb0d8beb69e5ede4d6702a3872b554965442a38ec545f1f4 WHIRLPOOL f19182a1ef392d1b4029ebd984d8828d92ea3bf14c9375490fa099d7a2f82e99c75eb6475dba1d11270bf76dc94eee490157e22ab2c083c51a90b3c1d1a56b7a
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
# 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} )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit distutils-r1 flag-o-matic
|
||||
|
||||
MYSLOT=2
|
||||
MY_PN=${PN}${MYSLOT}
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Python interface to the R Programming Language"
|
||||
HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
|
||||
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/R-3.1
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
|
||||
virtual/python-singledispatch[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( $(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3) )"
|
||||
PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
|
||||
|
||||
# ggplot2 is an optional test dep but not in portage
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
# Tarball absent of doc files in doc folder
|
||||
# https://bitbucket.org/rpy2/rpy2/issues/229
|
||||
|
||||
python_compile() {
|
||||
if ! python_is_python3; then
|
||||
local CFLAGS=${CFLAGS}
|
||||
append-cflags -fno-strict-aliasing
|
||||
fi
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd "${BUILD_DIR}"/lib || die
|
||||
${PYTHON} -m 'rpy2.tests' || die
|
||||
}
|
||||
@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">serpent</remote-id>
|
||||
<remote-id type="github">irmen/Serpent</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
|
||||
</upstream>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
statsmodels/tsa/ar_model.py | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/statsmodels/tsa/ar_model.py b/statsmodels/tsa/ar_model.py
|
||||
index f0af7ee..fe05634 100644
|
||||
--- a/statsmodels/tsa/ar_model.py
|
||||
+++ b/statsmodels/tsa/ar_model.py
|
||||
@@ -256,10 +256,8 @@ class AR(tsbase.TimeSeriesModel):
|
||||
|
||||
Vpinv = np.zeros((p, p), dtype=params.dtype)
|
||||
for i in range(1, p1):
|
||||
- Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i],
|
||||
- old_behavior=False)[:-1]
|
||||
- Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0,
|
||||
- old_behavior=False)[:-1]
|
||||
+ Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i])[:-1]
|
||||
+ Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0)[:-1]
|
||||
|
||||
Vpinv = Vpinv + Vpinv.T - np.diag(Vpinv.diagonal())
|
||||
return Vpinv
|
||||
@ -0,0 +1,30 @@
|
||||
setup.py | 2 +-
|
||||
statsmodels/tools/testing.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 1a7da9a..a6d1b33 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -134,7 +134,7 @@ def check_dependency_versions(min_versions):
|
||||
(spversion, min_versions['scipy']))
|
||||
|
||||
try:
|
||||
- from pandas.version import short_version as pversion
|
||||
+ from pandas import __version__ as pversion
|
||||
except ImportError:
|
||||
install_requires.append('pandas')
|
||||
else:
|
||||
diff --git a/statsmodels/tools/testing.py b/statsmodels/tools/testing.py
|
||||
index 1fde1de..92e77fc 100644
|
||||
--- a/statsmodels/tools/testing.py
|
||||
+++ b/statsmodels/tools/testing.py
|
||||
@@ -17,7 +17,7 @@ def strip_rc(version):
|
||||
def is_pandas_min_version(min_version):
|
||||
'''check whether pandas is at least min_version
|
||||
'''
|
||||
- from pandas.version import short_version as pversion
|
||||
+ from pandas import __version__ as pversion
|
||||
return StrictVersion(strip_rc(pversion)) >= min_version
|
||||
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">zope.interface</remote-id>
|
||||
<remote-id type="github">zopefoundation/zope.interface</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
|
||||
|
||||
DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
|
||||
HOMEPAGE="http://metasm.cr0.org/"
|
||||
SRC_URI="mirror://rubygems/${P}.gem"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
#IUSE="development test"
|
||||
RESTRICT=test
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
|
||||
>=dev-ruby/activesupport-4.0.9:4.0
|
||||
>=dev-ruby/activemodel-4.0.9:4.0"
|
||||
ruby_add_bdepend "dev-ruby/bundler"
|
||||
|
||||
all_ruby_prepare() {
|
||||
[ -f Gemfile.lock ] && rm Gemfile.lock
|
||||
#For now, we don't support development or testing at all
|
||||
#if ! use development; then
|
||||
sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
|
||||
sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
|
||||
sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
|
||||
#fi
|
||||
#if ! use test; then
|
||||
sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
|
||||
#fi
|
||||
#if ! use test && ! use development; then
|
||||
sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
|
||||
#fi
|
||||
}
|
||||
|
||||
each_ruby_prepare() {
|
||||
if [ -f Gemfile ]
|
||||
then
|
||||
BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
|
||||
BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/player_client.c.old 2015-10-21 14:21:04.317896103 +0200
|
||||
+++ src/player_client.c 2015-10-21 14:21:40.001225103 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
{
|
||||
player->nick[0] = g_string_new (config->player_name->str);
|
||||
|
||||
- g_printerr (player->nick[0]->str);
|
||||
+ g_printerr ("%s", player->nick[0]->str);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue