From f19b093104ad25d76e1d089afabf4b4de1563478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 22 Jan 2019 18:08:21 +0100
Subject: [PATCH] HTTP on www.dynare.org now permanently redirects to HTTPS
Using the old HTTP URL makes test fail.
---
README.md | 2 +-
externals/x13/installx13.m | 4 ++--
src/@dseries/dseries.m | 22 +++++++++++-----------
src/@dseries/subsref.m | 2 +-
src/read/load_csv_file_data.m | 2 +-
src/utilities/str/name2tex.m | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index a5aec23..923427b 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ It is possible to instantiate a `dseries` object from a `.csv`,
for a complete description of the constraints on the content of these
files.
- >> websave('US_CMR_data_t.csv', 'http://www.dynare.org/Datasets/US_CMR_data_t.csv');
+ >> websave('US_CMR_data_t.csv', 'https://www.dynare.org/Datasets/US_CMR_data_t.csv');
>> d = dseries('US_CMR_data_t.csv');
>> d
diff --git a/externals/x13/installx13.m b/externals/x13/installx13.m
index d2a6817..09c49a4 100644
--- a/externals/x13/installx13.m
+++ b/externals/x13/installx13.m
@@ -20,9 +20,9 @@ function installx13()
if ~exist('x13.zip','file')
if ( ~isoctave() && verLessThan('matlab', 'R2014b') )
- websave('x13.zip', 'http://www.dynare.org/x13/x13.zip');
+ websave('x13.zip', 'https://www.dynare.org/x13/x13.zip');
else
- urlwrite('http://www.dynare.org/x13/x13.zip', 'x13.zip');
+ urlwrite('https://www.dynare.org/x13/x13.zip', 'x13.zip');
end
unzip('x13.zip');
if ismac()
diff --git a/src/@dseries/dseries.m b/src/@dseries/dseries.m
index cb4257a..b9b1990 100644
--- a/src/@dseries/dseries.m
+++ b/src/@dseries/dseries.m
@@ -245,7 +245,7 @@ end % classdef
%$ t = zeros(8, 1);
%$
%$ try
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m');
%$ if ~status
%$ error()
%$ end
@@ -273,7 +273,7 @@ end % classdef
%$ t = zeros(8, 1);
%$
%$ try
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat');
%$ if ~status
%$ error()
%$ end
@@ -301,7 +301,7 @@ end % classdef
%$ t = zeros(10, 1);
%$
%$ try
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv');
%$ if ~status
%$ error()
%$ end
@@ -405,9 +405,9 @@ end % classdef
%@test:9
%$ try
%$ if isoctave()
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx');
%$ else
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls');
%$ end
%$ if ~status
%$ error()
@@ -442,9 +442,9 @@ end % classdef
%@test:10
%$ try
%$ if isoctave()
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx');
%$ else
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls');
%$ end
%$ if ~status
%$ error()
@@ -479,9 +479,9 @@ end % classdef
%@test:11
%$ try
%$ if isoctave()
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx');
%$ else
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls');
%$ end
%$ if ~status
%$ error()
@@ -516,9 +516,9 @@ end % classdef
%@test:12
%$ try
%$ if isoctave()
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx');
%$ else
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls');
%$ end
%$ if ~status
%$ error()
diff --git a/src/@dseries/subsref.m b/src/@dseries/subsref.m
index 7827019..63d9fa1 100644
--- a/src/@dseries/subsref.m
+++ b/src/@dseries/subsref.m
@@ -360,7 +360,7 @@ return
t = zeros(5,1);
try
- [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv');
+ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv');
if ~status
error()
end
diff --git a/src/read/load_csv_file_data.m b/src/read/load_csv_file_data.m
index d796b08..77c0896 100644
--- a/src/read/load_csv_file_data.m
+++ b/src/read/load_csv_file_data.m
@@ -195,7 +195,7 @@ varlist = strrep(varlist,'"','');
%@test:1
%$ % Download csv file with data.
-%$ urlwrite('http://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv');
+%$ urlwrite('https://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv');
%$
%$ % Instantiate a dseries from the data in the csv file.
%$ try
diff --git a/src/utilities/str/name2tex.m b/src/utilities/str/name2tex.m
index 12dadc5..f1995e9 100644
--- a/src/utilities/str/name2tex.m
+++ b/src/utilities/str/name2tex.m
@@ -189,7 +189,7 @@ end
%@test:4
%$ try
-%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dd.csv','dd.csv');
+%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dd.csv','dd.csv');
%$ if ~status
%$ error()
%$ end
--
GitLab