From 4a6f2a05f4e769ed2c7069975257434514f0efc3 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:26:33 +0200 Subject: [PATCH 01/10] push develop -> test -> push main --- .github/workflows/push_event_workflow.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index 7110485..13355cf 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -1,6 +1,8 @@ name: Push Event Workflow on: push + branches: + - develop jobs: unit-testing: @@ -15,3 +17,12 @@ jobs: - name : Run tests run : python -m unittest tests/integration/test-solvers.py + + - name: Push to main + if: success() + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git checkout main + git merge develop + git push origin main From 6bd509e274f2f403e91bc07e1f63d146a9b5f35c Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:32:58 +0200 Subject: [PATCH 02/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index 13355cf..e2453c0 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -10,7 +10,7 @@ jobs: steps: - name : Checkout code - uses : actions/checkout@v2 + uses : actions/checkout@v4 - name : Install Packages run : pip install ug4py-base matplotlib ipython pyvista nbformat trame ipywidgets From 4e5eb76c7a7baa81baf35aada8c9dfa5883ae027 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:37:03 +0200 Subject: [PATCH 03/10] push/pull stuff --- .github/workflows/push_event_workflow.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index e2453c0..78b6d85 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -1,8 +1,15 @@ name: Push Event Workflow -on: push - branches: +on: + push: + # push request on 'develop' + branches: - develop + + pull_request: + # pull request with target main + branches: + - main jobs: unit-testing: From e09b44e685bf00e38f04fecfb914f85d9bbde2f2 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:41:08 +0200 Subject: [PATCH 04/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index 78b6d85..27a4a78 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -1,13 +1,11 @@ name: Push Event Workflow -on: - push: - # push request on 'develop' +on: + push: # push request on 'develop' branches: - develop - pull_request: - # pull request with target main + pull_request: # pull request with target main branches: - main From d7a53dd9e4eb7499a1790108fae6a23d43b86964 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:42:19 +0200 Subject: [PATCH 05/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index 27a4a78..b760fb5 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -21,9 +21,10 @@ jobs: run : pip install ug4py-base matplotlib ipython pyvista nbformat trame ipywidgets - name : Run tests - run : python -m unittest tests/integration/test-solvers.py + run : | + python -m unittest tests/integration/test-solvers.py - - name: Push to main + - name: Push to main if: success() run: | git config --global user.name 'github-actions[bot]' From 3982491eed83d5ccc10181d1830f3ce52c743970 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:55:09 +0200 Subject: [PATCH 06/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index b760fb5..11ef233 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -23,6 +23,7 @@ jobs: - name : Run tests run : | python -m unittest tests/integration/test-solvers.py + # add more tests here, if required. - name: Push to main if: success() From 04a6e59bba72d0bb77668c8fb546225c8588d0ea Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:58:04 +0200 Subject: [PATCH 07/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index b760fb5..ff6e065 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -23,6 +23,9 @@ jobs: - name : Run tests run : | python -m unittest tests/integration/test-solvers.py + ls + cd $HOME + ls - name: Push to main if: success() From 3c451cf793555ff61f09a6f5010460bc05a16a15 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 06:58:31 +0200 Subject: [PATCH 08/10] Update push_event_workflow.yml --- .github/workflows/push_event_workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index b760fb5..ff6e065 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -23,6 +23,9 @@ jobs: - name : Run tests run : | python -m unittest tests/integration/test-solvers.py + ls + cd $HOME + ls - name: Push to main if: success() From 65cd5e0ded87769bab73361386e33036db66ffbe Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 07:26:48 +0200 Subject: [PATCH 09/10] Removing auto push --- .github/workflows/push_event_workflow.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/push_event_workflow.yml b/.github/workflows/push_event_workflow.yml index 6b214b7..e240c59 100644 --- a/.github/workflows/push_event_workflow.yml +++ b/.github/workflows/push_event_workflow.yml @@ -24,12 +24,12 @@ jobs: run : | python -m unittest tests/integration/test-solvers.py - - name: Push to main - if: success() - run: | - ls - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git checkout main - git merge develop - git push origin main + #- name: Push to main + # if: success() + # run: | + # ls + # git config --global user.name 'github-actions[bot]' + # git config --global user.email 'github-actions[bot]@users.noreply.github.com' + # git checkout main + # git merge develop + # git push origin main From c841969a3c7e8c01d7e639df28c67723cb502e27 Mon Sep 17 00:00:00 2001 From: Arne Naegel Date: Fri, 14 Jun 2024 07:34:02 +0200 Subject: [PATCH 10/10] Update README.md --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dd2617d..dd436c2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ -# modsim-course-python +# py-course-modsim [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/UG4/py-course-modsim/HEAD) - -This course is a Python-based course for an introduction of UG4. It is a port of the sibling [Lua course](http://github.com/UG4/modsim-course-lua). Both versions support execution using binder. +This course is a Python-based course for an introduction of UG4. Please start the course [here](index.ipynb). @@ -14,4 +13,13 @@ Please start the course [here](index.ipynb). * Installation script in binder/postBuild ## Installation: -'''pip install ug4py-base''' +´´´ +pip install ug4py-base +´´´ + +´´´ +git clone https://github.com/UG4/py-course-modsim.git +´´´ + +## Note +It is a port of the sibling [Lua course](http://github.com/UG4/modsim-course-lua).