Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 4-joss_paper
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Rätz committed May 8, 2024
2 parents 4d6e0e1 + 3883527 commit 9493b03
Show file tree
Hide file tree
Showing 140 changed files with 282,936 additions and 123,152 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ omit =
*/test*
# omit examples
*/examples*
source = AixWeather
source = aixweather
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Output-Files #
########################
/results
/results/*

#Eclipse Settings #
#####################
Expand Down
17 changes: 9 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ stages:
- test
- doc
- code_quality
- examples
# - examples
- build
- release
- deploy

variables:
COVERAGE_TYPE: "NotDymola"
PAGES_BRANCH: master
PAGES_BRANCH: main
PYTHON_VERSION: "registry.git.rwth-aachen.de/ebc/ebc_all/gitlab_ci/templates:python_3.11"
PYTHON_PACKAGE_NAME: "AixWeather"
PYTHON_PACKAGE_NAME: "aixweather"
TEST_ENGINE: "PYTEST"
GIT_REPO: "RWTH-EBC/AixWeather"
EXAMPLE_CONVERTER_CONFIG: AixWeather/examples/converter.toml
EXAMPLE_CONVERTER_CONFIG: examples/converter.toml
EXCLUDE_PYTHON: 37, 38

include:
- project: 'EBC/EBC_all/gitlab_ci/templates'
Expand All @@ -29,11 +30,11 @@ include:
file: 'pages/gh-pages.gitlab-ci.yml'
- project: 'EBC/EBC_all/gitlab_ci/templates'
file: 'python/tests/tests.gitlab-ci.yml'
- project: 'EBC/EBC_all/gitlab_ci/templates'
file: 'python/tests/coverage.gitlab-ci.yml'
# - project: 'EBC/EBC_all/gitlab_ci/templates'
# file: 'python/tests/coverage.gitlab-ci.yml'
- project: 'EBC/EBC_all/gitlab_ci/templates'
file: 'python/pypi-release/release.gitlab-ci.yml'
- project: 'EBC/EBC_all/gitlab_ci/templates'
file: 'python/examples/examples.gitlab-ci.yml'
# - project: 'EBC/EBC_all/gitlab_ci/templates'
# file: 'python/examples/examples.gitlab-ci.yml'
- template: Dependency-Scanning.gitlab-ci.yml
- template: SAST.gitlab-ci.yml
Loading

0 comments on commit 9493b03

Please sign in to comment.