diff --git a/_constraints b/_constraints index c685be2..383d896 100644 --- a/_constraints +++ b/_constraints @@ -1,10 +1,10 @@ - 5 + 6 - 5 + 6 diff --git a/numpy-1.17.4.zip b/numpy-1.17.4.zip deleted file mode 100644 index 7f37593..0000000 --- a/numpy-1.17.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316 -size 6366657 diff --git a/numpy-1.18.2.zip b/numpy-1.18.2.zip new file mode 100644 index 0000000..341c79d --- /dev/null +++ b/numpy-1.18.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7894793e6e8540dbeac77c87b489e331947813511108ae097f1715c018b8f3d +size 5433240 diff --git a/python-numpy-rpmlintrc b/python-numpy-rpmlintrc index febb29c..0221902 100644 --- a/python-numpy-rpmlintrc +++ b/python-numpy-rpmlintrc @@ -1,2 +1,3 @@ # This file is required for testing addFilter("devel-file-in-non-devel-package.*/usr/lib.*/python.*/site-packages/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c") +addFilter("hidden-file-or-dir .*/numpy/f2py/tests/src/assumed_shape/.f2py_f2cmap") diff --git a/python-numpy.changes b/python-numpy.changes index c801e44..37970bf 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,126 @@ +------------------------------------------------------------------- +Tue Apr 7 13:08:32 UTC 2020 - Tomáš Chvátal + +- Do not use alternatives on HPC as it is pain to get it working + +------------------------------------------------------------------- +Tue Apr 7 11:55:43 UTC 2020 - Tomáš Chvátal + +- Also still install f2py that is used by many other + depending software + +------------------------------------------------------------------- +Mon Apr 6 21:42:29 UTC 2020 - Matej Cepl + +- Use update-alternatives for /usr/bin/f2py + +------------------------------------------------------------------- +Sat Mar 28 16:39:11 UTC 2020 - Arun Persaud + +- update to version 1.18.2: + * #15675: TST: move _no_tracing to testing._private + * #15676: MAINT: Large overhead in some random functions + * #15677: TST: Do not create gfortran link in azure Mac testing. + * #15679: BUG: Added missing error check in ndarray.__contains__ + * #15722: MAINT: use list-based APIs to call subprocesses + * #15734: BUG: fix logic error when nm fails on 32-bit + +------------------------------------------------------------------- +Tue Jan 7 15:10:48 UTC 2020 - Todd R + +- update to version 1.18.1 + * The cython random extension test was not using a temporary + directory for building, resulting in a permission violation. + * Numpy distutils was appending -std=c99 to all C compiler runs, + leading to changed behavior and compile problems downstream. + That flag is now only applied when building numpy C code. + +------------------------------------------------------------------- +Mon Jan 6 15:34:51 UTC 2020 - Todd R + +- update to version 1.18.0: + + Highlights + * The C-API for ``numpy.random`` has been defined and documented. + * Basic infrastructure for linking with 64 bit BLAS and LAPACK libraries. + * Many documentation improvements. + + New functions + * Multivariate hypergeometric distribution added to ``numpy.random`` + + Deprecations + * ``np.fromfile`` and ``np.fromstring`` will error on bad data + * Deprecate non-scalar arrays as fill values in ``ma.fill_value`` + * Deprecate ``PyArray_As1D``, ``PyArray_As2D`` + * Deprecate ``np.alen`` + * Deprecate the financial functions + * The ``axis`` argument to ``numpy.ma.mask_cols`` and ``numpy.ma.mask_row`` is deprecated + + Expired deprecations + * ``PyArray_As1D`` and ``PyArray_As2D`` have been removed in favor of + ``PyArray_AsCArray`` + * ``np.rank`` has been removed. This was deprecated in NumPy 1.10 + and has been replaced by ``np.ndim``. + * The deprecation of ``expand_dims`` out-of-range axes in 1.13.0 has + expired. + * ``PyArray_FromDimsAndDataAndDescr`` and ``PyArray_FromDims`` have been + removed (they will always raise an error). Use ``PyArray_NewFromDescr`` + and ``PyArray_SimpleNew`` instead. + * ``numeric.loads``, ``numeric.load``, ``np.ma.dump``, + ``np.ma.dumps``, ``np.ma.load``, ``np.ma.loads`` are removed, + use ``pickle`` methods instead + * ``arrayprint.FloatFormat``, ``arrayprint.LongFloatFormat`` has been removed, + use ``FloatingFormat`` instead + * ``arrayprint.ComplexFormat``, ``arrayprint.LongComplexFormat`` has been + removed, use ``ComplexFloatingFormat`` instead + * ``arrayprint.StructureFormat`` has been removed, use ``StructureVoidFormat`` + instead + * ``np.testing.rand`` has been removed. This was deprecated in NumPy 1.11 + and has been replaced by ``np.random.rand``. + * Class ``SafeEval`` in ``numpy/lib/utils.py`` has been removed. + This was deprecated in NumPy 1.10. Use ``np.safe_eval`` instead. + * Remove deprecated support for boolean and empty condition lists in + ``np.select`` + * Array order only accepts 'C', 'F', 'A', and 'K'. More permissive options + were deprecated in NumPy 1.11. + * np.linspace parameter ``num`` must be an integer. Deprecated in NumPy 1.12. + * UFuncs with multiple outputs must use a tuple for the ``out`` kwarg. This + finishes a deprecation started in NumPy 1.10. + * The files ``numpy/testing/decorators.py``, ``numpy/testing/noseclasses.py`` + and ``numpy/testing/nosetester.py`` have been removed. They were never + meant to be public (all relevant objects are present in the + ``numpy.testing`` namespace), and importing them has given a deprecation + warning since NumPy 1.15.0 + + Compatibility notes + * `numpy.lib.recfunctions.drop_fields` can no longer return None + * ``numpy.argmin/argmax/min/max`` returns ``NaT`` if it exists in array + * ``np.can_cast(np.uint64, np.timedelta64, casting='safe')`` is now ``False`` + * Changed random variate stream from ``numpy.random.Generator.integers`` + * Add more ufunc loops for ``datetime64``, ``timedelta64`` + * Moved modules in ``numpy.random`` + + C API changes + * ``PyDataType_ISUNSIZED(descr)`` now returns False for structured datatypes + + New Features + * Add our own ``*.pxd`` cython import file + * A tuple of axes can now be input to ``expand_dims`` + * Support for 64-bit OpenBLAS + * Add ``--f2cmap`` option to F2PY + + Improvements + * Different C numeric types of the same size have unique names + * ``argwhere`` now produces a consistent result on 0d arrays + * Add ``axis`` argument for ``random.permutation`` and ``random.shuffle`` + * ``method`` keyword argument for ``np.random.multivariate_normal`` + * Add complex number support for ``numpy.fromstring`` + * ``numpy.unique`` has consistent axes order when ``axis`` is not None + * ``numpy.matmul`` with boolean output now converts to boolean values + * ``numpy.random.randint`` produced incorrect value when the range was ``2**32`` + * Add complex number support for ``numpy.fromfile`` + * ``std=c99`` added if compiler is named ``gcc`` + + Changes + * ``NaT`` now sorts to the end of arrays + * Incorrect ``threshold`` in ``np.set_printoptions`` raises ``TypeError`` or ``ValueError`` + * Warn when saving a dtype with metadata + * ``numpy.distutils`` append behavior changed for LDFLAGS and similar + * Remove ``numpy.random.entropy`` without a deprecation + * Add options to quiet build configuration and build with ``-Werror`` + + ------------------------------------------------------------------- Sat Nov 16 17:51:25 UTC 2019 - Arun Persaud diff --git a/python-numpy.spec b/python-numpy.spec index 61b4be9..066229f 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,7 +1,7 @@ # # spec file for package python-numpy # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define _ver 1_17_1 +%define _ver 1_18_1 %define pname python-numpy %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %if "%{flavor}" == "" @@ -70,7 +70,7 @@ ExclusiveArch: do_not_build %endif %endif Name: %{package_name} -Version: 1.17.4 +Version: 1.18.2 Release: 0 Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause @@ -89,6 +89,7 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module testsuite} BuildRequires: python-rpm-macros BuildRequires: unzip %if 0%{?suse_version} @@ -112,6 +113,8 @@ BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: lua-lmod BuildRequires: suse-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +Requires(post): update-alternatives +Requires(postun): update-alternatives %endif %python_subpackages @@ -159,7 +162,8 @@ This package contains files for developing applications using numpy. %patch4 -p1 %endif # Fix non-executable scripts -sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/random/_examples/cython/*.pyx # force cythonization rm PKG-INFO @@ -188,15 +192,15 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_exec setup.py install --prefix=%{p_prefix} --root=%{buildroot} +%if !%{with hpc} +%python_clone -a %{buildroot}%{_bindir}/f2py +%endif + %if 0%{?suse_version} %fdupes %{buildroot}%{p_prefix} %endif -%if %{without hpc} - -#%%python_expand rm -rf %{buildroot}%{$python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite - -%else +%if %{with hpc} %define hpc_module_pname python${py_ver/.*/}-numpy %{python_expand # Don't package testsuite @@ -237,6 +241,7 @@ setenv %{hpc_upcase_trans_hyph %{pname}}_BIN %{hpc_bindir} family "NumPy" EOF } + %endif %check @@ -253,13 +258,20 @@ pushd testing popd %endif +%if %{without hpc} +%post +%python_install_alternative f2py + +%postun +%python_uninstall_alternative f2py +%endif + %files %{python_files} %doc README.md THANKS.txt -%python3_only %{p_bindir}/f2py3* -%python3_only %{p_bindir}/f2py %if %{without hpc} +%python_alternative %{_bindir}/f2py +%python3_only %{_bindir}/f2py3* %{python_sitearch}/numpy/ -%{python_sitearch}/numpy/LICENSE.txt %{python_sitearch}/numpy-%{version}-py*.egg-info %license %{python_sitearch}/numpy/LICENSE.txt %exclude %{python_sitearch}/numpy/core/include/ @@ -267,8 +279,8 @@ popd %exclude %{python_sitearch}/numpy/f2py/src/ %exclude %{python_sitearch}/numpy/core/lib/libnpymath.a %else +%python3_only %{p_bindir}/f2py* %{p_python_sitearch}/numpy/ -%{p_python_sitearch}/numpy/LICENSE.txt %{p_python_sitearch}/numpy-%{version}-py*.egg-info %license %{p_python_sitearch}/numpy/LICENSE.txt %exclude %{p_python_sitearch}/numpy/core/include/