Merge pull request #36 from DLR-AE/devel

Merge devel into master

.github/workflows/build.yml

@@ -61,7 +61,8 @@ jobs:
         /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
         # Install same requirements as to be used during regression testing
         source $CONDA/etc/profile.d/conda.sh
-        conda activate
+        conda create -n my_env python=${{ matrix.python-version }}
+        conda activate my_env
         conda install -y -c conda-forge --file ./tests/list_of_packages.txt || true
         # Install with -e (in editable mode) to allow the tracking of the test coverage
         pip install -e .[extras,test]

.github/workflows/coding-style.yml

@@ -52,12 +52,13 @@ jobs:
       run: |
         # Install same requirements as to be used during regression testing
         source $CONDA/etc/profile.d/conda.sh
-        conda activate
+        conda create -n pylint_env python=${{ matrix.python-version }}
+        conda activate pylint_env
         conda install -y -c conda-forge --file ./tests/list_of_packages.txt || true
         # Install the package itself to make sure that all imports work.
         pip install .[extras]
     - name: Analysing the code with pylint
       run: |
         source $CONDA/etc/profile.d/conda.sh
-        conda activate
+        conda activate pylint_env
         pylint $(git ls-files '*.py') --fail-under=7.0

.github/workflows/regression-tests.yml

@@ -32,14 +32,15 @@ jobs:
         /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
         # Install same requirements as to be used during regression testing
         source $CONDA/etc/profile.d/conda.sh
-        conda activate
+        conda create -n pytest_env python=${{ matrix.python-version }}
+        conda activate pytest_env
         conda install -y -c conda-forge --file ./tests/list_of_packages.txt  || true
         # Install the package itself to make sure that all imports work.
-        pip install -e .[extras]
+        pip install -e .[extras,test]
     - name: Analysing the code with pytest
       run: |
         source $CONDA/etc/profile.d/conda.sh
-        conda activate
+        conda activate pytest_env
         # Run the actual testing of the code with pytest
         # Using python -m pytest is necessary because pytest has the habit of not looking in the site-packages of the venv
         python -m pytest -v --basetemp=./tmp -k 'test_unittests or test_gui' --cov=loadskernel  --cov=modelviewer --cov=loadscompare --junitxml=testresult.xml

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Note
 New releases are marked in the repository using tags. Simply checkout the master branch for the lastest version or use git checkout if you require a specific release, for example 'git checkout 2022.10'.
 
+# Release 2024.06
+- Added comprehensive tutorials as well as coresponding aeroelastic models of the DC3 created by Francisco Carvalho
+
 # Release 2024.05
 - Maintenance release maily with bug fixes, perfromance improvements and updated documentation
 - Dropped support for Python versions lower than 3.10

README.md

@@ -74,6 +74,16 @@ There are two GUIs to visualize a simulation model (the Model Viewer) and to com
 model-viewer
 loads-compare
 ```
+# Tutorials & Examples
+There is a growing number of tutorials based on Jupyter notebooks. You can either have a look at the static html tutorials or use the Jupyter notebooks interactively. For the latter, start a jupyter notebook server, which will open a dashboard in your web browser. Then open one of the *.ipynb notebooks from ./doc/tutorials and walk through the tutorials step-by-step.
+
+[View html tutorials](https://dlr-ae.github.io/LoadsKernel/tutorials/)
+
+or
+
+```
+jupyter notebook
+```
 
 # License
 This software is developed for scientific applications and is delivered as open source without any liability (BSD 3-Clause, please see [LICENSE](LICENSE) for details). For every new aircraft, a validation against test data and/or other simulation tools is highly recommended and in the responsibility of the user. 
@@ -103,23 +113,8 @@ Development branch
 [![Regression Tests](https://github.com/DLR-AE/LoadsKernel/actions/workflows/regression-tests.yml/badge.svg?branch=devel)](https://github.com/DLR-AE/LoadsKernel/actions/workflows/regression-tests.yml)
 [![Coding style](https://github.com/DLR-AE/LoadsKernel/actions/workflows/coding-style.yml/badge.svg?branch=devel)](https://github.com/DLR-AE/LoadsKernel/actions/workflows/coding-style.yml)
 
-# Internal Part (DLR)
-
-## Examples
-There are a number of typical examples, which cover different analyses and simulations. The examples are stored in an additional (internal) DLR GitLab repository:
-
-```
-git clone https://gitlab.dlr.de/loads-kernel/loads-kernel-examples.git
-```
-
-## Tutorials
-In the ./doc folder, there are is a growing number of tutorials based on Jupyter notebooks. You can either have a look at the [static html tutorials](https://loads-kernel.pages.gitlab.dlr.de/loads-kernel/tutorials/) or use the Jupyter notebooks interactively. Start the jupyter notebook server, which will open a dashborad in your web browser. Then navigate to the ./doc/tutorials, open one of the *.ipynb notebooks and you can walk through the tutorials step-by-step.
-
-```
-jupyter notebook
-```
+# DLR-Internal Long-Term Continuous Integration
 
-## Continuous Integration
 In addition to the public regression testing (see above), additional and more comprehensive tests are performed and compared against long standing reference results. This is an internal process and the status of the continuous integration pipelines can only be accessed from within DLR:
 
 Master branch [![pipeline status](https://gitlab.dlr.de/loads-kernel/loads-kernel/badges/master/pipeline.svg)](https://gitlab.dlr.de/loads-kernel/loads-kernel/-/commits/master)