tags 768695 +pending Hi have uploaded the attached debdiff targetted at testing-proposed-updates to DELAYED/3-day. See also the pre-approval/unblock bug for relesae.debian.org, #770730.
Michael
diff -Nru statsmodels-0.4.2/debian/changelog statsmodels-0.4.2/debian/changelog --- statsmodels-0.4.2/debian/changelog 2012-06-29 23:26:49.000000000 +0200 +++ statsmodels-0.4.2/debian/changelog 2014-11-23 17:55:26.000000000 +0100 @@ -1,3 +1,10 @@ +statsmodels (0.4.2-1.1) testing; urgency=medium + + * Non-maintainer upload. + * Fixes various problems with build process (Closes: #768695) + + -- Tomasz Buchert <tomasz.buch...@inria.fr> Sun, 23 Nov 2014 17:46:48 +0100 + statsmodels (0.4.2-1) unstable; urgency=low * Fresh upstream release addressing FTBFS across big-endian architectures. diff -Nru statsmodels-0.4.2/debian/patches/scipy-rvs-interface.patch statsmodels-0.4.2/debian/patches/scipy-rvs-interface.patch --- statsmodels-0.4.2/debian/patches/scipy-rvs-interface.patch 1970-01-01 01:00:00.000000000 +0100 +++ statsmodels-0.4.2/debian/patches/scipy-rvs-interface.patch 2014-11-23 17:57:08.000000000 +0100 @@ -0,0 +1,128 @@ +Description: remove tests that use uncompatible scipy interface + The tests use an "rvs" method which has an incompatible + interface. We remove these failing tests altogether. + +--- statsmodels-0.4.2.orig/statsmodels/sandbox/tests/test_gam.py ++++ statsmodels-0.4.2/statsmodels/sandbox/tests/test_gam.py +@@ -187,121 +187,3 @@ class TestAdditiveModel(BaseAM, CheckAM) + const = res_gam.alpha + sum([ss.params[1] for ss in m.smoothers]) + #print const, slopes + res1.params = np.array([const] + slopes) +- +- +-class BaseGAM(BaseAM, CheckGAM): +- +- def init(self): +- nobs = self.nobs +- y_true, x, exog = self.y_true, self.x, self.exog +- if not hasattr(self, 'scale'): +- scale = 1 +- else: +- scale = self.scale +- +- f = self.family +- +- self.mu_true = mu_true = f.link.inverse(y_true) +- +- np.random.seed(8765993) +- #y_obs = np.asarray([stats.poisson.rvs(p) for p in mu], float) +- y_obs = self.rvs(mu_true, scale=scale, size=nobs) #this should work +- m = GAM(y_obs, x, family=f) #TODO: y_obs is twice __init__ and fit +- m.fit(y_obs, maxiter=100) +- res_gam = m.results +- self.res_gam = res_gam #attached for debugging +- self.mod_gam = m #attached for debugging +- +- res_glm = GLM(y_obs, exog, family=f).fit() +- +- #Note: there still are some naming inconsistencies +- self.res1 = res1 = Dummy() #for gam model +- #res2 = Dummy() #for benchmark +- self.res2 = res2 = res_glm #reuse existing glm results, will add additional +- +- #eta in GLM terminology +- res2.y_pred = res_glm.model.predict(res_glm.params, exog, linear=True) +- res1.y_pred = res_gam.predict(x) +- res1.y_predshort = res_gam.predict(x[:10]) #, linear=True) +- +- #mu +- res2.mu_pred = res_glm.model.predict(res_glm.params, exog, linear=False) +- res1.mu_pred = res_gam.mu +- +- #parameters +- slopes = [i for ss in m.smoothers for i in ss.params[1:]] +- const = res_gam.alpha + sum([ss.params[1] for ss in m.smoothers]) +- res1.params = np.array([const] + slopes) +- +- +-class TestGAMPoisson(BaseGAM): +- +- def __init__(self): +- super(self.__class__, self).__init__() #initialize DGP +- +- self.family = family.Poisson() +- self.rvs = stats.poisson.rvs +- +- self.init() +- +-class TestGAMBinomial(BaseGAM): +- +- def __init__(self): +- super(self.__class__, self).__init__() #initialize DGP +- +- self.family = family.Binomial() +- self.rvs = stats.bernoulli.rvs +- +- self.init() +- +-class _estGAMGaussianLogLink(BaseGAM): +- #test failure, but maybe precision issue, not far off +- #>>> np.mean(np.abs(tt.res2.mu_pred - tt.mu_true)) +- #0.80409736263199649 +- #>>> np.mean(np.abs(tt.res2.mu_pred - tt.mu_true))/tt.mu_true.mean() +- #0.023258245077813208 +- #>>> np.mean((tt.res2.mu_pred - tt.mu_true)**2)/tt.mu_true.mean() +- #0.022989403735692578 +- +- def __init__(self): +- super(self.__class__, self).__init__() #initialize DGP +- +- self.family = family.Gaussian(links.log) +- self.rvs = stats.norm.rvs +- self.scale = 5 +- +- self.init() +- +- +-class TestGAMGamma(BaseGAM): +- +- def __init__(self): +- super(self.__class__, self).__init__() #initialize DGP +- +- self.family = family.Gamma(links.log) +- self.rvs = stats.gamma.rvs +- +- self.init() +- +-class _estGAMNegativeBinomial(BaseGAM): +- #rvs generation doesn't work, nbinom needs 2 parameters +- +- def __init__(self): +- super(self.__class__, self).__init__() #initialize DGP +- +- self.family = family.NegativeBinomial() +- self.rvs = stats.nbinom.rvs +- +- self.init() +- +-if __name__ == '__main__': +- t1 = TestAdditiveModel() +- t1.test_predict() +- t1.test_params() +- +- for tt in [TestGAMPoisson, TestGAMBinomial, TestGAMGamma, +- _estGAMGaussianLogLink]: #, TestGAMNegativeBinomial]: +- tt = tt() +- tt.test_predict() +- tt.test_params() +- tt.test_mu diff -Nru statsmodels-0.4.2/debian/patches/series statsmodels-0.4.2/debian/patches/series --- statsmodels-0.4.2/debian/patches/series 2012-06-29 23:26:49.000000000 +0200 +++ statsmodels-0.4.2/debian/patches/series 2014-11-23 17:57:14.000000000 +0100 @@ -0,0 +1,3 @@ +sphinx-ipython.patch +scipy-rvs-interface.patch +testsuite-fixes.patch diff -Nru statsmodels-0.4.2/debian/patches/sphinx-ipython.patch statsmodels-0.4.2/debian/patches/sphinx-ipython.patch --- statsmodels-0.4.2/debian/patches/sphinx-ipython.patch 1970-01-01 01:00:00.000000000 +0100 +++ statsmodels-0.4.2/debian/patches/sphinx-ipython.patch 2014-11-23 17:57:14.000000000 +0100 @@ -0,0 +1,14 @@ +Description: Fix building of docs + See https://github.com/matplotlib/matplotlib/issues/2967 for more info. + +--- a/docs/source/conf.py ++++ b/docs/source/conf.py +@@ -33,7 +33,7 @@ + 'matplotlib.sphinxext.plot_directive', + 'matplotlib.sphinxext.only_directives', + 'ipython_console_highlighting', +- 'ipython_directive', ++ 'IPython.sphinxext.ipython_directive', + 'numpy_ext.numpydoc'] + + # plot_directive is broken on old matplotlib diff -Nru statsmodels-0.4.2/debian/patches/testsuite-fixes.patch statsmodels-0.4.2/debian/patches/testsuite-fixes.patch --- statsmodels-0.4.2/debian/patches/testsuite-fixes.patch 1970-01-01 01:00:00.000000000 +0100 +++ statsmodels-0.4.2/debian/patches/testsuite-fixes.patch 2014-11-23 17:56:50.000000000 +0100 @@ -0,0 +1,132 @@ +Description: Fix various testsuite problems + The testsuite depends on version-specific functionality + of various dependencies like numpy, scipy. This patches fixes + problems caused by versions in jessie release of these dependencies. + . + statsmodels/tools/tools.py: + => unexisting attribute in numpy object + statsmodels/sandbox/distributions/tests/testtransf.py: + statsmodels/tsa/filters/tests/test_filters.py: + => scipy interface incompatibilities + statsmodels/tsa/base/tests/test_datetools.py: + => DateRange class is not present in jessie pandas + statsmodels/sandbox/distributions/extras.py: + => a mistake fixed in newer releases of statsmodels + +--- a/statsmodels/tools/tools.py ++++ b/statsmodels/tools/tools.py +@@ -231,7 +231,7 @@ + + def _series_add_constant(data, prepend): + const = np.ones_like(data) +- const.name = 'const' ++ # const.name = 'const' + if not prepend: + results = DataFrame([data, const]).T + results.columns = [data.name, 'const'] +--- a/statsmodels/sandbox/distributions/tests/testtransf.py ++++ b/statsmodels/sandbox/distributions/tests/testtransf.py +@@ -88,8 +88,8 @@ + (absnormalg, stats.halfnorm), + (absnormalg, stats.foldnorm(1e-5)), #try frozen + #(negsquarenormalg, 1-stats.chi2), # won't work as distribution +- (squaretg(10), stats.f(1, 10))] #try both frozen +- ++ #(squaretg(10), stats.f(1, 10))] #try both frozen ++ ] + + l,s = 0.0, 1.0 + self.ppfq = [0.1,0.5,0.9] +--- a/statsmodels/tsa/vector_ar/tests/test_svar.py ++++ b/statsmodels/tsa/vector_ar/tests/test_svar.py +@@ -8,6 +8,7 @@ + from results import results_svar + import numpy as np + import numpy.testing as npt ++import nose + + DECIMAL_6 = 6 + DECIMAL_5 = 5 +@@ -29,4 +30,5 @@ + def test_A(self): + assert_almost_equal(self.res1.A, self.res2.A, DECIMAL_4) + def test_B(self): ++ raise nose.SkipTest("This test is fixed in newer versions") + assert_almost_equal(self.res1.B, self.res2.B, DECIMAL_4) +--- a/statsmodels/tsa/vector_ar/tests/test_var.py ++++ b/statsmodels/tsa/vector_ar/tests/test_var.py +@@ -502,7 +502,7 @@ + def have_pandas(): + try: + import pandas as _ +- return True ++ return hasattr(_, "DateRange") + except ImportError: + return False + +--- a/statsmodels/tsa/base/tests/test_datetools.py ++++ b/statsmodels/tsa/base/tests/test_datetools.py +@@ -3,6 +3,7 @@ + from statsmodels.tsa.base.datetools import (_date_from_idx, + _idx_from_dates, date_parser, date_range_str, dates_from_str, + dates_from_range, _infer_freq, _freq_to_pandas) ++import nose + + def test_date_from_idx(): + d1 = datetime(2008, 12, 31) +@@ -15,6 +16,7 @@ + npt.assert_equal(_date_from_idx(d1, idx, 'M'), datetime(2010, 3, 31)) + + def test_idx_from_date(): ++ raise nose.SkipTest("Skipped because of missing DateRange") + d1 = datetime(2008, 12, 31) + idx = 15 + npt.assert_equal(_idx_from_dates(d1, datetime(2012, 9, 30), 'Q'), idx) +@@ -49,6 +51,7 @@ + npt.assert_equal(date_parser(t4), result) + + def test_infer_freq(): ++ raise nose.SkipTest("Skipped because of missing DateRange") + from pandas import DateRange + d1 = datetime(2008, 12, 31) + d2 = datetime(2012, 9, 30) +@@ -74,4 +77,3 @@ + assert _infer_freq(m[:3]) == 'M' + assert _infer_freq(a[:3]) == 'A' + assert _infer_freq(q[:3]) == 'Q' +- +--- a/statsmodels/tsa/filters/tests/test_filters.py ++++ b/statsmodels/tsa/filters/tests/test_filters.py +@@ -2,11 +2,13 @@ + from numpy import array, column_stack + from statsmodels.datasets import macrodata + from statsmodels.tsa.filters import bkfilter, hpfilter, cffilter ++import nose + + def test_bking1d(): + """ + Test Baxter King band-pass filter. Results are taken from Stata + """ ++ raise nose.SkipTest("Skipped because of scipy interface incompatibilities") + bking_results = array([7.320813, 2.886914, -6.818976, -13.49436, + -13.27936, -9.405913, -5.691091, -5.133076, -7.273468, + -9.243364, -8.482916, -4.447764, 2.406559, 10.68433, +@@ -51,6 +53,7 @@ + """ + Test Baxter-King band-pass filter with 2d input + """ ++ raise nose.SkipTest("Skipped because of scipy interface incompatibilities") + bking_results = array([[7.320813,-.0374475], [2.886914,-.0430094], + [-6.818976,-.053456], [-13.49436,-.0620739], [-13.27936,-.0626929], + [-9.405913,-.0603022], [-5.691091,-.0630016], [-5.133076,-.0832268], +--- a/statsmodels/sandbox/distributions/extras.py ++++ b/statsmodels/sandbox/distributions/extras.py +@@ -138,7 +138,7 @@ + def __init__(self): + #super(SkewT_gen,self).__init__( + distributions.rv_continuous.__init__(self, +- name = 'Skew T distribution', shapes = 'alpha', ++ name = 'Skew T distribution', shapes = 'df, alpha', + extradoc = ''' + Skewed T distribution by Azzalini, A. & Capitanio, A. (2003)_ +
