From c69dea5465b3091de9101c104c85c6bb04292016 Mon Sep 17 00:00:00 2001 From: shanedsnyder Date: Wed, 21 Jun 2023 14:31:17 -0500 Subject: darshan-runtime,darshan-util,py-darshan: add 3.4.3 releases (#38359) * add darshan 3.4.3 releases * darshan-runtime 3.4.3 * darshan-util 3.4.3 * py-darshan 3.4.3.0 - add py-humanize as new dependency * py-darshan has strict darshan-util version reqs darshan-util version required is based on the first 3 parts of the py-darshan version string * remove support for python3.6 * py-humanize dependency for 3.4.3+ versions * only enforce scipy dependency for 3.4.0.1 * drop optional lxml dependency * drop matplotlib pinning * importlib-resources not a dep in python-3.7+ * drop unnecessary numpy pin * add build dep for pytest-runner * fix typo in pytest-runner package name * pip setuptools to match pydarsan setup.py * spack style fix --- .../builtin/packages/darshan-runtime/package.py | 1 + .../repos/builtin/packages/darshan-util/package.py | 1 + .../repos/builtin/packages/py-darshan/package.py | 27 +++++++++++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index b5fd554dce..5fd2340014 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -25,6 +25,7 @@ class DarshanRuntime(AutotoolsPackage): test_requires_compiler = True version("main", branch="main", submodules=True) + version("3.4.3", sha256="dca5f9f9b0ead55a8724b218071ecbb5c4f2ef6027eaade3a6477256930ccc2c") version("3.4.2", sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b") version("3.4.1", sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c") version("3.4.0", sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842") diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index badd27b6f1..9dcc5e219e 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -21,6 +21,7 @@ class DarshanUtil(AutotoolsPackage): tags = ["e4s"] version("main", branch="main", submodules="True") + version("3.4.3", sha256="dca5f9f9b0ead55a8724b218071ecbb5c4f2ef6027eaade3a6477256930ccc2c") version("3.4.2", sha256="b095c3b7c059a8eba4beb03ec092b60708780a3cae3fc830424f6f9ada811c6b") version("3.4.1", sha256="77c0a4675d94a0f9df5710e5b8658cc9ef0f0981a6dafb114d0389b1af64774c") version("3.4.0", sha256="7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842") diff --git a/var/spack/repos/builtin/packages/py-darshan/package.py b/var/spack/repos/builtin/packages/py-darshan/package.py index 2176d50354..12ee277cda 100644 --- a/var/spack/repos/builtin/packages/py-darshan/package.py +++ b/var/spack/repos/builtin/packages/py-darshan/package.py @@ -14,30 +14,31 @@ class PyDarshan(PythonPackage): maintainers("jeanbez", "shanedsnyder") + version("3.4.3.0", sha256="e0708fc5445f2d491ebd381a253cd67534cef13b963f1d749dd605a10f5c0f8f") version("3.4.2.0", sha256="eb00eb758c96899c0d523b71eb00caa3b967509c27fd504c579ac8c9b521845c") version("3.4.1.0", sha256="41a033ebac6fcd0ca05b8ccf07e11191286dee923ec334b876a7ec8e8a6add84") version("3.4.0.1", sha256="0142fc7c0b12a9e5c22358aa26cca7083d28af42aeea7dfcc5698c56b6aee6b7") - depends_on("python@3.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-importlib-resources", when="^python@:3.8", type=("build", "run")) + depends_on("python@3.7:", type=("build", "run")) + depends_on("py-setuptools@:63", type="build") + depends_on("py-pytest-runner", type="build") depends_on("py-cffi", type=("build", "run")) # NOTE: SciPy is an indirect dependency needed for interpolate usage in pandas - # It will be fixed in the next release - depends_on("py-scipy", type=("build", "run")) - depends_on("py-numpy@1.21:", type=("build", "run")) + # This indirect dependency was dropped starting with v3.4.1.0 + depends_on("py-scipy", when="@3.4.0.1", type=("build", "run")) + depends_on("py-numpy", type=("build", "run")) depends_on("py-pandas", type=("build", "run")) - # NOTE: matplotlib should be pinned until next release, for details: - # https://github.com/darshan-hpc/darshan/issues/742 - depends_on("py-matplotlib@3.4", type=("build", "run")) + depends_on("py-matplotlib", type=("build", "run")) depends_on("py-seaborn", type=("build", "run")) depends_on("py-mako", type=("build", "run")) + depends_on("py-humanize", when="@3.4.3.0:", type=("build", "run")) depends_on("py-pytest", type="test") - # NOTE: lxml is test-only indirect dependency via pandas - # It will become optional in the next release - depends_on("py-lxml", type=("test")) - depends_on("darshan-util", type=("build", "run")) + # py-darshan depends on specific darshan-util versions corresponding + # to the first 3 parts of the py-darshan version string + # (i.e., py-darshan@3.4.3.0 requires darshan-util@3.4.3, etc.) + for v in ["3.4.0", "3.4.1", "3.4.2", "3.4.3"]: + depends_on(f"darshan-util@{v}", when=f"@{v}", type=("build", "run")) @run_after("install") @on_package_attributes(run_tests=True) -- cgit v1.2.3-70-g09d2