From 817de5f1d0812678cbe91d6822bbc028ff5dfa6f Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Mon, 26 Nov 2018 11:46:36 +0000 Subject: [PATCH] Import yt_3.4.1-2.debian.tar.xz [dgit import tarball yt 3.4.1-2 yt_3.4.1-2.debian.tar.xz] --- changelog | 81 ++ compat | 1 + control | 78 ++ copyright | 174 +++ patches/fix_32bit_ftbfs.patch | 39 + patches/fix_embedded_jquery.patch | 15 + patches/fix_minified_leaflet.patch | 2089 ++++++++++++++++++++++++++++ patches/man-page.patch | 207 +++ patches/series | 4 + python-yt.lintian-overrides | 9 + python-yt.manpages | 3 + python3-yt.manpages | 3 + rules | 40 + source/format | 1 + watch | 3 + 15 files changed, 2747 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 patches/fix_32bit_ftbfs.patch create mode 100644 patches/fix_embedded_jquery.patch create mode 100644 patches/fix_minified_leaflet.patch create mode 100644 patches/man-page.patch create mode 100644 patches/series create mode 100644 python-yt.lintian-overrides create mode 100644 python-yt.manpages create mode 100644 python3-yt.manpages create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..fe8dcc1 --- /dev/null +++ b/changelog @@ -0,0 +1,81 @@ +yt (3.4.1-2) unstable; urgency=medium + + * Team upload. + + [ Chris Lamb ] + * Make the build reproducible (Closes: #892496) + + [ Ben Keller ] + * Added back testing code to debian/rules to fix FTBFS. Closes: #908683 + + -- Ole Streicher Mon, 26 Nov 2018 12:46:36 +0100 + +yt (3.4.1-1) unstable; urgency=medium + + * Upgrade to upstream version 3.4.1 + + -- BW Keller Tue, 28 Aug 2018 10:07:46 +0000 + +yt (3.4.0-3) unstable; urgency=low + + * Fix 32 bit FTBF. Closes: #879482 + + -- BW Keller Tue, 24 Oct 2017 16:11:30 +0000 + +yt (3.4.0-2) unstable; urgency=low + + * Fix build issue with home directory needed for nose tests. + + -- BW Keller Sat, 21 Oct 2017 13:55:11 +0000 + +yt (3.4.0-1) unstable; urgency=medium + + * Upgrade to upstream version 3.4.0 + + -- BW Keller Fri, 22 Sep 2017 17:14:53 +0000 + +yt (3.3.3-2) unstable; urgency=low + + * Fixes 32-bit build failures. Closes: #851831 + + -- BW Keller Thu, 26 Jan 2017 14:19:12 -0500 + +yt (3.3.3-1) unstable; urgency=low + + * Upgrade to upstream version 3.3.3 + + -- BW Keller Sun, 08 Jan 2017 18:03:12 -0500 + +yt (3.3.1-1) unstable; urgency=low + + * Upgrade to upstream version 3.3.1 + + -- BW Keller Mon, 19 Sep 2016 12:35:29 -0400 + +yt (3.2.3-2) unstable; urgency=medium + + * ACTUALLY fixes build failures on i386. Closes: #803275 + + -- BW Keller Mon, 12 Sep 2016 22:50:04 -0400 + +yt (3.2.3-1) unstable; urgency=medium + + * Upgrade to upstream version 3.2.3 + * Remove dependence on libpng. Closes: #810709 + * Fixes build failures. Closes: #810209, #803275 + * Maintainer has changed. Closes: #817200 + + -- BW Keller Tue, 6 Sep 2016 16:35:35 -0400 + +yt (3.2.1-2) unstable; urgency=low + + * Backport fix for mpl-1.5. + * Correct Python dependencies to fix FTBS. Closes: #802428 + + -- Kacper Kowalik Thu, 22 Oct 2015 19:57:35 +0000 + +yt (3.2.1-1) unstable; urgency=low + + * Initial release. (Closes: #789976) + + -- Kacper Kowalik Tue, 28 Jul 2015 20:08:18 +0000 diff --git a/compat b/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +11 diff --git a/control b/control new file mode 100644 index 0000000..d8b736b --- /dev/null +++ b/control @@ -0,0 +1,78 @@ +Source: yt +Section: python +Priority: optional +Maintainer: Debian Astronomy Team +Uploaders: BW Keller +Build-Depends: cython (>= 0.22), + cython3 (>= 0.22), + debhelper (>= 11), + dh-python, + libpython-dev, + libpython3-dev, + python-all-dev, + python-h5py, + python-matplotlib, + python-nose, + python-mock, + python-numpy, + python-setuptools, + python-sympy, + python-tk, + python3-all-dev, + python3-h5py, + python3-matplotlib, + python3-nose, + python3-numpy, + python3-setuptools, + python3-sympy, + python3-tk, + libjs-jquery +Standards-Version: 4.2.1 +Homepage: http://yt-project.org/ +Vcs-Git: https://salsa.debian.org/cgit/debian-astro/packages/yt.git +Vcs-Browser: https://salsa.debian.org/cgit/debian-astro/packages/yt.git + +Package: python-yt +Architecture: any +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, + python-h5py, + python-matplotlib, + python-numpy (>= 1:1.6.1), + python-numpy-abi9, + python-mock, + python-sympy, + libjs-jquery +Suggests: python-astropy, + python-scipy, + python-pyx +Description: Framework for analyzing and visualizing simulation data (Python 2) + The yt project aims to produce an integrated science environment for + collaboratively asking and answering astrophysical questions. To do so, it will + encompass the creation of initial conditions, the execution of simulations, and + the detailed exploration and visualization of the resultant data. It will also + provide a standard framework based on physical quantities interoperability + between codes. + . + This package contains the Python 2 version of the package. + +Package: python3-yt +Architecture: any +Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, + python3-h5py, + python3-matplotlib, + python3-numpy (>= 1:1.6.1), + python3-numpy-abi9, + python3-sympy, + libjs-jquery +Suggests: python3-astropy, + python3-scipy, + python3-pyx +Description: Framework for analyzing and visualizing simulation data (Python 3) + The yt project aims to produce an integrated science environment for + collaboratively asking and answering astrophysical questions. To do so, it will + encompass the creation of initial conditions, the execution of simulations, and + the detailed exploration and visualization of the resultant data. It will also + provide a standard framework based on physical quantities interoperability + between codes. + . + This package contains the Python 3 version of the package. diff --git a/copyright b/copyright new file mode 100644 index 0000000..fa7924e --- /dev/null +++ b/copyright @@ -0,0 +1,174 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: yt +Upstream-Contact: Ben Keller +Source: http://yt-project.org/ + +Files: * +Copyright: Anne M. Archibald 2008, + (c) Damian Eads, 2007-2008, + (c) 2007-2011 John Tsiombikas , + (c) 2006-2013, Matthew Turk , + (c) 2013-, yt Development Team, + 2015 Kacper Kowalik (Debian files) +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + * Neither the name of the Astropy Team nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Files: yt/pmods.py +Copyright: (c) 2011, Lawrence Livermore National Security, LLC. +License: LNLL-BSD + The modifications to this code are copyright (c) 2011, Lawrence + Livermore National Security, LLC. Produced at the Lawrence Livermore + National Laboratory. Written by Tim Kadich and Asher Langton + . Released as LLNL-CODE-522751 under the name + SmartImport.py, version 1.0. All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the disclaimer below. + . + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the disclaimer (as noted below) + in the documentation and/or other materials provided with the + distribution. + . + - Neither the name of the LLNS/LLNL nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE + LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + . + Additional BSD Notice + . + 1. This notice is required to be provided under our contract with the + U.S. Department of Energy (DOE). This work was produced at Lawrence + Livermore National Laboratory under Contract No. DE-AC52-07NA27344 + with the DOE. + . + 2. Neither the United States Government nor Lawrence Livermore + National Security, LLC nor any of their employees, makes any warranty, + express or implied, or assumes any liability or responsibility for the + accuracy, completeness, or usefulness of any information, apparatus, + product, or process disclosed, or represents that its use would not + infringe privately-owned rights. + . + 3. Also, reference herein to any specific commercial products, + process, or services by trade name, trademark, manufacturer or + otherwise does not necessarily constitute or imply its endorsement, + recommendation, or favoring by the United States Government or + Lawrence Livermore National Security, LLC. The views and opinions of + authors expressed herein do not necessarily state or reflect those of + the United States Government or Lawrence Livermore National Security, + LLC, and shall not be used for advertising or product endorsement + purposes. + +Files: yt/frontends/artio/artio_headers/* +Copyright: (c) 2012-2013, Douglas H. Rudd +License: LGPL-3 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the full text of the GNU Lesser General Public + License version 3 can be found in the file + `/usr/share/common-licenses/LGPL-3'. +Comment: This code is derived from knee.py, which was included in the Python + 2.6 distribution. + +Files: yt/extern/bottle.py yt/extern/rocket.py yt/extern/six.py yt/utilities/poster/* yt/utilities/pyparselibconfig/libconfig.py +Copyright: (c) 2010, Marcel Hellkamp, + (c) 2011 Timothy Farrell + (c) 2010-2014 Benjamin Peterson + (c) 2011 Chris AtLee + (c) 2013, Samuel Skillman +License: MIT + +License: MIT + 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. + +Files: yt/extern/tqdm/* +Copyright: Copyright (c) 2013 noamraph +License: MIT + +Files: yt/visualization/mapserver/html/leaflet/leaflet.js +Copyright: Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin +License: BSD-2-Clause + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/patches/fix_32bit_ftbfs.patch b/patches/fix_32bit_ftbfs.patch new file mode 100644 index 0000000..9147e49 --- /dev/null +++ b/patches/fix_32bit_ftbfs.patch @@ -0,0 +1,39 @@ +Author: Ben Keller +Description: Fix issues with pointer size assumptions on 32-bit systems +--- a/yt/utilities/lib/alt_ray_tracers.pyx ++++ b/yt/utilities/lib/alt_ray_tracers.pyx +@@ -101,7 +101,7 @@ + rleft, rright, zleft, zright, \ + cleft, cright, thetaleft, thetaright, \ + tmleft, tpleft, tmright, tpright, tsect +- cdef np.ndarray[np.int64_t, ndim=1, cast=True] inds, tinds, sinds ++ cdef np.ndarray[np.int_t, ndim=1, cast=True] inds, tinds, sinds + cdef np.ndarray[np.float64_t, ndim=2] xyz, rztheta, ptemp, b1, b2, dsect + + # set up points +@@ -201,12 +201,12 @@ + tsect, dsect = _cart_intersect(p1cart, p2cart, _cyl2cart(b1), _cyl2cart(b2)) + tmask = np.logical_and(0.0<=tsect, tsect<=1.0) + ret = np.unique(tsect[tmask], return_index=True) +- tsect, tinds = ret[0], ret[1].astype('int64') ++ tsect, tinds = ret[0], ret[1].astype('int') + inds = inds[tmask][tinds] + xyz = dsect[tmask][tinds] + s = np.sqrt(((xyz - p1cart) * (xyz - p1cart)).sum(axis=1)) + ret = np.unique(s, return_index=True) +- s, sinds = ret[0], ret[1].astype('int64') ++ s, sinds = ret[0], ret[1].astype('int') + inds = inds[sinds] + xyz = xyz[sinds] + t = s/np.sqrt((dpcart*dpcart).sum()) +--- a/yt/utilities/lib/misc_utilities.pyx ++++ b/yt/utilities/lib/misc_utilities.pyx +@@ -437,7 +437,7 @@ + cdef np.float64_t z0 + alpha = np.zeros(4) + #the sources must be ordered along z to avoid edges when two overlap +- idx = np.argsort(zs) ++ idx = np.asarray(np.argsort(zs), dtype='int64') + for j in idx: + r = radii[j] + r2 = int((r+0.3)*(r+0.3)) #0.3 to get nicer shape diff --git a/patches/fix_embedded_jquery.patch b/patches/fix_embedded_jquery.patch new file mode 100644 index 0000000..c2fab1f --- /dev/null +++ b/patches/fix_embedded_jquery.patch @@ -0,0 +1,15 @@ +Author: BW Keller +Description: Use debian's built in jquery +Index: yt-debian/yt/visualization/mapserver/html/map_index.html +=================================================================== +--- yt-debian.orig/yt/visualization/mapserver/html/map_index.html ++++ yt-debian/yt/visualization/mapserver/html/map_index.html +@@ -4,7 +4,7 @@ + + + +- ++ +