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.0.zip b/numpy-1.18.0.zip
new file mode 100644
index 0000000..9c4801e
--- /dev/null
+++ b/numpy-1.18.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9d72d9abaf65628f0f31bbb573b7d9304e43b1e6bbae43149c17737a42764c4
+size 5422309
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..831f585 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,89 @@
+-------------------------------------------------------------------
+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..a7c6f73 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_0
%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.0
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}
@@ -159,7 +160,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
@@ -192,11 +194,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
%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,8 +235,11 @@ setenv %{hpc_upcase_trans_hyph %{pname}}_BIN %{hpc_bindir}
family "NumPy"
EOF
}
+
%endif
+
+
%check
%if %{without hpc}
export PYTHONDONTWRITEBYTECODE=1
@@ -251,6 +252,9 @@ pushd testing
%pytest_arch -n auto --pyargs numpy
%endif
popd
+
+# These are created during testing
+rm -rf %{buildroot}%{python_sitearch}/numpy/random/_examples/cython/*.c
%endif
%files %{python_files}