From c7ce2a8812faa77beb3485b6f1196246eeb7d58d Mon Sep 17 00:00:00 2001
From: Jean-Noël Grad <jgrad@icp.uni-stuttgart.de>
Date: Apr 18 2023 09:33:06 +0000
Subject: Version bump to v4.2.1


---

diff --git a/.gitignore b/.gitignore
index 3a2328f..3094950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /espresso-4.1.3.tar.gz
 /espresso-4.1.4.tar.gz
 /espresso-4.2.0.tar.gz
+/espresso-4.2.1.tar.gz
diff --git a/espresso-aarch64.patch b/espresso-aarch64.patch
deleted file mode 100644
index e5ac6c0..0000000
--- a/espresso-aarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/testsuite/python/icc_interface.py b/testsuite/python/icc_interface.py
-index 2b968d243..d45bb0878 100644
---- a/testsuite/python/icc_interface.py
-+++ b/testsuite/python/icc_interface.py
-@@ -120,5 +120,5 @@ class Test(ut.TestCase):
-             self.system.integrator.run(0)
- 
--    @utx.skipIfMissingFeatures(["P3M"])
-+    @ut.skip("Fails on aarch64")
-     def test_exceptions_large_r_cut(self):
-         icc, (_, p) = self.setup_icc_particles_and_solver(max_iterations=1)
diff --git a/espresso-numpy.patch b/espresso-numpy.patch
deleted file mode 100644
index 097ca49..0000000
--- a/espresso-numpy.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/testsuite/python/observable_profile.py b/testsuite/python/observable_profile.py
-index 969244918..0a7b7eaff 100644
---- a/testsuite/python/observable_profile.py
-+++ b/testsuite/python/observable_profile.py
-@@ -52,5 +52,5 @@ class ProfileObservablesTest(ut.TestCase):
-         np_hist, np_edges = tests_common.get_histogram(
-             np.copy(self.system.part.all().pos), self.kwargs, 'cartesian',
--            normed=True)
-+            density=True)
-         np_hist *= len(self.system.part)
-         np.testing.assert_array_almost_equal(obs_data, np_hist)
-diff --git a/testsuite/python/observable_profileLB.py b/testsuite/python/observable_profileLB.py
-index 4a3527035..6770cea8e 100644
---- a/testsuite/python/observable_profileLB.py
-+++ b/testsuite/python/observable_profileLB.py
-@@ -92,5 +92,5 @@ class ObservableProfileLBCommon:
-         _, np_edges = tests_common.get_histogram(
-             np.zeros([1, 3]), LB_VELOCITY_PROFILE_PARAMS, 'cartesian',
--            normed=True)
-+            density=True)
-         for i in range(3):
-             np.testing.assert_array_almost_equal(obs_edges[i], np_edges[i])
diff --git a/espresso-setuptools.patch b/espresso-setuptools.patch
new file mode 100644
index 0000000..c911ea7
--- /dev/null
+++ b/espresso-setuptools.patch
@@ -0,0 +1,18 @@
+diff --git a/testsuite/python/unittest_decorators.py b/testsuite/python/unittest_decorators.py
+index 109f89cc8..a9a0e5200 100644
+--- a/testsuite/python/unittest_decorators.py
++++ b/testsuite/python/unittest_decorators.py
+@@ -20,5 +20,5 @@
+ import sys
+ import importlib
+-import setuptools
++import pkg_resources
+ import unittest
+ 
+@@ -75,5 +75,5 @@ def skipIfUnmetModuleVersionRequirement(module, version_requirement):
+     except ImportError:
+         return skipIfMissingModules(module)
+-    if not setuptools.version.pkg_resources.packaging.specifiers.SpecifierSet(
++    if not pkg_resources.packaging.specifiers.SpecifierSet(
+             version_requirement).contains(_module.__version__):
+         return unittest.skip(
diff --git a/espresso.spec b/espresso.spec
index affee3f..71f66f1 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -1,9 +1,9 @@
-%global commit 18d49bfc4b6ca5be264f16d262338fda1f9141a7
+%global commit 9bb2daf1c83f5932b145a6135f3a48f969639ef3
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           espresso
-Version:        4.2.0
-Release:        6%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 Summary:        Extensible Simulation Package for Research on Soft matter
 # segfault on s390x: https://github.com/espressomd/espresso/issues/3753
 # segfault on armv7hl: https://src.fedoraproject.org/rpms/espresso/pull-request/4
@@ -12,11 +12,9 @@ ExcludeArch:    s390x i686 armv7hl
 License:        GPLv3+
 URL:            https://espressomd.org
 Source0:        https://github.com/%{name}md/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
-# skip fragile ICC python interface test on aarch64
-Patch0:         %{name}-aarch64.patch
-# fix deprecated histogram function arguments removed in numpy 1.24
-# https://github.com/espressomd/espresso/pull/4635
-Patch1:         %{name}-numpy.patch
+# fix for API change in setuptools
+# https://github.com/espressomd/espresso/pull/4709
+Patch0:         %{name}-setuptools.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3 >= 3.16
@@ -27,6 +25,7 @@ BuildRequires:  python%{python3_pkgversion}-numpy
 BuildRequires:  python%{python3_pkgversion}-scipy
 BuildRequires:  python%{python3_pkgversion}-six
 BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-packaging
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  boost-devel
 BuildRequires:  hdf5-devel
@@ -106,10 +105,7 @@ This package contains %{name} compiled against MPICH2.
 
 %prep
 %setup -q -n %{name}
-%ifarch aarch64
-%patch0 -p1
-%endif
-%patch1 -p1
+%patch 0 -p1
 
 %build
 %global defopts \\\
@@ -167,6 +163,9 @@ done
 %{python3_sitearch}/mpich/%{name}md/
 
 %changelog
+* Tue Apr 18 2023 Jean-Noël Grad <jgrad@icp.uni-stuttgart.de> - 4.2.1-1
+- Version bump to v4.2.1
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 1720c8b..935de58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (espresso-4.2.0.tar.gz) = b80afb1bef57911fd79b88378a5b2e31b07a18d415fe17fcd5ed28fb448eeca5922f98af8df42117e9e869645765d55ecfb3aae615fa6a53c915f7d8a63081c5
+SHA512 (espresso-4.2.1.tar.gz) = f37102bef44dfd515515bcd3334304845e1552b0f15514c00c3692ac9875b6496538c71fb887475fc5d37b155b2e777c47649fb8c5fc7d6e7b328d8995fdf6a0