diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8dbd537f..c51f2a4f 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -5,7 +5,7 @@ on: jobs: build_wheels_linux_mac: env: - CIBW_SKIP: cp36-* cp311-* cp312-* cp313-* *-manylinux_i686 pp* *_ppc641e *_s390x *_aarch64 *musllinux* + CIBW_SKIP: cp36-* cp312-* cp313-* *-manylinux_i686 pp* *_ppc641e *_s390x *_aarch64 *musllinux* CIBW_BEFORE_ALL_LINUX: yum -y install cmake cmake3 blas-devel lapack-devel && alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake --family cmake && alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 --family cmake CIBW_BEFORE_ALL_MACOS: brew install cmake openblas superlu gfortran CIBW_BEFORE_BUILD: "cmake -DCMAKE_BUILD_TYPE=Release -DUSE_OPENMP=OFF . && cmake --build . && rm CMakeCache.txt && rm -rf CMakeFiles && pip install -r requirements.txt" diff --git a/.github/workflows/test_packages.yml b/.github/workflows/test_packages.yml index 481bdf63..d03207e5 100644 --- a/.github/workflows/test_packages.yml +++ b/.github/workflows/test_packages.yml @@ -3,7 +3,7 @@ on: pull_request jobs: test_wheels_linux_mac: env: - CIBW_SKIP: cp36-* cp311-* cp312-* cp313-* *-manylinux_i686 pp* *_ppc641e *_s390x *_aarch64 *musllinux* + CIBW_SKIP: cp36-* cp312-* cp313-* *-manylinux_i686 pp* *_ppc641e *_s390x *_aarch64 *musllinux* CIBW_BEFORE_ALL_LINUX: yum -y install cmake cmake3 blas-devel lapack-devel && alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake --family cmake && alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 --family cmake CIBW_BEFORE_ALL_MACOS: brew install cmake openblas superlu gfortran CIBW_BEFORE_BUILD: "cmake -DCMAKE_BUILD_TYPE=Release -DUSE_OPENMP=OFF . && cmake --build . && rm CMakeCache.txt && rm -rf CMakeFiles && pip install -r requirements.txt" diff --git a/README.md b/README.md index ff15ead9..e9d1bd93 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ For example, a model might piece together a temperature-dependent elasticity model, a yield surface, a flow rule, and several hardening rules. Each of these submodels is independent of the other objects so that, for example, switching from conventional J2 plasticity -to a J2 theory requires only a one line change in an input file, +to a non-J2 theory requires only a one line change in an input file, if the model is already implemented, or a relatively small amount of coding to add the new yield surface if it has not been implemented. All of these objects are interchangeable. diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 50b6de96..fbd2154e 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -32,9 +32,9 @@ author = u'Argonne National Laboratory' # The short X.Y version -version = u'1.5.3' +version = u'1.5.4' # The full version, including alpha/beta/rc tags -release = u'1.5.3' +release = u'1.5.4' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index c0a541f2..d302af1f 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ def build_extension(self, ext): # Name of the project name = 'neml', # Version - version = '1.5.3', + version = '1.5.4', # One line-description description = "Nuclear Engineering Material model Library", # README