Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MLAir
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

142a6d27

Commit 142a6d27 authored 3 years ago by lukas leufen

Downloads
- Plain Diff

Merge branch 'develop' into 'lukas_issue339_feat_filter-with-future-mix'

# Conflicts:
#   docs/requirements_docs.txt
#   mlair/helpers/testing.py
#   mlair/run_modules/pre_processing.py

parents 0abb8ba6 0a7bcdb7

Branches

Tags

3 merge requests!413update release branch,!412Resolve "release v2.0.0",!358Resolve "filter with future mix"

Pipeline #85812 passed 3 years ago

Stage: test

Stage: docs

Stage: pages

Stage: deploy

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

docs/requirements_docs.txt 1 addition, 1 deletion

docs/requirements_docs.txt
mlair/data_handler/default_data_handler.py 1 addition, 0 deletions

mlair/data_handler/default_data_handler.py
mlair/helpers/testing.py 32 additions, 0 deletions

mlair/helpers/testing.py
mlair/run_modules/experiment_setup.py 8 additions, 1 deletion

mlair/run_modules/experiment_setup.py
mlair/run_modules/pre_processing.py 36 additions, 5 deletions

mlair/run_modules/pre_processing.py
test/test_helpers/test_testing_helpers.py 33 additions, 1 deletion

test/test_helpers/test_testing_helpers.py

with 111 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment