From e0ee6dae1f842907dc95f18f8d3f02a104cd348b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=B3ra=20Kocsis?= <dora@dynare.org>
Date: Thu, 23 Apr 2020 14:42:24 +0200
Subject: [PATCH] bump minimal MATLAB version to R2015a, remove Octave test
suite
---
.gitlab-ci.yml | 6 +++---
Makefile | 7 ++-----
src/initialize_mdbnomics.m | 4 ++--
src/utils/iter_filtered_series.m | 1 -
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6819000..e8b289b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,9 @@ test_matlab:
script:
- make check-matlab
-test_octave:
+test_old_matlab:
stage: test
variables:
- OPENBLAS_NUM_THREADS: 1
+ MATLAB: /usr/local/MATLAB/R2015a/bin/matlab
script:
- - make check-octave
\ No newline at end of file
+ - make check-matlab
\ No newline at end of file
diff --git a/Makefile b/Makefile
index efd1de9..99147cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,10 @@
-OCTAVE ?= octave-cli
MATLAB ?= $(shell which matlab)
+all: check-matlab
+
m-unit-tests/src/mtest.m:
git clone https://git.dynare.org/Dynare/m-unit-tests
-check-octave: m-unit-tests/src/mtest.m
- @cd tests ;\
- $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../m-unit-tests/src']); runalltests" && [ ! -f ./failed ] && [ -f ./pass ]
-
check-matlab: m-unit-tests/src/mtest.m
@$(MATLAB) -nosplash -nodisplay -r "addpath([pwd '/m-unit-tests/src']); cd tests; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ]
diff --git a/src/initialize_mdbnomics.m b/src/initialize_mdbnomics.m
index 7db683f..3665002 100644
--- a/src/initialize_mdbnomics.m
+++ b/src/initialize_mdbnomics.m
@@ -50,8 +50,8 @@ P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false);
addpath(P{:});
% Check minimal MATLAB and Octave requirements.
-if (isoctave && octave_ver_less_than('6')) || matlab_ver_less_than('8.5')
- error('The minimum MATLAB requirement of this package is R2015a, and the minimum Octave requirement of this package is version 6.');
+if matlab_ver_less_than('8.5')
+ error('The minimum MATLAB requirement of this package is R2015a.');
end
assignin('caller', 'mdbnomics_src_root', mdbnomics_src_root);
diff --git a/src/utils/iter_filtered_series.m b/src/utils/iter_filtered_series.m
index 51e9149..b22d050 100644
--- a/src/utils/iter_filtered_series.m
+++ b/src/utils/iter_filtered_series.m
@@ -58,7 +58,6 @@ for gg = 1:size(grouped_series, 2)
posted_series_list = jsonencode(posted_series_list);
end
- posted_series_list = transform_json_request(posted_series_list);
json_request = sprintf('{"filters":%s,"series":%s}', dbnomics_filters, posted_series_list);
try
--
GitLab