Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ms2rescore fix version for DeepLC #34

Merged
merged 123 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 107 commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
6428f22
diann version updated to support 1.9.2
ypriverol Nov 18, 2024
3ea85c2
increase version
ypriverol Nov 18, 2024
2ee72a0
increase version
ypriverol Nov 19, 2024
67c2fad
remove dependency setuptools
ypriverol Nov 19, 2024
fb8b3f6
remove dependency setuptools
ypriverol Nov 19, 2024
3e10278
remove dependency setuptools
ypriverol Nov 19, 2024
6e5826e
remove dependency setuptools
ypriverol Nov 19, 2024
551c864
remove dependency setuptools
ypriverol Nov 19, 2024
6f9b887
remove dependency setuptools
ypriverol Nov 19, 2024
cf68cd7
remove dependency setuptools
ypriverol Nov 19, 2024
b72d2d8
remove dependency setuptools
ypriverol Nov 19, 2024
9f14336
remove dependency setuptools
ypriverol Nov 19, 2024
a463d36
3.8 -> 3.9
ypriverol Nov 19, 2024
79c8c9c
3.8 -> 3.9
ypriverol Nov 19, 2024
7ebb3b4
3.8 -> 3.9
ypriverol Nov 19, 2024
c94b473
3.8 -> 3.9
ypriverol Nov 19, 2024
a48abbe
3.8 -> 3.9
ypriverol Nov 19, 2024
f37e8b8
removing duplicated dependencies
ypriverol Nov 19, 2024
ded7ecd
removing duplicated dependencies
ypriverol Nov 19, 2024
5eabfa7
removing duplicated dependencies
ypriverol Nov 19, 2024
57b1391
removing duplicated dependencies
ypriverol Nov 19, 2024
a5346ea
removing duplicated dependencies
ypriverol Nov 19, 2024
59c818f
removing duplicated dependencies
ypriverol Nov 19, 2024
fc72fc4
removing duplicated dependencies
ypriverol Nov 19, 2024
d7bf246
removing duplicated dependencies
ypriverol Nov 19, 2024
c2ecae4
removing duplicated dependencies
ypriverol Nov 19, 2024
8ea159c
removing duplicated dependencies
ypriverol Nov 19, 2024
79c02db
removing duplicated dependencies
ypriverol Nov 19, 2024
43de6ad
removing duplicated dependencies
ypriverol Nov 19, 2024
e2f7641
removing duplicated dependencies
ypriverol Nov 19, 2024
a41cb71
clean dependencies
ypriverol Nov 19, 2024
8a415c0
clean dependencies
ypriverol Nov 19, 2024
fb08b94
clean dependencies
ypriverol Nov 19, 2024
8fda4e0
clean dependencies
ypriverol Nov 19, 2024
eea3231
clean dependencies
ypriverol Nov 19, 2024
d157e95
Update conda-build.yml
jpfeuffer Nov 19, 2024
80c8403
Create conda_build_config.yml
jpfeuffer Nov 19, 2024
604fdc7
Update meta.yaml
jpfeuffer Nov 19, 2024
179e9e7
clean dependencies
ypriverol Nov 19, 2024
5cf14b9
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 19, 2024
7dcc60b
clean dependencies
ypriverol Nov 20, 2024
4da5378
clean dependencies
ypriverol Nov 20, 2024
d2bc375
Cleanup conda-build.yml and debug
jpfeuffer Nov 20, 2024
d0cd1d1
Try mamba build
jpfeuffer Nov 20, 2024
4d5a8c8
Use Conda build
jpfeuffer Nov 20, 2024
a39c871
clean dependencies
ypriverol Nov 20, 2024
f383015
clean dependencies
ypriverol Nov 20, 2024
2718597
clean dependencies
ypriverol Nov 20, 2024
bb51364
clean dependencies
ypriverol Nov 20, 2024
8e4c8a8
clean dependencies
ypriverol Nov 20, 2024
425bb97
clean dependencies
ypriverol Nov 20, 2024
7465e23
clean dependencies
ypriverol Nov 20, 2024
a87cf3c
clean dependencies
ypriverol Nov 20, 2024
7013409
clean dependencies
ypriverol Nov 20, 2024
0baba57
clean dependencies
ypriverol Nov 20, 2024
5e98116
clean dependencies
ypriverol Nov 20, 2024
134bf4e
clean dependencies
ypriverol Nov 20, 2024
5230ad4
clean dependencies
ypriverol Nov 20, 2024
86936ad
adding pydantic
ypriverol Nov 20, 2024
33bda94
adding psm-utils
ypriverol Nov 20, 2024
48222b1
adding psm-utils
ypriverol Nov 20, 2024
a13bdbf
adding set pydantic version
ypriverol Nov 20, 2024
95a38ae
remove pydantic
ypriverol Nov 20, 2024
a9f44e3
psm_utils 1.0.0
ypriverol Nov 20, 2024
53afe3b
psm_utils 1.0.0
ypriverol Nov 20, 2024
0f563af
psm_utils 1.0.0
ypriverol Nov 20, 2024
95055c3
psm_utils 1.0.0
ypriverol Nov 20, 2024
965185c
psm_utils 1.0.0
ypriverol Nov 20, 2024
b958faf
psm_utils 1.0.0
ypriverol Nov 20, 2024
164b254
Rename conda_build_config.yml to conda_build_config.yaml
jpfeuffer Nov 20, 2024
adc2d56
Update conda-build.yml
jpfeuffer Nov 20, 2024
bae0030
cleanup. again
jpfeuffer Nov 20, 2024
8847ff7
added version ms2pip=4.0.0.dev8
ypriverol Nov 20, 2024
817c3dd
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 20, 2024
a85cf67
added version ms2pip=4.0.0.dev8
ypriverol Nov 20, 2024
24eb9aa
added version ms2pip=4.0.0.dev8
ypriverol Nov 20, 2024
00a9fc9
adding deeplc version
ypriverol Nov 20, 2024
51ca29e
adding deeplc version
ypriverol Nov 20, 2024
cc9ac96
remove some versions
ypriverol Nov 20, 2024
99741fe
remove some versions
ypriverol Nov 20, 2024
1aae82d
remove some versions
ypriverol Nov 20, 2024
69267b8
remove some versions
ypriverol Nov 20, 2024
88b41a3
remove some versions
ypriverol Nov 20, 2024
84dc3b5
psm-utils==0.8.3
ypriverol Nov 20, 2024
b51abe9
major changes
ypriverol Nov 20, 2024
4729bad
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 20, 2024
6dc41c7
ms2rescore 3.0.3 -> 3.1.3
ypriverol Nov 21, 2024
479fcf4
Merge branch 'main' of https://github.com/bigbio/pyquantms into dev
ypriverol Nov 21, 2024
e6ebb99
ms2rescore 3.0.3 -> 3.1.3
ypriverol Nov 21, 2024
a629cba
deepLC force version
ypriverol Nov 21, 2024
361d731
deepLC force version
ypriverol Nov 21, 2024
12277a1
deepLC force version
ypriverol Nov 21, 2024
763630c
deepLC force version
ypriverol Nov 21, 2024
15007b7
ms2rescore 3.0.3 -> 3.1.3
ypriverol Nov 21, 2024
b39a7bb
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 21, 2024
c2b305b
deepLC force version
ypriverol Nov 21, 2024
7165cb7
deepLC force version
ypriverol Nov 21, 2024
c4bc501
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
04b22b6
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
ca8f752
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
49ec904
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
a23d87c
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
1f0d272
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 21, 2024
03eac1b
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
dd36f48
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
4ecfad8
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
ee3c973
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
4b988c7
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
c968306
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
31e9b17
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
4b13ff2
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 21, 2024
61566ca
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 22, 2024
2d4413b
rolloback to ms2rescore 3.0.3 with fixed versions
ypriverol Nov 22, 2024
832b8f2
now yes.
ypriverol Nov 22, 2024
4649c7e
now yes.
ypriverol Nov 22, 2024
1e7d3e2
now yes.
ypriverol Nov 22, 2024
53c799a
now yes.
ypriverol Nov 22, 2024
140c1a9
now yes.
ypriverol Nov 22, 2024
df9116e
now yes.
ypriverol Nov 22, 2024
3b58ea9
now yes.
ypriverol Nov 22, 2024
09e83f1
now yes.
ypriverol Nov 22, 2024
7c21ffd
only build the conda package here.
ypriverol Nov 21, 2024
0cbbb16
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,17 @@ jobs:

- name: Install the built package and test
run: |
mamba create --name quantmsutils quantms-utils --use-local
mamba create --name quantmsutils quantms-utils==0.0.14 --use-local
conda activate quantmsutils
conda list
quantmsutilsc --help
quantmsutilsc --version
quantmsutilsc --version

- name: Download test data
run: |
wget https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/quantms-ci-github/quantms-utils/TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML
ypriverol marked this conversation as resolved.
Show resolved Hide resolved
wget https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/quantms-ci-github/quantms-utils/TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01_comet.idXML
- name: Test percolator ms2rescore
run: |
conda activate quantmsutils
ypriverol marked this conversation as resolved.
Show resolved Hide resolved
quantmsutilsc ms2rescore --psm_file TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01_comet.idXML --spectrum_path TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML --processes 2 --ms2pip_model HCD2021 --feature_generators 'ms2pip,deeplc' --id_decoy_pattern ^rev --test_fdr 0.05
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ dependencies:
- click
- sdrf-pipelines>=0.0.31
- pyopenms
- ms2rescore=3.0.3
- pandas
- numpy
- pyarrow
- ms2rescore=3.0.3
- deepLC=2.2.38
- psm-utils=0.8.3
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "quantms-utils"
description = "Python scripts and helpers for the quantMS workflow"
readme = "README.md"
license = "MIT"
version = "0.0.13"
version = "0.0.14"
ypriverol marked this conversation as resolved.
Show resolved Hide resolved
authors = [
"Yasset Perez-Riverol <[email protected]>",
"Dai Chengxin <[email protected]>",
Expand Down Expand Up @@ -38,6 +38,7 @@ pandas = "*"
numpy = "*"
pyarrow = "*"
psm-utils = "0.8.3"
deepLC = "2.2.38"

[tool.poetry.urls]
GitHub = "https://github.com/bigbio/quantms-utils"
Expand Down
2 changes: 1 addition & 1 deletion quantmsutils/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.13"
__version__ = "0.0.14"
5 changes: 3 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# recipe/meta.yaml
package:
name: quantms-utils
version: "0.0.13"
version: "0.0.14"

source:
path: ../
Expand All @@ -25,10 +25,11 @@ requirements:
- click
- sdrf-pipelines>=0.0.31
- pyopenms
- ms2rescore=3.0.3
- pandas
- numpy
- pyarrow
- ms2rescore==3.0.3
- deepLC==2.2.38
- psm-utils=0.8.3
test:
imports:
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ ms2rescore==3.0.3
pandas
numpy
pyarrow
psm-utils==0.8.3
deepLC==2.2.38
psm-utils==0.8.3
Loading