Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into peptides
Browse files Browse the repository at this point in the history
# Conflicts:
#	protzilla/constants/location_mapping.py
#	protzilla/constants/workflow_meta.json
#	protzilla/importing/peptide_import.py
#	protzilla/methods/importing.py
#	tests/protzilla/data_preprocessing/test_filter_proteins.py
#	tests/protzilla/data_preprocessing/test_filter_samples.py
#	tests/protzilla/data_preprocessing/test_outlier_detection.py
#	tests/protzilla/data_preprocessing/test_transformation.py
#	tests/protzilla/importing/test_peptide_import.py
#	tests/ui/test_views.py
#	ui/runs/forms/importing.py
  • Loading branch information
janni.roebbecke committed Nov 11, 2024
2 parents 2b05a0b + c4da33e commit 219ccaf
Show file tree
Hide file tree
Showing 85 changed files with 45,243 additions and 6,379 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
- name: Analysing the code with autoflake
run: python -m autoflake --in-place --remove-all-unused-imports --remove-unused-variables --expand-star-imports --ignore-init-module-imports $(git ls-files '*.py')

- name: run tests, build coverage file
run: |
export PYTHONPATH=. pytest
pytest --cache-clear --cov=. --cov-branch --cov-report term-missing tests/
export PYTHONPATH=. pytest
pytest --cache-clear --cov=. --cov-report term-missing tests/
- name: format with black
run: python -m black .

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Once the script has done most of its work, something along the lines of `Startin

## Start-Guide - a little more technical
> [!NOTE]
> For further information on how to contribute on PROTzilla read our [dev-guide](./docs/dev-guide.md).
> For further information on how to contribute on PROTzilla read our [dev-guide](https://github.com/cschlaffner/PROTzilla2/wiki).
PROTzilla2 uses Python 3.11 and conda to manage the environment and pip for installing packages.

Expand Down
130 changes: 0 additions & 130 deletions docs/dev-guide.md

This file was deleted.

Loading

0 comments on commit 219ccaf

Please sign in to comment.