Skip to content

Commit

Permalink
Merge pull request #139 from wilhelm-lab/release/0.6.0
Browse files Browse the repository at this point in the history
Release/0.6.0
  • Loading branch information
picciama authored Aug 5, 2024
2 parents a34a547 + 3ab08a7 commit 472db6b
Show file tree
Hide file tree
Showing 54 changed files with 1,807 additions and 1,280 deletions.
2 changes: 1 addition & 1 deletion .cookietemple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ full_name: Mario Picciani
email: [email protected]
project_name: spectrum_io
project_short_description: IO related functionalities for oktoberfest.
version: 0.5.0
version: 0.6.0
license: MIT
4 changes: 2 additions & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name-template: "0.5.0 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.5.0 # <<COOKIETEMPLE_FORCE_BUMP>>
name-template: "0.6.0 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.6.0 # <<COOKIETEMPLE_FORCE_BUMP>>
exclude-labels:
- "skip-changelog"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
poetry build --ansi
- name: Publish package on PyPI
uses: pypa/gh-action-pypi-publish@v1.8.14
uses: pypa/gh-action-pypi-publish@v1.9.0
with:
# TODO COOKIETEMPLE: Configure your PyPI Token to enable automatic deployment to PyPi on releases
# https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ jobs:
run: nox --force-color --session=coverage -- xml -i

- name: Upload coverage report
uses: codecov/codecov-action@v4.4.1
uses: codecov/codecov-action@v4.5.0
49 changes: 12 additions & 37 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spectrum_io
===========================
Spectrum IO: File / Data Conversion for Mass Spec data within the Oktoberfest ecosystem
=======================================================================================

|PyPI| |Python Version| |License| |Read the Docs| |Build| |Tests| |Codecov| |pre-commit| |Black|

Expand All @@ -13,8 +13,8 @@ spectrum_io
:target: https://opensource.org/licenses/MIT
:alt: License
.. |Read the Docs| image:: https://img.shields.io/readthedocs/spectrum_io/latest.svg?label=Read%20the%20Docs
:target: https://spectrum_io.readthedocs.io/
:alt: Read the documentation at https://spectrum_io.readthedocs.io/
:target: https://spectrum-io.readthedocs.io/
:alt: Read the documentation at https://spectrum-io.readthedocs.io/
.. |Build| image:: https://github.com/wilhelm-lab/spectrum_io/workflows/Build%20spectrum_io%20Package/badge.svg
:target: https://github.com/wilhelm-lab/spectrum_io/actions?workflow=Package
:alt: Build Package Status
Expand All @@ -31,37 +31,12 @@ spectrum_io
:target: https://github.com/psf/black
:alt: Black

spectrum_io is a package primarily developed for usage within the rescoring and spectral library generation pipeline oktoberfest (https://github.com/wilhelm-lab/oktoberfest).

Features
--------

* TODO


Installation
------------

You can install *spectrum_io* via pip_ from PyPI_:

.. code:: console
$ pip install spectrum_io
Usage
-----

Please see the `Command-line Reference <Usage_>`_ for details.


Credits
-------

This package was created with cookietemple_ using Cookiecutter_ based on Hypermodern_Python_Cookiecutter_.

.. _cookietemple: https://cookietemple.com
.. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _PyPI: https://pypi.org/
.. _Hypermodern_Python_Cookiecutter: https://github.com/cjolowicz/cookiecutter-hypermodern-python
.. _pip: https://pip.pypa.io/
.. _Usage: https://spectrum_io.readthedocs.io/en/latest/usage.html
It provides the following functionalities:
- read search results from different search engines (MaxQuant, MSFragger, Sage, Xisearch) or a generic csv format and transform them to the internal format for rescoring with oktoberfest
- extraction of MS2 level spectra from .RAW files and conversion to to mzML for rescoring with oktoberfest
- spectra extraction from .d folders, conversion to .hdf5 format, and aggregation to MS2 level with metadata from a MaxQuant search for timsTOF rescoring with oktoberfest
- in-silico digestion of a fasta file with various configuration options (protease, missed cleavages, length of peptides, fragmentation, ...) for spectral library generation with oktoberfest
- write spectral libraries in dlib, msp, or spectronaut(csv) format
- parquet file creation for peptide prediction model development and refinement within DLOmix
47 changes: 23 additions & 24 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
# Spectrum IO
[![PyPI](https://img.shields.io/pypi/v/spectrum_io.svg)](https://pypi.org/project/spectrum_io/)
[![Python Version](https://img.shields.io/pypi/pyversions/spectrum_io)](https://pypi.org/project/spectrum_io)
[![License](https://img.shields.io/github/license/wilhelm-lab/spectrum_io)](https://opensource.org/licenses/MIT)
[![Read the Docs](https://img.shields.io/readthedocs/spectrum_io/latest.svg?label=Read%20the%20Docs)](https://spectrum-io.readthedocs.io/)
[![Build](https://github.com/wilhelm-lab/spectrum_io/workflows/Build%20spectrum_io%20Package/badge.svg)](https://github.com/wilhelm-lab/spectrum_io/actions?workflow=Package)
[![Tests](https://github.com/wilhelm-lab/spectrum_io/workflows/Run%20spectrum_io%20Tests/badge.svg)](https://github.com/wilhelm-lab/spectrum_io/actions?workflow=Tests)
[![Codecov](https://codecov.io/gh/wilhelm-lab/spectrum_io/branch/main/graph/badge.svg)](https://codecov.io/gh/wilhelm-lab/spectrum_io)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

Spectrum IO is a package primarily developed for usage within oktoberfest (https://github.com/wilhelm-lab/oktoberfest). It handles file conversions and input / output operations for oktoberfest.
# Spectrum IO: File / Data Conversion for Mass Spec data within the Oktoberfest ecosystem

## Installation
spectrum_io is a package primarily developed for usage within the rescoring and spectral library generation pipeline oktoberfest (https://github.com/wilhelm-lab/oktoberfest).

### Prerequisites
It provides the following functionalities:

If you want to convert raw files to mzml, make sure you have ThermoRawFileParser (https://github.com/compomics/ThermoRawFileParser) installed.

If you are on linux or MacOS, make sure mono (https://www.mono-project.com/) is installed (for ThermoRawFileParser).

### Using pip

```bash
pip install oktoberfest
```

## Features

- Read search results from different search engines (Mascot, MaxQuant, MSFragger, MS Amanda) and transform them to the internal format used by oktoberfest
- Read thermo raw files and convert them to mzml, required by oktoberfest
- Read a fasta file and digest with various configurations (protease, missed cleavages, length of peptides, fragmentation, ...) for spectral library generation
- Create spectral libraries from peptide lists and output as dlib, msp or spectronaut(csv) format
- read and write data created as part of oktoberfest in hdf5 libraries
- read search results from different search engines (MaxQuant, MSFragger, Sage, Xisearch) or a generic csv format and transform them to the internal format for rescoring with oktoberfest
- extraction of MS2 level spectra from .RAW files and conversion to to mzML for rescoring with oktoberfest
- spectra extraction from .d folders, conversion to .hdf5 format, and aggregation to MS2 level with metadata from a MaxQuant search for timsTOF rescoring with oktoberfest
- in-silico digestion of a fasta file with various configuration options (protease, missed cleavages, length of peptides, fragmentation, ...) for spectral library generation with oktoberfest
- write spectral libraries in dlib, msp, or spectronaut(csv) format
- parquet file creation for peptide prediction model development and refinement within DLOmix

## Documentation

Please refer to https://spectrum-io.readthedocs.io for further documentation.
The official documentation can be found at https://spectrum-fundamentals.readthedocs.io

## How to cite

## License
Please always cite the main publication:

The project is licensed under the [MIT license](https://github.com/wilhelm-lab/spectrum_io/blob/main/LICENSE).
[Oktoberfest] Picciani M, Gabriel W, Giurcoiu VG et al. (2023), _Oktoberfest: Open-source spectral library generation and rescoring pipeline based on Prosit_, [Proteomics](https://doi.org/10.1002/pmic.202300112)
2 changes: 1 addition & 1 deletion cookietemple.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.5.0
current_version = 0.6.0

[bumpversion_files_whitelisted]
init_file = spectrum_io/__init__.py
Expand Down
41 changes: 41 additions & 0 deletions docs/API.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
.. module:: spectrum_io

.. automodule:: spectrum_io
:noindex:

API
===

Import SpectrumIO using

.. code-block:: python
import spectrum_io as specio
File conversions
----------------

.. module:: spectrum_io.d

.. currentmodule:: spectrum_io

Todo: add functions for bruker d conversions here

.. autosummary::
:toctree: api/d

.. module:: spectrum_io.raw

.. currentmodule:: spectrum_io

Todo: add functions for thermoraw here

Modstring conversions
---------------------

Todo
----

other modules


25 changes: 25 additions & 0 deletions docs/_key_contributors.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. sidebar:: Key Contributors

Current developers

* `Mario Picciani <https://github.com/picciama>`_: lead developer since 2022, maintainer
* `Mostafa Kalhor <https://github.com/mostafakalhor>`_: developer, crosslinking
* `Wassim Gabriel <https://github.com/WassimG>`_: developer, PTMs, neutral losses, GUI
* `Arne van den Berg <https://github.com/arne-vdb>`_: developer, diverse contributions
* `Victor-George Giurcoiu <https://github.com/victorgiurcoiu>`_: developer, diverse contributions
* `Ludwig Lautenbacher <https://github.com/LLautenbacher>`_: developer, Koina, GUI
* `Armin Soleymaniniya <https://github.com/arminsl>`_: developer, GUI
* `Ayla Schröder <https://github.com/ayla-s>`_: developer, pickedGroupFDR
* Zixuan Xiao: developer, GUI

Previous developers

* `Matthew The <https://github.com/MatthewThe>`_: developer, percolator
* `Omar Shouman <https://github.com/omsh>`_: developer, diverse contributions
* Firas Hamood: developer, diverse contributions
* Cecilia Jensen: developer, diverse contributions
* Julian Mueller: developer, diverse contributions

Other roles

* `Mathias Wilhelm <https://github.com/mwilhelm42>`_: advisor and PI of wilhelmlab
78 changes: 76 additions & 2 deletions docs/_static/custom_cookietemple.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,80 @@
@import "basic.css";

/*Set max width to none so the theme uses all available width*/
.wy-nav-content {
max-width: none;
max-width: 1200px;
}

.wy-side-nav-search {
background-color: inherit;
}

table.align-default {
text-align: left;
}

.fixed-table th:first-child,
.fixed-table td:first-child,
.autosummary th:first-child,
.autosummary td:first-child {
min-width: 250px;
}

.autosummary th:first-child,
.autosummary td:first-child {
min-width: 400px;
}

.fixed-table th:last-child,
.fixed-table td:last-child,
.autosummary th:last-child,
.autosummary td:last-child {
width: 100%;
}

.fixed-table {
margin-left: 0;
}

.wy-table-responsive table th p,
.wy-table-responsive table td p {
white-space: normal;
}

.autosummary {
margin-left: 0 !important;
}

.main-config-table tbody tr:nth-child(n + 4):nth-child(-n + 5) td:nth-child(1) {
padding-left: 50px;
}

.main-config-table tbody tr:nth-child(n + 7):nth-child(-n + 7) td:nth-child(1) {
padding-left: 50px;
}

.lib-rescore-config-table
tbody
tr:nth-child(n + 2):nth-child(-n + 5)
td:nth-child(1) {
padding-left: 50px;
}

.lib-rescore-config-table tbody tr:nth-last-child(-n + 2) td:nth-child(1) {
padding-left: 50px;
}

.lib-config-table tbody tr:nth-child(n + 2):nth-child(-n + 3) td:nth-child(1) {
padding-left: 50px;
}

.lib-config-table tbody tr:nth-last-child(-n + 6) td:nth-child(1) {
padding-left: 50px;
}

.digest-config-table tbody tr:not(:first-child) td:nth-child(1) {
padding-left: 50px;
}

.date {
font-size: 50%;
}
5 changes: 5 additions & 0 deletions docs/_templates/autosummary/base.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
:github_url: {{ fullname | modurl }}

{% extends "!autosummary/base.rst" %}

.. http://www.sphinx-doc.org/en/stable/ext/autosummary.html#customizing-templates
13 changes: 0 additions & 13 deletions docs/authors.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/code_of_conduct.rst

This file was deleted.

Loading

0 comments on commit 472db6b

Please sign in to comment.