Drop py3k and -doc packages, taken over by src:numpy

debian/changelog

 python-numpy (1:1.16.5-2) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * Bump Standards-Version to 4.4.1.
 
- -- Ondřej Nový <onovy@debian.org>  Fri, 18 Oct 2019 15:56:10 +0200
+  [ Sandro Tosi ]
+  * Drop py3k and -doc packages, taken over by src:numpy
+
+ -- Sandro Tosi <morph@debian.org>  Tue, 12 Nov 2019 10:40:45 -0500
 
 python-numpy (1:1.16.5-1) unstable; urgency=medium
 

debian/control

@@ -3,7 +3,6 @@ Section: python
 Priority: optional
 Maintainer: Sandro Tosi <morph@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends-Indep: python3-matplotlib
 Build-Depends: cython (>= 0.26-2.1),
                debhelper-compat (= 11),
                dh-python,
@@ -12,15 +11,10 @@ Build-Depends: cython (>= 0.26-2.1),
                liblapack-dev [!arm !m68k],
                python2.7-dev (>= 2.7.14~rc1-1),
                python-all-dbg,
-               python3-all-dbg,
                python-all-dev,
-               python3-all-dev,
                python-docutils,
                python-pytest,
-               python3-pytest,
                python-setuptools,
-               python3-setuptools,
-               python3-sphinx,
                python-tz,
                python3-tz,
 Standards-Version: 4.4.1
@@ -74,74 +68,3 @@ Description: Fast array facility to the Python language (debug extension)
  software.
  .
  This package contains the extension built for the Python debug interpreter.
-
-Package: python3-numpy
-Architecture: any
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, python3-pkg-resources
-Suggests: gcc (>= 4:4.6.1-5),
-          gfortran,
-          python-numpy-doc,
-          python3-dev,
-          python3-pytest,
-          python3-numpy-dbg
-Provides: python3-f2py,
-          python3-numpy-dev,
-          ${numpy3:Provides},
-          ${python3:Provides}
-Breaks: python3-aplpy (<< 2.0~rc2-1),
-        python3-astropy (<< 3.1-1),
-        python3-ccdproc (<< 1.3.0-5),
-        python3-dask (<< 1.0.0+dfsg-2),
-        python3-skimage (<< 0.14.1-3),
-        python3-tables (<< 3.4.4-2),
-        python3-theano (<< 1.0.3+dfsg-1),
-Description: Fast array facility to the Python 3 language
- Numpy contains a powerful N-dimensional array object, sophisticated
- (broadcasting) functions, tools for integrating C/C++ and Fortran
- code, and useful linear algebra, Fourier transform, and random number
- capabilities.
- .
- Numpy replaces the python-numeric and python-numarray modules which are
- now deprecated and shouldn't be used except to support older
- software.
- .
- This package contains Numpy for Python 3.
-
-Package: python3-numpy-dbg
-Section: debug
-Architecture: any
-Multi-Arch: same
-Depends: python3-dbg,
-         python3-numpy (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: python3-numpy (<< 1:1.7.1-1)
-Replaces: python3-numpy (<< 1:1.7.1-1)
-Description: Fast array facility to the Python 3 language (debug extension)
- Numpy contains a powerful N-dimensional array object, sophisticated
- (broadcasting) functions, tools for integrating C/C++ and Fortran
- code, and useful linear algebra, Fourier transform, and random number
- capabilities.
- .
- Numpy replaces the python-numeric and python-numarray modules which
- are now deprecated and shouldn't be used except to support older
- software.
- .
- This package contains the extension built for the Python 3 debug interpreter.
-
-Package: python-numpy-doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Description: NumPy documentation
- Numpy contains a powerful N-dimensional array object, sophisticated
- (broadcasting) functions, tools for integrating C/C++ and Fortran
- code, and useful linear algebra, Fourier transform, and random number
- capabilities.
- .
- Numpy replaces the python-numeric and python-numarray modules which
- are now deprecated and shouldn't be used except to support older
- software.
- .
- This package contains documentation for Numpy and f2py.

debian/dh_numpy3

-#!/usr/bin/perl -w
-
-# Copyright © 2010 Piotr Ożarowski <piotr@debian.org>
-# Copyright © 2012 Jakub Wilk <jwilk@debian.org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-init(options => {
-        "strict" => \$dh{STRICT},
-});
-
-my %data;
-
-open(FILE, '<', '/usr/share/numpy3/versions') or error("cannot read version data: $!\n");
-while (<FILE>) {
-	chomp;
-	next unless /^[^#]/;
-	my ($key, $value) = split;
-	$data{$key} = $value;
-}
-close FILE;
-
-unless ($data{'abi'} and $data{'api'} and $data{'api-min-version'}) {
-	error("cannot parse version data file");
-}
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-	my $numpy_dep;
-	if (package_arch($package) eq 'all') {
-		$numpy_dep = 'python3-numpy';
-	} elsif ($dh{STRICT}) {
-		$numpy_dep = "python3-numpy-api$data{'api'}";
-	} else {
-		$numpy_dep = "python3-numpy (>= $data{'api-min-version'}), python3-numpy-abi$data{'abi'}";
-	}
-	addsubstvar($package, "python3:Depends", $numpy_dep);
-}
-
-exit 0

debian/numpy3.pm

-#!/usr/bin/perl
-use warnings;
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-insert_before("dh_gencontrol", "dh_numpy3");
-
-1

debian/python-numpy-doc.doc-base

-Document: python-numpy-doc
-Title: Numpy Manual
-Author: The Scipy community
-Abstract: This guide is intended as an introductory overview of NumPy
- and explains how to install and make use of the most important
- features of NumPy.
- These is also a reference manual which details functions, modules,
- and objects included in Numpy, describing what they are and what they
- do.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-numpy-doc/html/index.html
-Files: /usr/share/doc/python-numpy-doc/html/*

debian/python-numpy-doc.install

-doc/build/html /usr/share/doc/python-numpy-doc/
-numpy/doc/*.py /usr/share/doc/python-numpy-doc/
-tools/swig /usr/share/doc/python-numpy-doc/

debian/python3-numpy-dbg.install

-usr/bin/f2py3-dbg
-usr/bin/f2py3.?-dbg
-usr/lib/python3*/*-packages/*/*/*.cpython-3?d*.so

debian/python3-numpy.install

-debian/dh_numpy3 usr/bin
-debian/numpy3.pm usr/share/perl5/Debian/Debhelper/Sequence/
-debian/versions usr/share/numpy3/
-usr/bin/f2py3
-usr/bin/f2py3.?
-usr/lib/python3*/*-packages/*.egg-info
-usr/lib/python3*/*-packages/*/*.py
-usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so
-usr/lib/python3*/*-packages/*/*/*/libnpymath.a
-usr/lib/python3*/*-packages/numpy/*.py
-usr/lib/python3*/*-packages/numpy/compat/
-usr/lib/python3*/*-packages/numpy/core/
-usr/lib/python3*/*-packages/numpy/distutils/
-usr/lib/python3*/*-packages/numpy/f2py/*.py
-usr/lib/python3*/*-packages/numpy/f2py/src
-usr/lib/python3*/*-packages/numpy/fft/
-usr/lib/python3*/*-packages/numpy/lib/
-usr/lib/python3*/*-packages/numpy/linalg/
-usr/lib/python3*/*-packages/numpy/ma/
-usr/lib/python3*/*-packages/numpy/matrixlib/
-usr/lib/python3*/*-packages/numpy/polynomial/
-usr/lib/python3*/*-packages/numpy/random/
-usr/lib/python3*/*-packages/numpy/testing/
-usr/lib/python3*/*-packages/numpy/tests/

debian/rules

@@ -3,11 +3,8 @@
 DH_VERBOSE=1
 
 PY2VERS=$(shell pyversions -vr debian/control)
-PY3VERS=$(shell py3versions -vr)
 PYDEF=$(shell pyversions -dv)
-PY3DEF=$(shell py3versions -dv)
 PYLIBPATH := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib")
-PY3LIBPATH := $(shell python3 -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print (b.build_platlib)")
 
 # Look at #634012 to understand why is needed and what will happen if we set
 # compat to 9
@@ -15,19 +12,11 @@ unexport LDFLAGS
 export ATLAS=None
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2
 
 override_dh_auto_build-arch:
 	cd numpy/random/mtrand && python generate_mtrand_c.py
 	dh_auto_build
-	set -e; for v in $(PY3VERS); do \
-		python$$v setup.py build; \
-		python$$v-dbg setup.py build; \
-	done
-
-override_dh_auto_build-indep: override_dh_auto_build-arch
-	# build doc only for default python version
-	(export MPLCONFIGDIR=. ; make -C doc html PYTHON=python3 PYTHONPATH=../$(PY3LIBPATH))
 
 override_dh_auto_clean:
 	rm -rf build/
@@ -38,26 +27,9 @@ override_dh_auto_clean:
 	# cython generated
 	rm -f numpy/random/mtrand/mtrand.c
 
-#override_dh_installman:
-#	dh_installman -ppython-numpy doc/f2py/f2py.1
-#	dh_installman -ppython3-numpy doc/f2py/f2py.1
-#	-mv debian/python3-numpy/usr/share/man/man1/f2py.1 \
-#	  debian/python3-numpy/usr/share/man/man1/f2py3.1
-#	# link manpage for versioned and dbg incarnations of f2py
-#	set -e; for v in $(PY2VERS); do \
-#		dh_link -ppython-numpy /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
-#		dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
-#	done
-#	set -e; for v in $(PY3VERS); do \
-#		dh_link -ppython3-numpy /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
-#		dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
-#	done
-#	dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py-dbg.1.gz;
-#	dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py3-dbg.1.gz;
-
 override_dh_install:
 	# add shebang information to f2py script
-	set -e; for v in $(PY2VERS) $(PY3VERS); do \
+	set -e; for v in $(PY2VERS); do \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \
 		cp -a debian/tmp/usr/bin/f2py$$v debian/tmp/usr/bin/f2py$$v-dbg ; \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \
@@ -68,11 +40,6 @@ override_dh_install:
 	cp -a debian/tmp/usr/bin/f2py$(PYDEF)-dbg debian/tmp/usr/bin/f2py-dbg
 	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python-dbg," debian/tmp/usr/bin/f2py-dbg
 
-	cp -a debian/tmp/usr/bin/f2py$(PY3DEF) debian/tmp/usr/bin/f2py3
-	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python3," debian/tmp/usr/bin/f2py3
-	cp -a debian/tmp/usr/bin/f2py$(PY3DEF)-dbg debian/tmp/usr/bin/f2py3-dbg
-	sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python3-dbg," debian/tmp/usr/bin/f2py3-dbg
-
 	dh_install
 
 	# remove files installed from .install (that's due to the dir listed there)
@@ -90,29 +57,13 @@ override_dh_install:
 		mkdir -p $(CURDIR)/debian/python-numpy-dbg/usr/include/python$${i}_d; \
 		dh_link -ppython-numpy-dbg usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
 	done
-	# Python 3
-	set -e; for i in $(PY3VERS); do \
-	ABITAG=`python$$i -c "import sys; print(sys.abiflags)"`; \
-	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$$i$$ABITAG ] || \
-		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$$i$$ABITAG; \
-		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$$i$$ABITAG/numpy; \
-	done
-	set -e; for i in $(PY3VERS); do \
-	ABITAG=`python$$i-dbg -c "import sys; print(sys.abiflags)"`; \
-	[ -d $(CURDIR)/debian/python3-numpy-dbg/usr/include/python$${i}$$ABITAG ] || \
-		mkdir -p $(CURDIR)/debian/python3-numpy-dbg/usr/include/python$${i}$$ABITAG; \
-		dh_link -ppython3-numpy-dbg usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}$$ABITAG/numpy; \
-	done
 
 	# share -dbg and normal package doc dirs
 	rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg
 	dh_link -ppython-numpy-dbg usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg
-	rm -rf debian/python3-numpy-dbg/usr/share/doc/python3-numpy-dbg
-	dh_link -ppython3-numpy-dbg usr/share/doc/python3-numpy usr/share/doc/python3-numpy-dbg
 
 override_dh_gencontrol:
 	python debian/versions.helper >> debian/python-numpy.substvars
-	python debian/versions3.helper >> debian/python3-numpy.substvars
 	dh_gencontrol
 
 override_dh_compress:
@@ -121,28 +72,15 @@ override_dh_compress:
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ppython-numpy --dbg-package=python-numpy-dbg
-	dh_strip -ppython3-numpy --dbg-package=python3-numpy-dbg
-	# dh_strip seemingly doesn't catch the PEP 3149-style debug names
-	rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-3?d*.so
 endif
 
 
 override_dh_installdocs-indep:
 	dh_installdocs -i
-	dh_sphinxdoc -i
-
-update_intersphinx_mapping:
-	wget http://docs.python.org/dev/objects.inv -O debian/python.org_objects.inv
 
 override_dh_auto_install:
 	dh_auto_install
 
-	# Install for Python 3
-	set -e; for v in $(PY3VERS); do \
-		python$$v setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-		python$$v-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done
-
 	# yes, we need to run tests after install
 	# The reason is that numpy tries hard to not let you run it from the
 	# source directory, so we need to mess with the import order so to
@@ -156,13 +94,4 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 		python$$v-dbg -c "import sys ; sys.path.insert(0, './tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test(verbose=5)" ; \
 		cd .. ; \
 	done
-	# Python 3.2 maps to python3/ dir alone? bah
-	set -e; for v in $(PY3VERS) ; do \
-		cd debian ; \
-		echo "-- running tests for "$$v" plain --" ; \
-		python$$v -c "import sys ; sys.path.insert(0, './tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test(verbose=5)" ; \
-		echo "-- running tests for "$$v" debug --" ; \
-		python$$v-dbg -c "import sys ; sys.path.insert(0, './tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test(verbose=5)" ; \
-		cd .. ; \
-	done
 endif

debian/tests/capi

 #!/bin/sh
 set -efu
 
-PYS=$(pyversions -r 2>/dev/null)" "$(py3versions -r 2>/dev/null)
+PYS=$(pyversions -r 2>/dev/null)"
 
 cd "$AUTOPKGTEST_TMP"
 

debian/tests/control

 Tests: python2
 Depends: build-essential, python-numpy, python-all, python-pytest, python-tz
 
-Tests: python3
-Depends: build-essential, python3-numpy, python3-all, python3-pytest, python3-tz
-
 #needs root for update-alternatives
 Tests: openblas
 Restrictions: needs-root
@@ -15,11 +12,11 @@ Restrictions: needs-root
 Depends: python-numpy, python-all, python-pytest, python-tz, libatlas3-base, dpkg-dev, gcc
 
 Tests: f2py
-Depends: build-essential, gfortran, python-numpy, python-numpy-dbg, python-all, python-all-dbg, python-all-dev, python3-numpy, python3-numpy-dbg, python3-all, python3-all-dbg, python3-all-dev
+Depends: build-essential, gfortran, python-numpy, python-numpy-dbg, python-all, python-all-dbg, python-all-dev
 
 Tests: distutils
 Restrictions: allow-stderr
 Depends: build-essential, libfftw3-dev, python-numpy
 
 Tests: capi
-Depends: build-essential, python-all-dev, python-all-dbg, python3-all-dev, python3-all-dbg, python-numpy, python-numpy-dbg, python3-numpy, python3-numpy-dbg
+Depends: build-essential, python-all-dev, python-all-dbg, python-numpy, python-numpy-dbg

debian/tests/f2py

 #!/bin/sh
 set -efu
 
-PYS=$(pyversions -rv 2>/dev/null)" "$(py3versions -rv 2>/dev/null)
+PYS=$(pyversions -rv 2>/dev/null)"
 
 cd "$AUTOPKGTEST_TMP"
 
@@ -13,7 +13,7 @@ C File hello.f
       end
 EOF
 
-for py in " " 3 $PYS; do
+for py in " " $PYS; do
     [ "$py" = " " ] && py=""
     echo "=== f2py$py ==="
     f2py$py -c -m hello hello.f 2>&1

debian/tests/python3

-#!/bin/sh
-set -efu
-
-PYS=${PYS:-"$(py3versions -r 2>/dev/null)"}
-TESTPKG=${TESTPKG:-numpy}
-
-cd "$AUTOPKGTEST_TMP"
-
-for py in $PYS; do
-    echo "=== $py ==="
-    $py -c "import $TESTPKG; $TESTPKG.test(verbose=2)" 2>&1
-done

debian/versions3.helper

-#!/usr/bin/python
-
-'''
-Check if debian/versions is sane and generate substvars for numpy:Provides.
-'''
-
-import os
-
-def main():
-    os.chdir(os.path.join(os.path.dirname(__file__), '..'))
-    data = {}
-    file = open('numpy/core/setup_common.py', 'r')
-    try:
-        exec(file.read(), data)
-    finally:
-        file.close()
-    file = open('debian/versions', 'r')
-    try:
-        for line in file:
-            line = line.strip()
-            if not line or line.startswith('#'):
-                continue
-            key, value = line.split(None, 1)
-            data[key] = value
-    finally:
-        file.close()
-    assert data['abi'] == str(data['C_ABI_VERSION'] - 0x1000000), 'Is debian/versions up-to-date?'
-    assert data['api'] == str(data['C_API_VERSION']), 'Is debian/versions up-to-date?'
-    print 'numpy3:Provides=python3-numpy-abi%s, python3-numpy-api%s' % (data['abi'], data['api'])
-
-if __name__ == '__main__':
-    main()