Merge pull request #91 from DataAnalyticsEngineering/FANS-v0.4.3

Author: sanathkeshav

.github/workflows/build_and_test.yaml

@@ -30,10 +30,12 @@ jobs:
         UBUNTU_VERSION: [noble, jammy]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up pixi
-        uses: prefix-dev/[email protected]
+        uses: prefix-dev/[email protected]
+        with:
+          environments: dashboard
 
       - name: Generate build directory
         run: mkdir -p ${{ env.FANS_BUILD_DIR }}
@@ -82,13 +84,8 @@ jobs:
       # ────────────────────────────────────────────────────────────────
       # Pytest checks
       # ────────────────────────────────────────────────────────────────
-      - name: Install Pixi Python deps
-        run: |
-          pixi --version
-          pixi install
-
       - name: Run pytest checks on HDF5 output
-        run: pixi run test
+        run: pixi run -e dashboard pytest
 
       - uses: actions/upload-artifact@v4
         if: failure()

.github/workflows/build_and_test_mac.yaml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/docker.yaml

@@ -0,0 +1,45 @@
+name: Build and test pixi-build
+# Builds FANS for macOS and Ubuntu and runs the tests.
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+jobs:
+  build:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Set up pixi
+        uses: prefix-dev/[email protected]
+        with:
+          environments: default
+
+      - name: Run pytest checks on HDF5 output
+        run: pixi run test
+
+      - name: Upload test logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }} test-logs
+          path: test/output/*.log
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: ${{ matrix.os }} PyTest logs
+          path: |
+            **/pytest*.xml
+            **/.pytest_cache

.github/workflows/pixi_build.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Lint markdown files (markdownlint)
         uses: articulate/actions-markdownlint@v1
         with:
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Check links in markdown files (markdown-link-check)
         uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
@@ -37,9 +37,9 @@ jobs:
     name: pre-commit checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
           check-latest: true

.github/workflows/run-checks.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Generate build directory
       run: mkdir -p ${{ env.FANS_BUILD_DIR }}

.github/workflows/test_pyfans.yaml

@@ -210,3 +210,4 @@ test/input_files/**/*.json
 # pixi environments
 .pixi
 *.egg-info
+*.conda

.gitignore

@@ -20,5 +20,4 @@ repos:
     hooks:
     -   id: clang-format
         args: ['--style=file']
-        exclude: "include/json.hpp"
         types_or: [c++]

.pre-commit-config.yaml

@@ -1,5 +1,16 @@
 # FANS Changelog
 
+## v0.4.3
+
+- Introduce a Pixi dev environment [#89](https://github.com/DataAnalyticsEngineering/FANS/pull/89)
+- Include nlohmann-json via cmake [#87](https://github.com/DataAnalyticsEngineering/FANS/pull/87)
+- Relaxed versions in Pixi build workflow [#86](https://github.com/DataAnalyticsEngineering/FANS/pull/86)
+- Bump version in MacOS CI [#85](https://github.com/DataAnalyticsEngineering/FANS/pull/85)
+- Pixi build workflow for MacOS and Linux [#82](https://github.com/DataAnalyticsEngineering/FANS/pull/82) [#84](https://github.com/DataAnalyticsEngineering/FANS/pull/84)
+- Introduce conftest.py for pytest-fixture [#82](https://github.com/DataAnalyticsEngineering/FANS/pull/82)
+- Use dashboard environment for regular pytest [#81](https://github.com/DataAnalyticsEngineering/FANS/pull/81)
+- Fix bug in J2 plasticity routine [#80](https://github.com/DataAnalyticsEngineering/FANS/pull/80)
+
 ## v0.4.2
 
 - Reduce dependencies of dashboard for cf-package https://github.com/DataAnalyticsEngineering/FANS/pull/71

CHANGELOG.md

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.21)
 # ##############################################################################
 
 project(FANS
-        VERSION 0.4.2
+        VERSION 0.4.3
         LANGUAGES C CXX
 )
 
@@ -98,7 +98,7 @@ if (FANS_LIBRARY_FOR_MICRO_MANAGER)
     )
     FetchContent_MakeAvailable(pybind11)
 endif()
-
+find_package(nlohmann_json REQUIRED)
 # ##############################################################################
 # TARGETS
 # ##############################################################################
@@ -141,7 +141,6 @@ target_include_directories(FANS_FANS PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SO
 # FANS.h header that consuming projects can use
 set_property(TARGET FANS_FANS PROPERTY PUBLIC_HEADER
         include/general.h
-        include/json.hpp
         include/matmodel.h
         include/reader.h
         include/solverCG.h
@@ -186,7 +185,7 @@ target_link_libraries(FANS_FANS PRIVATE m)
 # TODO: when switching to a newer CMake version this can all be done by one
 # call to target_link_libraries(FANS_FANS PUBLIC HDF5::HDF5). But CMake 3.16
 # does not yet support this.
-target_include_directories(FANS_FANS PUBLIC ${HDF5_INCLUDE_DIRS})
+target_include_directories(FANS_FANS PRIVATE ${HDF5_INCLUDE_DIRS})
 target_link_libraries(FANS_FANS PUBLIC ${HDF5_CXX_LIBRARIES})
 target_compile_definitions(FANS_FANS PUBLIC ${HDF5_DEFINITIONS})
 if (HDF5_IS_PARALLEL)
@@ -195,12 +194,14 @@ endif ()
 
 target_link_libraries(FANS_FANS PUBLIC MPI::MPI_CXX)
 
-target_include_directories(FANS_FANS PUBLIC ${FFTW3_INCLUDE_DIRS})
+target_include_directories(FANS_FANS PRIVATE ${FFTW3_INCLUDE_DIRS})
 target_link_libraries(FANS_FANS PUBLIC ${FFTW3_LIBRARIES})
 target_compile_definitions(FANS_FANS PUBLIC ${FFTW3_DEFINITIONS})
 
 target_link_libraries(FANS_FANS PUBLIC Eigen3::Eigen)
+target_link_libraries(FANS_FANS PUBLIC nlohmann_json::nlohmann_json)
 
+target_include_directories(FANS_main PRIVATE ${HDF5_INCLUDE_DIRS})
 target_link_libraries(FANS_main PRIVATE FANS::FANS)
 
 # ##############################################################################