diff --git a/0002-Allow-numpy-2.0-and-higher.patch b/0002-Allow-numpy-2.0-and-higher.patch deleted file mode 100644 index f7fc3c7..0000000 --- a/0002-Allow-numpy-2.0-and-higher.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2dae0295e96f7d767a05d21f973dbbcb92446811 Mon Sep 17 00:00:00 2001 -From: "Christopher M. Cantalupo" -Date: Mon, 5 May 2025 21:59:02 -0700 -Subject: [PATCH] Allow numpy 2.0 and higher - -Signed-off-by: Christopher M. Cantalupo ---- - geopmpy/pyproject.toml | 2 +- - geopmpy/requirements.txt | 2 +- - geopmpy/setup.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/geopmpy/pyproject.toml b/geopmpy/pyproject.toml -index 74118fab5..cb5d0fb24 100755 ---- a/geopmpy/pyproject.toml -+++ b/geopmpy/pyproject.toml -@@ -47,7 +47,7 @@ classifiers = ["Development Status :: 5 - Production/Stable", - dependencies = ['cffi>=1.13.2', - 'cycler>=0.11.0', - 'natsort>=8.1.0', -- 'numpy>=1.19.5,<2.0.0', -+ 'numpy>=1.19.5', - 'pandas>=1.1.5', - 'psutil>=5.4.8', - 'pyyaml>=6.0.0', -diff --git a/geopmpy/requirements.txt b/geopmpy/requirements.txt -index 7633e4cd0..dc1bf0baa 100644 ---- a/geopmpy/requirements.txt -+++ b/geopmpy/requirements.txt -@@ -1,7 +1,7 @@ - cffi>=1.14.5 - cycler>=0.11.0 - natsort>=8.1.0 --numpy>=1.19.5,<2.0.0 -+numpy>=1.19.5 - pandas>=1.1.5 - psutil>=5.8.0 - pyyaml>=6.0.0 -diff --git a/geopmpy/setup.cfg b/geopmpy/setup.cfg -index efc66422a..a43029264 100644 ---- a/geopmpy/setup.cfg -+++ b/geopmpy/setup.cfg -@@ -13,7 +13,7 @@ install_requires = - cffi>=1.11.5 - cycler>=0.11.0 - natsort>=8.1.0 -- numpy>=1.19.5,<2.0.0 -+ numpy>=1.19.5 - pandas>=1.1.5 - psutil>=5.4.8 - pyyaml>=6.0.0 --- -2.43.0 - diff --git a/python-geopmpy.spec b/python-geopmpy.spec index f18ce17..d34a836 100644 --- a/python-geopmpy.spec +++ b/python-geopmpy.spec @@ -9,7 +9,7 @@ optimize system hardware settings to achieve energy efficiency and/or performance objectives.} Name: python-%{prj_name} -Version: 3.2.0 +Version: 3.2.1 Release: %autorelease Summary: Python bindings for libgeopm @@ -17,8 +17,6 @@ License: BSD-3-Clause URL: https://geopm.github.io Source0: https://github.com/geopm/geopm/archive/v%{version}/geopm-%{version}.tar.gz -Patch0: 0002-Allow-numpy-2.0-and-higher.patch - ExclusiveArch: x86_64 BuildRequires: gcc @@ -26,14 +24,14 @@ BuildRequires: python3-cffi BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm -BuildRequires: python3-geopmdpy >= 3.2.0 +BuildRequires: python3-geopmdpy >= 3.2.1 BuildRequires: python3-cycler BuildRequires: python3-pandas BuildRequires: python3-natsort BuildRequires: python3-tables BuildRequires: python3-pyyaml -BuildRequires: libgeopm-devel >= 3.2.0 -BuildRequires: libgeopmd-devel >= 3.2.0 +BuildRequires: libgeopm-devel >= 3.2.1 +BuildRequires: libgeopmd-devel >= 3.2.1 Requires: python3-cycler Requires: python3-natsort Requires: python3-pandas @@ -69,7 +67,6 @@ popd %check pushd %{prj_name} -##PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitearch} %{python3} -m unittest discover -p 'Test*.py' -v %{python3} -m unittest discover -s test -p 'Test*.py' -v popd diff --git a/sources b/sources index aaf0e93..38359cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopm-3.2.0.tar.gz) = 5ff13f1409ed1ef6f384023e090b8b64814bb9e9ebb79bf61581e22b48ed809c126f85e3ce31cdfa8db45c74a1f8f443b6c29a13d152c53ae4e5e46e8253337b +SHA512 (geopm-3.2.1.tar.gz) = faaaf9b48391bb94468a13b9f9292f10845089d7141ec07dccc9f812cd0c33319963b46365c4afe057f2cdb909c63cfdfa0d51459ebec02b000d0b3f5c39d487