From 84be0d766c353753eca52c9fe9a1f15f08966df7 Mon Sep 17 00:00:00 2001 From: "Randall J. LeVeque" Date: Sat, 4 Nov 2023 11:06:54 -0700 Subject: [PATCH] v5.9.2 release candidate (#236) * v5.9.2 release candidate * Update pyproject.toml with metadata and version number. Preparation for release version 5.9.2. * Some temporary modifications required until we merge https://github.com/clawpack/pyclaw/pull/712. --------- Co-authored-by: David Ketcheson --- amrclaw | 2 +- classic | 2 +- clawpack/__init__.py | 2 +- clawutil | 2 +- geoclaw | 2 +- meson.build | 2 +- pyclaw | 2 +- pyproject.toml | 58 +++++++++++++++++++++++++++++++++++++++----- riemann | 2 +- setup.py | 2 +- visclaw | 2 +- 11 files changed, 62 insertions(+), 16 deletions(-) diff --git a/amrclaw b/amrclaw index 7c799dca..4b50c266 160000 --- a/amrclaw +++ b/amrclaw @@ -1 +1 @@ -Subproject commit 7c799dca3b7add6f247f77a4910c9f19f94666db +Subproject commit 4b50c2661a955639e634102fe80c38f77883aebc diff --git a/classic b/classic index 87628735..a27a4951 160000 --- a/classic +++ b/classic @@ -1 +1 @@ -Subproject commit 8762873516ba8929e2b3379bdecc4d9fbcc6c7f0 +Subproject commit a27a4951a42f392cd8d1b36ed296b84f53e888e8 diff --git a/clawpack/__init__.py b/clawpack/__init__.py index e865f539..b5b690a4 100644 --- a/clawpack/__init__.py +++ b/clawpack/__init__.py @@ -23,4 +23,4 @@ __path__.extend(filter(_os.path.isdir, _path)) del _os, _init, _root, _path -__version__ = '5.9.1' # must also be changed in setup.py +__version__ = '5.9.2' # must also be changed in setup.py diff --git a/clawutil b/clawutil index b28ca554..5aaee229 160000 --- a/clawutil +++ b/clawutil @@ -1 +1 @@ -Subproject commit b28ca554d8af1900b636fb664c5c8149622e2547 +Subproject commit 5aaee229da179c97ea09c00ece86b38d3d6c2b65 diff --git a/geoclaw b/geoclaw index 887976d4..22267697 160000 --- a/geoclaw +++ b/geoclaw @@ -1 +1 @@ -Subproject commit 887976d4d7b809c91fc20d6d54f694bb2c621a18 +Subproject commit 222676970c6f12fefcc3a715eda7ac00b3c22b89 diff --git a/meson.build b/meson.build index f89104a8..90a3fac2 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,7 @@ add_project_arguments( language : 'fortran', ) add_project_arguments( - '-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION', +# '-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION', cc.get_supported_arguments( '-Wno-unused-but-set-variable', ), diff --git a/pyclaw b/pyclaw index e8ee7af1..c2b04786 160000 --- a/pyclaw +++ b/pyclaw @@ -1 +1 @@ -Subproject commit e8ee7af12fada360ec4a1704fc0c2a4a9c1e85c3 +Subproject commit c2b04786c08376258ca1b593854cdeea61b1cf4a diff --git a/pyproject.toml b/pyproject.toml index 3e7ba08f..9b0f919d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,55 @@ -#[build-system] -#requires = [ -# "meson-python", -# "numpy", -#] -#build-backend = "mesonpy" +[project] +name = "Clawpack" +version = "5.9.2" +description = "Finite volume methods for hyperbolic conservation laws" +requires-python = ">=3.6" +license = {text = 'BSD-3-Clause'} +keywords = [ + "scientific computing", + "numerical methods", + "partial differential equations", +] + +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: BSD License", + "Operating System :: MacOS", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX", + "Operating System :: POSIX :: BSD", + "Operating System :: POSIX :: Linux", + "Operating System :: Unix", + "Programming Language :: C", + "Programming Language :: Fortran", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Topic :: Scientific/Engineering", +] + +[project.urls] +Homepage = "https://www.clawpack.org/" +Documentation = "https://www.clawpack.org/" +Source = "https://github.com/clawpack/" +Issues = "https://github.com/clawpack/clawpack/issues" +Downloads = "https://github.com/clawpack/clawpack/releases" + + +[build-system] +requires = [ + "meson-python", + "numpy", +] +build-backend = "mesonpy" [tool.spin] diff --git a/riemann b/riemann index e8921983..c7a9ed01 160000 --- a/riemann +++ b/riemann @@ -1 +1 @@ -Subproject commit e892198310a05bb38e26b2f6a0d5dd47ad738887 +Subproject commit c7a9ed0105f7d7a6817276d8d89c7c40b94fce06 diff --git a/setup.py b/setup.py index ebf1df9b..e9aea74b 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ # version must also be changed in clawpack/__init__.py MAJOR = 5 MINOR = 9 -MICRO = 1 +MICRO = 2 TYPE = '' VERSION = '%d.%d.%d%s' % (MAJOR, MINOR, MICRO, TYPE) diff --git a/visclaw b/visclaw index 03362687..32e257c8 160000 --- a/visclaw +++ b/visclaw @@ -1 +1 @@ -Subproject commit 033626874c71c9758961d35989db547d8116b754 +Subproject commit 32e257c83c6810fd7881c44c06956bae7b82fa9b