Mercurial > mxe-octave
changeset 4457:8f1067425d0a
of-dataframe: update to v1.2.0
* build_packages.m: update dataframe version
* src/of-dataframe.mk: update version, checksum
* src/of-dataframe-1-fixes.patch: removed
* dist-files.mk: removed ref to of-dataframe-1-fixes.patch
author | John D |
---|---|
date | Fri, 25 Aug 2017 07:51:46 -0400 |
parents | 2b68f2ac1b3a |
children | 8f0a309bf280 |
files | build_packages.m dist-files.mk src/of-dataframe-1-fixes.patch src/of-dataframe.mk |
diffstat | 4 files changed, 3 insertions(+), 133 deletions(-) [+] |
line wrap: on
line diff
--- a/build_packages.m Wed Aug 23 08:51:34 2017 -0400 +++ b/build_packages.m Fri Aug 25 07:51:46 2017 -0400 @@ -57,7 +57,7 @@ try_install financial-0.5.0.tar.gz try_install stk-2.4.2.tar.gz try_install splines-1.3.2.tar.gz - try_install dataframe-1.1.0.tar.gz + try_install dataframe-1.2.0.tar.gz try_install lssa-0.1.2.tar.gz try_install queueing-1.2.5.tar.gz try_install nurbs-1.3.13.tar.gz
--- a/dist-files.mk Wed Aug 23 08:51:34 2017 -0400 +++ b/dist-files.mk Fri Aug 25 07:51:46 2017 -0400 @@ -448,7 +448,6 @@ of-database-1-cross-fixes.patch \ of-database-2-dev-fixes.patch \ of-database.mk \ - of-dataframe-1-fixes.patch \ of-dataframe.mk \ of-dicom-1-fixes.patch \ of-dicom.mk \
--- a/src/of-dataframe-1-fixes.patch Wed Aug 23 08:51:34 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -diff -urN dataframe-1.1.0.orig/inst/@dataframe/private/strsplit.m dataframe-1.1.0/inst/@dataframe/private/strsplit.m ---- dataframe-1.1.0.orig/inst/@dataframe/private/strsplit.m 2015-04-22 19:07:16.000000000 -0400 -+++ dataframe-1.1.0/inst/@dataframe/private/strsplit.m 1969-12-31 19:00:00.000000000 -0500 -@@ -1,125 +0,0 @@ --## Copyright (C) 2009-2012 Jaroslav Hajek --## --## This file is part of Octave. --## --## Octave is free software; you can redistribute it and/or modify it --## under the terms of the GNU General Public License as published by --## the Free Software Foundation; either version 3 of the License, or (at --## your option) any later version. --## --## Octave is distributed in the hope that it will be useful, but --## WITHOUT ANY WARRANTY; without even the implied warranty of --## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --## General Public License for more details. --## --## You should have received a copy of the GNU General Public License --## along with Octave; see the file COPYING. If not, see --## <http://www.gnu.org/licenses/>. --## --## FIXME: this file is here to avoid conflicts with new Octave versions. Matlab --## has recently added strplit function (used to exist in Octave only) but --## their syntax is not compatible with ours. Rather than timing the --## release of each octave forge package that used strsplit, a copy of the --## old version was placed as private. Once the new Octave version is --## released, this file can be removed, and the calls to strsplit fixed. -- --## -*- texinfo -*- --## @deftypefn {Function File} {[@var{cstr}] =} strsplit (@var{s}, @var{sep}) --## @deftypefnx {Function File} {[@var{cstr}] =} strsplit (@var{s}, @var{sep}, @var{strip_empty}) --## Split the string @var{s} using one or more separators @var{sep} and return --## a cell array of strings. Consecutive separators and separators at --## boundaries result in empty strings, unless @var{strip_empty} is true. --## The default value of @var{strip_empty} is false. --## --## 2-D character arrays are split at separators and at the original column --## boundaries. --## --## Example: --## --## @example --## @group --## strsplit ("a,b,c", ",") --## @result{} --## @{ --## [1,1] = a --## [1,2] = b --## [1,3] = c --## @} --## --## strsplit (["a,b" ; "cde"], ",") --## @result{} --## @{ --## [1,1] = a --## [1,2] = b --## [1,3] = cde --## @} --## @end group --## @end example --## @seealso{strtok} --## @end deftypefn -- --function cstr = strsplit (s, sep, strip_empty = false) -- -- if (nargin < 2 || nargin > 3) -- print_usage (); -- elseif (! ischar (s) || ! ischar (sep)) -- error ("strsplit: S and SEP must be string values"); -- elseif (! isscalar (strip_empty)) -- error ("strsplit: STRIP_EMPTY must be a scalar value"); -- endif -- -- if (isempty (s)) -- cstr = cell (size (s)); -- else -- if (rows (s) > 1) -- ## For 2-D arrays, add separator character at line boundaries -- ## and transform to single string -- s(:, end+1) = sep(1); -- s = reshape (s.', 1, numel (s)); -- s(end) = []; -- endif -- -- ## Split s according to delimiter -- if (isscalar (sep)) -- ## Single separator -- idx = find (s == sep); -- else -- ## Multiple separators -- idx = strchr (s, sep); -- endif -- -- ## Get substring lengths. -- if (isempty (idx)) -- strlens = length (s); -- else -- strlens = [idx(1)-1, diff(idx)-1, numel(s)-idx(end)]; -- endif -- ## Remove separators. -- s(idx) = []; -- if (strip_empty) -- ## Omit zero lengths. -- strlens = strlens(strlens != 0); -- endif -- -- ## Convert! -- cstr = mat2cell (s, 1, strlens); -- endif -- --endfunction -- -- --%!assert (strsplit ("road to hell", " "), {"road", "to", "hell"}) --%!assert (strsplit ("road to^hell", " ^"), {"road", "to", "hell"}) --%!assert (strsplit ("road to--hell", " -", true), {"road", "to", "hell"}) --%!assert (strsplit (["a,bc";",de"], ","), {"a", "bc", char(ones(1,0)), "de "}) --%!assert (strsplit (["a,bc";",de"], ",", true), {"a", "bc", "de "}) --%!assert (strsplit (["a,bc";",de"], ", ", true), {"a", "bc", "de"}) -- --%% Test input validation --%!error strsplit () --%!error strsplit ("abc") --%!error strsplit ("abc", "b", true, 4) --%!error <S and SEP must be string values> strsplit (123, "b") --%!error <S and SEP must be string values> strsplit ("abc", 1) --%!error <STRIP_EMPTY must be a scalar value> strsplit ("abc", "def", ones (3,3)) --
--- a/src/of-dataframe.mk Wed Aug 23 08:51:34 2017 -0400 +++ b/src/of-dataframe.mk Fri Aug 25 07:51:46 2017 -0400 @@ -3,8 +3,8 @@ PKG := of-dataframe $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.0 -$(PKG)_CHECKSUM := b7755073f8954f0d595f35a083a37ec5cc77089a +$(PKG)_VERSION := 1.2.0 +$(PKG)_CHECKSUM := 3d00ea119d3f9e0bf75b148858f7994b4210eb2d $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := dataframe-$($(PKG)_VERSION) $(PKG)_FILE := dataframe-$($(PKG)_VERSION).tar.gz