Package: statsmodels
Version: 0.9.0-6
Followup-For: Bug #934870
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Sorry, missed a spot in the source.  This should be a complete patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru statsmodels-0.9.0/debian/control statsmodels-0.9.0/debian/control
--- statsmodels-0.9.0/debian/control    2019-09-15 09:56:31.000000000 -0700
+++ statsmodels-0.9.0/debian/control    2019-11-01 22:19:07.000000000 -0700
@@ -8,23 +8,6 @@
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                sphinx-common,
-# for Python 3 only (untested) remove here...
-               python-all-dev,
-               python-setuptools,
-               python-colorama <!nocheck>,
-               python-dateutil <!nocheck>,
-               python-numpy,
-               python-scipy,
-               python-nose <!nocheck>,
-               python-pytest <!nocheck>,
-               python-matplotlib,
-               python-pandas,
-               python-patsy <!nocheck>,
-               python-joblib <!nocheck>,
-               cython,
-               python-tk <!nocheck>,
-               python-cvxopt <!nocheck>,
-# ...to here
                dh-python (>= 3.20180313~),
                cython3,
                python3-all-dev,
@@ -71,47 +54,6 @@
 Vcs-Git: https://salsa.debian.org/science-team/statsmodels.git
 Homepage: https://www.statsmodels.org
 
-# Reminder: when this goes away, the links in python-statsmodels-doc.links and 
python-statsmodels-doc.doc-base need updating
-Package: python-statsmodels
-Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         python-numpy,
-         python-scipy,
-         python-statsmodels-lib (>= ${source:Version}),
-         python-patsy,
-         python-pandas
-Recommends: python-matplotlib,
-            python-joblib,
-            python-colorama,
-            python-cvxopt
-Suggests: python-statsmodels-doc
-Breaks: python-scikits-statsmodels
-Provides: ${python:Provides}
-Replaces: python-scikits-statsmodels
-Description: Python module for the estimation of statistical models
- statsmodels Python module provides classes and functions for the
- estimation of several categories of statistical models. These
- currently include linear regression models, OLS, GLS, WLS and GLS
- with AR(p) errors, generalized linear models for several distribution
- families and M-estimators for robust linear models. An extensive list
- of result statistics are available for each estimation problem.
-
-Package: python-statsmodels-lib
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends},
-         python-numpy
-Breaks: python-scikits-statsmodels
-Replaces: python-scikits-statsmodels
-Description: Python2 low-level implementations and bindings for statsmodels
- Statsmodels is a Python module for the estimation of statistical models.
- .
- This package contains internal libraries for python-statsmodels.  Users
- should not need to install it directly.
-
 Package: python-statsmodels-doc
 Architecture: all
 Section: doc
diff -Nru statsmodels-0.9.0/debian/python3-statsmodels.examples 
statsmodels-0.9.0/debian/python3-statsmodels.examples
--- statsmodels-0.9.0/debian/python3-statsmodels.examples       1969-12-31 
16:00:00.000000000 -0800
+++ statsmodels-0.9.0/debian/python3-statsmodels.examples       2019-02-13 
13:33:01.000000000 -0800
@@ -0,0 +1 @@
+examples/*
diff -Nru statsmodels-0.9.0/debian/python-statsmodels-doc.links 
statsmodels-0.9.0/debian/python-statsmodels-doc.links
--- statsmodels-0.9.0/debian/python-statsmodels-doc.links       2019-08-10 
04:50:15.000000000 -0700
+++ statsmodels-0.9.0/debian/python-statsmodels-doc.links       2019-10-25 
22:24:26.000000000 -0700
@@ -1,4 +1,2 @@
-usr/share/doc/python-statsmodels/examples 
usr/share/doc/python-statsmodels-doc/examples
-usr/share/doc/python-statsmodels/examples 
usr/share/doc/python3-statsmodels/examples
-usr/share/doc/python-statsmodels/html usr/share/doc/python-statsmodels-doc/html
-usr/share/doc/python-statsmodels/html usr/share/doc/python3-statsmodels/html
+usr/share/doc/python3-statsmodels/examples 
usr/share/doc/python-statsmodels-doc/examples
+usr/share/doc/python3-statsmodels/html 
usr/share/doc/python-statsmodels-doc/html
diff -Nru statsmodels-0.9.0/debian/rules statsmodels-0.9.0/debian/rules
--- statsmodels-0.9.0/debian/rules      2019-08-10 04:50:15.000000000 -0700
+++ statsmodels-0.9.0/debian/rules      2019-11-01 22:18:49.000000000 -0700
@@ -16,7 +16,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-       dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+       dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 # To guarantee HOME existence with mpl 1.3.0
 # See https://github.com/matplotlib/matplotlib/issues/2300
@@ -60,9 +60,18 @@
        done
 endif
 
+override_dh_installexamples:
+ifneq (,$(findstring python-statsmodels-doc, $(shell dh_listpackages)))
+       dh_installexamples -ppython-statsmodels-doc 
--doc-main-package=python3-statsmodels
+endif
+       dh_installexamples -Npython-statsmodels-doc
+
 override_dh_installdocs:
        rm -rf docs/source/generated/
-       dh_installdocs
+ifneq (,$(findstring python-statsmodels-doc, $(shell dh_listpackages)))
+       dh_installdocs -ppython-statsmodels-doc 
--doc-main-package=python3-statsmodels
+endif
+       dh_installdocs -Npython-statsmodels-doc
        for html in `find debian -name "*.html"` ; do \
            sed -i 
's#https://cdnjs\..*/mathjax/.*/MathJax.js\(?config=TeX.*L">\)#file:///usr/share/javascript/mathjax/MathJax.js\1#'
 $${html} ; \
            sed -i 
's#https://cdnjs\..*/mathjax/.*/latest.js#file:///usr/share/javascript/mathjax/unpacked/latest.js#'
 $${html} ; \
@@ -110,7 +119,7 @@
 ## move binary libraries into -lib
 override_dh_auto_install:
        dh_auto_install
-       for PACKAGE_NAME in python-statsmodels python3-statsmodels; do \
+       for PACKAGE_NAME in python3-statsmodels; do \
          for lib in $$(find debian/$${PACKAGE_NAME}/usr -name '*.so'); do \
             sdir=$$(dirname $$lib) ; \
             tdir=debian/$${PACKAGE_NAME}-lib/$${sdir#*$${PACKAGE_NAME}/} ; \
@@ -125,12 +134,10 @@
        set -e; \
        find debian -wholename \*scikits -type d | while read skd; do \
                skbd=$$(dirname $$skd); \
-               skbd_=$$(echo $$skbd | sed -e 
's/python-statsmodels/python-scikits.statsmodels/g' \
-                                    | sed -e 
's/python3-statsmodels/python3-scikits.statsmodels/g'); \
+               skbd_=$$(echo $$skbd | sed -e 
's/python3-statsmodels/python3-scikits.statsmodels/g'); \
                mkdir -p $$skbd_; \
                mv $$skd $$skbd_; \
        done
-       dh_numpy
        dh_numpy3
 
 override_dh_fixperms:
diff -Nru statsmodels-0.9.0/debian/tests/control 
statsmodels-0.9.0/debian/tests/control
--- statsmodels-0.9.0/debian/tests/control      2019-08-10 04:50:15.000000000 
-0700
+++ statsmodels-0.9.0/debian/tests/control      2019-09-20 15:16:24.000000000 
-0700
@@ -1,12 +1,4 @@
 Test-Command: set -e
- ; for py in $(pyversions -r 2>/dev/null)
- ; do cd "$ADTTMP" ; echo "Testing with $py:"
- ; $py -c "import statsmodels; print statsmodels"
- ; $py -c "import statsmodels.nonparametric._smoothers_lowess; 
print(statsmodels.nonparametric._smoothers_lowess)"
- ; done
-Depends: python-all, python-statsmodels
-
-Test-Command: set -e
  ; for py in $(py3versions -r 2>/dev/null)
  ; do cd "$ADTTMP" ; echo "Testing with $py:"
  ; $py -m pytest -v /usr/lib/python3/dist-packages/statsmodels

Reply via email to