El jue., 14 nov. 2019 a las 14:31, Roland Hieber (<[email protected]>) escribió:
> On Thu, Nov 14, 2019 at 12:40:43PM +0100, Guillermo Rodriguez Garcia wrote: > > El jue., 14 nov. 2019 a las 12:18, Roland Hieber (<[email protected]>) > > escribió: > > > > > On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia > wrote: > > > > El jue., 14 nov. 2019 a las 10:56, Roland Hieber (< > [email protected]>) > > > > escribió: > > > > > > > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found > > > nowhere > > > > > > > else, so I would also add "AND UNKNOWN" to > PYTHON3_NUMPY_LICENSE > > > and > > > > > add > > > > > > > its verbatim license text with startline and endline > parameters in > > > > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > > > > > > > texts mentioned in that variable and adds them to the license > > > report, > > > > > > > so it doesn't get lost too :) > > > > > > > > > > > > > On re-reading this: The license in dragon4.c is just MIT. So while > it is > > > OK > > > > to add it to LICENSE_FILES I think we should not add the "AND > unknown" > > > bit. > > > > > > Oh. I just blindly believed LICENSE.txt. But now that you say it, my > > > license matcher identifies it as "Zlib", not as "MIT". > > > > > > > Uhm, doesn't look like Zlib to me; here's the license text extracted from > > dragon4.c: > > > > /* > > * Copyright (c) 2014 Ryan Juckett > > * > > * 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. > > */ > > > > And here are the MIT and Zlib licenses: > > > > https://spdx.org/licenses/MIT.html > > https://spdx.org/licenses/Zlib.html > > > > I would say that the license is indeed MIT, which is what LICENSE.txt > says: > > > > Name: dragon4 > > Files: numpy/core/src/multiarray/dragon4.c > > License: MIT > > For license text, see numpy/core/src/multiarray/dragon4.c > > We're looking at different versions of the code. Your make file > specifies 1.16.1, and indeed that license was changed in commit > 2babaaa12 ("LICENSE: update dragon4 license to MIT.") [1], which landed > in numpy 1.17.4. The _LICENSE vars should describe the version in the > make file. > Ops. You are right. I didn't realize the license had changed so I mixed things up. > > Do you want to send a version-bump to the new version > instead? ;-) > The reason why I did not do that is that 1.17.x releases break cross-compilation. I reported this (https://github.com/numpy/numpy/issues/14861) a few days ago and it has been fixed since then. So I guess yes, the best is to upgrade to 1.17.4 (will need to include a patch for the issue linked above, since the fix has not made it to any public release yet) Thank you, Guillermo > > [1]: > https://github.com/numpy/numpy/commit/2babaaa123c64c9f8d47d5b8b05942ab2c79a4e3 > > - Roland > > > -- > Roland Hieber, Pengutronix e.K. | [email protected] | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > -- Guillermo Rodriguez Garcia [email protected]
_______________________________________________ ptxdist mailing list [email protected]
